Merge 9ac23fb into 1d7f5bc

OCA · Jun 23, 2015 · 641856a · 641856a
2 parents 1d7f5bc + 9ac23fb
commit 641856a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/base_geoengine/__init__.py b/base_geoengine/__init__.py
@@ -19,17 +19,17 @@
 #
 ##############################################################################
 """The GeoEngine module"""
-from . import geo_model
-from . import geo_operators
-from . import geo_view
-from . import geo_helper
-from . import geo_ir
-from . import geo_db
-from . import geo_field
-from . import geo_point
-from . import geo_multipoint
-from . import geo_line
-from . import geo_multiline
-from . import geo_polygon
-from . import geo_multipolygon
-from . import company
+import geo_model
+import geo_operators
+import geo_view
+import geo_helper
+import geo_ir
+import geo_db
+import geo_field
+import geo_point
+import geo_multipoint
+import geo_line
+import geo_multiline
+import geo_polygon
+import geo_multipolygon
+import company
diff --git a/base_geoengine/geo_ir/ir_model.py b/base_geoengine/geo_ir/ir_model.py
@@ -19,9 +19,10 @@
 #
 ##############################################################################
 from openerp.osv import fields, orm
-from openerp.addons import base
-if 'geoengine' not in base.ir.ir_actions.VIEW_TYPES:
-    base.ir.ir_actions.VIEW_TYPES.append(('geoengine', 'Geoengine'))
+from openerp.addons.base import ir
+
+if 'geoengine' not in ir.ir_actions.VIEW_TYPES:
+    ir.ir_actions.VIEW_TYPES.append(('geoengine', 'Geoengine'))
 
 GEO_TYPES = [('geo_polygon', 'geo_polygon'),
              ('geo_multi_polygon', 'geo_multi_polygon'),