Merge lp:~openerp-dev/openobject-server/6.0-xmlid-cache-problems-cto into lp:openobject-server/6.0

[Samus CTO (OpenERP)]

Cache problem found with MSF.

[lp:~openerp-dev/openobject-server/6.0-xmlid-cache-problems-cto]

3647. By Xavier ALT on 2012-12-12

[FIX] merge clear_cache call within 'ir.model.data' unlink - as there is not support generic 'clear_caches()' in orm for v6.0

=== modified file 'bin/addons/base/ir/ir_model.py'
--- bin/addons/base/ir/ir_model.py	2012-01-04 10:25:47 +0000
+++ bin/addons/base/ir/ir_model.py	2012-12-12 11:46:21 +0000
@@ -630,6 +630,12 @@
             id = False
         return id
 
+    def unlink(self, cr, uid, ids, context=None):
+        """ Regular unlink method, but make sure to clear the caches. """
+        self._get_id.clear_cache(cr.dbname)
+        self.get_object_reference.clear_cache(cr.dbname)
+        return super(ir_model_data,self).unlink(cr, uid, ids, context=context)
+
     def _update(self,cr, uid, model, module, values, xml_id=False, store=True, noupdate=False, mode='init', res_id=False, context=None):
         model_obj = self.pool.get(model)
         if not context:

=== modified file 'bin/tools/convert.py'
--- bin/tools/convert.py	2010-12-29 10:50:04 +0000
+++ bin/tools/convert.py	2012-12-12 11:46:21 +0000
@@ -49,7 +49,7 @@
 from yaml_import import convert_yaml_import
 
 # List of etree._Element subclasses that we choose to ignore when parsing XML.
-from tools import SKIPPED_ELEMENT_TYPES
+from tools import SKIPPED_ELEMENT_TYPES, cache
 
 # Import of XML records requires the unsafe eval as well,
 # almost everywhere, which is ok because it supposedly comes
@@ -869,6 +869,7 @@
                                                 rec.sourceline,
                                                 etree.tostring(rec).strip(), exc_info=True)
                             self.cr.rollback()
+                            cache.clean_caches_for_db(self.cr.dbname)
                             raise
         return True