Merge lp:~openerp-dev/openobject-server/7.0-updatenoupdatenotest-chs into lp:openobject-server/7.0

[Christophe Simonis (OpenERP)]

Unmerged revisions

4976. By Christophe Simonis (OpenERP) on 2013-05-16

[FIX] ir.model.data: _update_dummy() must also mark _inherits objects as loaded to avoid deletion when a record pass from noupdate=0 to noupdate=1

=== modified file 'openerp/addons/base/ir/ir_model.py'
--- openerp/addons/base/ir/ir_model.py	2013-04-24 09:34:03 +0000
+++ openerp/addons/base/ir/ir_model.py	2013-05-17 09:02:26 +0000
@@ -3,7 +3,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Business Applications
-#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
+#    Copyright (C) 2004-2013 OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -879,15 +879,29 @@
             raise ValueError('No record found for unique ID %s.%s. It may have been deleted.' % (module, xml_id))
         return result
 
-    def _update_dummy(self,cr, uid, model, module, xml_id=False, store=True):
+    def _mark_as_loaded(self, cr, uid, module, xml_id, model, res_id):
         if not xml_id:
             return False
-        try:
-            id = self.read(cr, uid, [self._get_id(cr, uid, module, xml_id)], ['res_id'])[0]['res_id']
-            self.loads[(module,xml_id)] = (model,id)
-        except:
-            id = False
-        return id
+        if not res_id:
+            try:
+                res_id = self.read(cr, uid, [self._get_id(cr, uid, module, xml_id)], ['res_id'])[0]['res_id']
+            except Exception:
+                return False
+
+        self.loads[(module, xml_id)] = (model, res_id)
+        model_obj = self.pool[model]
+
+        f2t = dict((v, k) for k, v in model_obj._inherits.iteritems())
+        if f2t:
+            data = model_obj.read(cr, uid, res_id, f2t.keys())
+            for field, table in f2t.iteritems():
+                inherit_id = data[field]
+                self.loads[(module, xml_id + '_' + table.replace('.', '_'))] = (table, inherit_id)
+
+        return res_id
+
+    def _update_dummy(self, cr, uid, model, module, xml_id=False, store=True):
+        return self._mark_as_loaded(cr, uid, module, xml_id, model, res_id=False)
 
     def clear_caches(self):
         """ Clears all orm caches on the object's methods
@@ -981,11 +995,7 @@
                                 'noupdate': noupdate,
                                 },context=context)
         if xml_id and res_id:
-            self.loads[(module, xml_id)] = (model, res_id)
-            for table, inherit_field in model_obj._inherits.iteritems():
-                inherit_id = model_obj.read(cr, uid, res_id,
-                        [inherit_field])[inherit_field]
-                self.loads[(module, xml_id + '_' + table.replace('.', '_'))] = (table, inherit_id)
+            self._mark_as_loaded(cr, uid, module, xml_id, model, res_id)
         return res_id
 
     def ir_set(self, cr, uid, key, key2, name, models, value, replace=True, isobject=False, meta=None, xml_id=False):