merge

bzr revid: olt@tinyerp.com-20090115163325-9rxxi81k98qhm0ry

3 files changed, 9 insertions, 6 deletions

diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py
index 74da6bdfd5d..46c81d5a041 100644
--- a/bin/addons/base/ir/ir_ui_menu.py
+++ b/bin/addons/base/ir/ir_ui_menu.py
@@ -191,8 +191,8 @@ class ir_ui_menu(osv.osv):
         if context is None:
             context = {}
         ctx = context.copy()
-        if 'read_delta' in ctx:
-            del ctx['read_delta']
+        if self.CONCURRENCY_CHECK_FIELD in ctx:
+            del ctx[self.CONCURRENCY_CHECK_FIELD]
         values_obj = self.pool.get('ir.values')
         values_ids = values_obj.search(cursor, user, [
             ('model', '=', self._name), ('key', '=', 'action'),
diff --git a/bin/addons/base/ir/ir_values.py b/bin/addons/base/ir/ir_values.py
index 116a581c3b0..087b14dc99d 100644
--- a/bin/addons/base/ir/ir_values.py
+++ b/bin/addons/base/ir/ir_values.py
@@ -43,8 +43,8 @@ class ir_values(osv.osv):
         if context is None:
             context = {}
         ctx = context.copy()
-        if 'read_delta' in ctx:
-            del ctx['read_delta']
+        if self.CONCURRENCY_CHECK_FIELD in ctx:
+            del ctx[self.CONCURRENCY_CHECK_FIELD]
         if not self.browse(cursor, user, id, context=context).object:
             value = pickle.dumps(eval(value))
         self.write(cursor, user, id, {name[:-9]: value}, context=ctx)
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 35c1e9f48ca..a4f822a5e16 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -462,9 +462,12 @@ class module(osv.osv):
         for mod in self.browse(cr, uid, ids):
             if mod.state != 'installed':
                 continue
-
+            modpath = addons.get_module_path(mod.name)
+            if not modpath:
+                # unable to find the module. we skip
+                continue
             for lang in filter_lang:
-                f = os.path.join(addons.get_module_path(mod.name), 'i18n', lang + '.po')
+                f = os.path.join(modpath, 'i18n', lang + '.po')
                 if os.path.exists(f):
                     logger.notifyChannel("init", netsvc.LOG_INFO, 'module %s: loading translation file for language %s' % (mod.name, lang))
                     tools.trans_load(cr.dbname, f, lang, verbose=False)