Odoo Server (MOVED TO GITHUB)

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

  1. 7.0-bug-1319285-translation-overwrite-module-update
  2. Merge into 7.0
Proposed by Yann Papouin
Status: Needs review
Proposed branch: lp:~yann-papouin/openobject-server/7.0-bug-1319285-translation-overwrite-module-update
Merge into: lp:openobject-server/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
openerp/modules/loading.py (+1/-1)
To merge this branch: bzr merge lp:~yann-papouin/openobject-server/7.0-bug-1319285-translation-overwrite-module-update
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+219467@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

On github: https://github.com/odoo/odoo/pull/673

Reply

Unmerged revisions

5301. By Yann Papouin

Overwrite translation on module update if option is set

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/modules/loading.py'
2--- openerp/modules/loading.py 2013-10-31 19:32:28 +0000
3+++ openerp/modules/loading.py 2014-05-14 08:11:52 +0000
4@@ -213,7 +213,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': openerp.tools.config["overwrite_existing_translations"]})
10
11 package.state = 'installed'
12 for kind in ('init', 'demo', 'update'):