Merge lp:~openerp-dev/openobject-server/6.1-opw-574902-avp into lp:openobject-server/6.1

[Avadhesh Patel (openerp)]

Hello Naresh,

I have Solved The following Problem.

The data files declared in __openerp__.py,
section "init_xml" are all the time reloaded when you update a module.
The files declared in init_xml should not modify any existing records.

Kindly review the code.

Thanks,
AVP.

[lp:~openerp-dev/openobject-server/6.1-opw-574902-avp]

4175. By Juan Rial (OpenERP) on 2012-06-05

[FIX] : [574902] : XML files declared in init_xml are reloaded on restart - remove redundant test, update doc

[Naresh(OpenERP) (nch-openerp)]

hello,

What if the kind == 'init' and the extension is .csv ?

Thanks,

review: Needs Fixing

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Not Relevant on Trunk (means that architecture on trunk has changed and so this bug has no meaning anymore). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

4175. By Juan Rial (OpenERP) on 2012-06-05

[FIX] : [574902] : XML files declared in init_xml are reloaded on restart - remove redundant test, update doc

4174. By avp <openerp@openerp-laptop> on 2012-05-17

[FIX] : XML files declared in init_xml are reloaded and data is updated(Case: Ref 574902)

=== modified file 'openerp/modules/loading.py'
--- openerp/modules/loading.py	2012-02-20 10:59:43 +0000
+++ openerp/modules/loading.py	2012-06-05 06:56:19 +0000
@@ -113,22 +113,21 @@
 
         kind: data, demo, test, init_xml, update_xml, demo_xml.
 
-        noupdate is False, unless it is demo data or it is csv data in
+        noupdate is False, unless it is demo data or we're in
         init mode.
 
         """
         for filename in package.data[kind]:
-            _logger.info("module %s: loading %s", module_name, filename)
+            if mode == 'init' or (mode == 'update' and kind != 'init_xml'):
+                _logger.info("module %s: loading %s", module_name, filename)
             _, ext = os.path.splitext(filename)
             pathname = os.path.join(module_name, filename)
             fp = tools.file_open(pathname)
             noupdate = False
-            if kind in ('demo', 'demo_xml'):
+            if kind in ('demo', 'demo_xml', 'init_xml'):
                 noupdate = True
             try:
                 if ext == '.csv':
-                    if kind in ('init', 'init_xml'):
-                        noupdate = True
                     tools.convert_csv_import(cr, module_name, pathname, fp.read(), idref, mode, noupdate)
                 elif ext == '.sql':
                     process_sql_file(cr, fp)