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

Proposed by Yann Papouin
Status: Merged
Merged at revision: 5344
Proposed branch: lp:~yann-papouin/ocb-server/7.0-bug-1319285-translation-overwrite-module-update
Merge into: lp:ocb-server
Diff against target: 12 lines (+1/-1)
1 file modified
openerp/modules/ (+1/-1)
To merge this branch: bzr merge lp:~yann-papouin/ocb-server/7.0-bug-1319285-translation-overwrite-module-update
Reviewer Review Type Date Requested Status
Yannick Vaucher @ Camptocamp code review, no test Approve
Pedro Manuel Baeza code review Approve
Review via email:
To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :



review: Approve (code review)
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :



review: Approve (code review, no test)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/modules/'
2--- openerp/modules/ 2014-02-09 01:04:38 +0000
3+++ openerp/modules/ 2014-05-14 08:26:28 +0000
4@@ -221,7 +221,7 @@
5 # Set new modules and dependencies
6 modobj.write(cr, SUPERUSER_ID, [module_id], {'state': 'installed', 'latest_version': ver})
7 # Update translations for all installed languages
8- modobj.update_translations(cr, SUPERUSER_ID, [module_id], None)
9+ modobj.update_translations(cr, SUPERUSER_ID, [module_id], None, {'overwrite':["overwrite_existing_translations"]})
11 package.state = 'installed'
12 for kind in ('init', 'demo', 'update'):


People subscribed via source and target branches

to status/vote changes: