Odoo Server (MOVED TO GITHUB)

Merge lp:~kangol/openobject-server/6.0-translation-update-overwrite into lp:openobject-server/6.0

  1. 6.0-translation-update-overwrite
  2. Merge into 6.0
Proposed by Christophe Simonis (OpenERP)
Status: Merged
Merged at revision: 3490
Proposed branch: lp:~kangol/openobject-server/6.0-translation-update-overwrite
Merge into: lp:openobject-server/6.0
Diff against target: 12 lines (+1/-1)
1 file modified
bin/addons/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~kangol/openobject-server/6.0-translation-update-overwrite
Reviewer Review Type Date Requested Status
Raphael Collet (OpenERP) (community) Approve
Review via email: mp+75690@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Raphael Collet (OpenERP) (rco-openerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/__init__.py'
2--- bin/addons/__init__.py 2011-01-27 09:56:54 +0000
3+++ bin/addons/__init__.py 2011-09-16 09:24:30 +0000
4@@ -769,7 +769,7 @@
5 modobj.write(cr, 1, [mid], {'state': 'installed', 'latest_version': ver})
6 cr.commit()
7 # Update translations for all installed languages
8- modobj.update_translations(cr, 1, [mid], None)
9+ modobj.update_translations(cr, 1, [mid], None, {'overwrite': True})
10 cr.commit()
11
12 package.state = 'installed'