From 6fc6b033d14224c723f4b60d5acabfa5181dd316 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 20 Dec 2008 09:02:39 +0100
Subject: [PATCH] bugfixes

bzr revid: fp@tinyerp.com-20081220080239-yg14hb7cjpi21rba
---
 bin/addons/__init__.py                                 | 5 +++--
 bin/addons/base/module/wizard/wizard_module_upgrade.py | 6 +++---
 bin/service/web_services.py                            | 4 ++--
 bin/tools/misc.py                                      | 2 ++
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 75f4fee3184..45b96c49d6f 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -512,11 +512,12 @@ def load_module_graph(cr, graph, status=None, check_access_rules=True, **kwargs)
             package_todo.append(package.name)
             ver = release.major_version + '.' + package.data.get('version', '1.0')
             # update the installed version in database...
-            cr.execute("update ir_module_module set state='installed', latest_version=%s where id=%s", (ver, mid,))
-            cr.commit()
+            #cr.execute("update ir_module_module set state='installed', latest_version=%s where id=%s", (ver, mid,))
 
             # Set new modules and dependencies
             modobj = pool.get('ir.module.module')
+            modobj.write(cr, 1, [mid], {'state':'installed', 'latest_version':ver})
+            cr.commit()
 
             # Update translations for all installed languages
             if modobj:
diff --git a/bin/addons/base/module/wizard/wizard_module_upgrade.py b/bin/addons/base/module/wizard/wizard_module_upgrade.py
index f689b88c566..fb31bdec141 100644
--- a/bin/addons/base/module/wizard/wizard_module_upgrade.py
+++ b/bin/addons/base/module/wizard/wizard_module_upgrade.py
@@ -81,10 +81,10 @@ class wizard_info_get(wizard.interface):
         unmet_packages = []
         mod_dep_obj = pool.get('ir.module.module.dependency')
         for mod in mod_obj.browse(cr, uid, ids):
-            depends_mod_ids = mod_dep_obj.search(cr, uid, [('module_id', '=', mod.id)])            
-            for dep_mod in mod_dep_obj.browse(cr, uid, depends_mod_ids):                
+            depends_mod_ids = mod_dep_obj.search(cr, uid, [('module_id', '=', mod.id)])
+            for dep_mod in mod_dep_obj.browse(cr, uid, depends_mod_ids):
                 if dep_mod.state in ('unknown','uninstalled'):
-                    unmet_packages.append(dep_mod.name)        
+                    unmet_packages.append(dep_mod.name)
         if len(unmet_packages):
             raise wizard.except_wizard('Unmet dependency !', 'Following modules are uninstalled or unknown. \n\n'+'\n'.join(unmet_packages))
         mod_obj.download(cr, uid, ids, context=context)
diff --git a/bin/service/web_services.py b/bin/service/web_services.py
index a831cd3db53..18947afff41 100644
--- a/bin/service/web_services.py
+++ b/bin/service/web_services.py
@@ -92,8 +92,8 @@ class db(netsvc.Service):
                         mids = modobj.search(cr, 1, [('state', '=', 'installed')])
                         modobj.update_translations(cr, 1, mids, lang)
 
-                    cr.execute('UPDATE res_users SET password=%s, active=True WHERE login=%s', (
-                        user_password, 'admin'))
+                    cr.execute('UPDATE res_users SET password=%s, context_lang=%s, active=True WHERE login=%s', (
+                        user_password, lang, 'admin'))
                     cr.execute('SELECT login, password, name ' \
                                '  FROM res_users ' \
                                ' ORDER BY login')
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 7936db55c00..116a32b106b 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -629,6 +629,8 @@ def ustr(value):
     @return: unicode string
     """
 
+    if (value is None) or (value is False):
+        return value
     if isinstance(value, unicode):
         return value