Merge lp:~yann-papouin/ocb-server/7.0-bug-1319285-translation-overwrite-module-update into lp:ocb-server

[Yann Papouin]

Automatically derived from https://code.launchpad.net/~yann-papouin/openobject-server/7.0-bug-1319285-translation-overwrite-module-update for https://code.launchpad.net/~openerp/openobject-server/7.0.

[Pedro Manuel Baeza (pedro.baeza)]

LGTM

Regards.

review: Approve (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM

Thanks

review: Approve (code review, no test)

=== modified file 'openerp/modules/loading.py'
--- openerp/modules/loading.py	2014-02-09 01:04:38 +0000
+++ openerp/modules/loading.py	2014-05-14 08:26:28 +0000
@@ -221,7 +221,7 @@
             # Set new modules and dependencies
             modobj.write(cr, SUPERUSER_ID, [module_id], {'state': 'installed', 'latest_version': ver})
             # Update translations for all installed languages
-            modobj.update_translations(cr, SUPERUSER_ID, [module_id], None)
+            modobj.update_translations(cr, SUPERUSER_ID, [module_id], None, {'overwrite': openerp.tools.config["overwrite_existing_translations"]})
 
             package.state = 'installed'
             for kind in ('init', 'demo', 'update'):