Vo Minh Thu (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-testing-xmo into lp:openobject-server
with lp:~openerp-dev/openobject-server/trunk-duplicate-db as a prerequisite.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-testing-xmo/+merge/132706
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-testing-xmo/+merge/132706
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-duplicate-db.
=== modified file 'openerp/modules/loading.py'
--- openerp/modules/loading.py 2012-09-26 12:15:36 +0000
+++ openerp/modules/loading.py 2012-11-02 14:47:22 +0000
@@ -113,6 +113,7 @@
if kind in ('demo', 'demo_xml'):
noupdate = True
try:
+ ext = ext.lower()
if ext == '.csv':
if kind in ('init', 'init_xml'):
noupdate = True
@@ -121,8 +122,10 @@
process_sql_file(cr, fp)
elif ext == '.yml':
tools.convert_yaml_import(cr, module_name, fp, kind, idref, mode, noupdate, report)
- else:
+ elif ext == '.xml':
tools.convert_xml_import(cr, module_name, fp, idref, mode, noupdate, report)
+ else:
+ _logger.debug("Ignoring %s due to unknown type", filename)
finally:
fp.close()
=== modified file 'openerp/modules/module.py'
--- openerp/modules/module.py 2012-09-26 12:15:36 +0000
+++ openerp/modules/module.py 2012-11-02 14:47:22 +0000
@@ -28,15 +28,9 @@
import types
import zipimport
-import openerp
-
-import openerp.osv as osv
import openerp.tools as tools
import openerp.tools.osutil as osutil
from openerp.tools.safe_eval import safe_eval as eval
-from openerp.tools.translate import _
-
-import openerp.netsvc as netsvc
import zipfile
import openerp.release as release
@@ -48,9 +42,6 @@
import logging
-import openerp.modules.db
-import openerp.modules.graph
-
_logger = logging.getLogger(__name__)
_ad = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'addons') # default addons path (base)
@@ -335,7 +326,6 @@
'description': '',
'icon': get_module_icon(module),
'installable': True,
- 'auto_install': False,
'license': 'AGPL-3',
'name': False,
'post_load': None,
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
