Odoo Server (MOVED TO GITHUB)

Merge lp:~kangol/openobject-server/6.0-translation-import-nosrc into lp:openobject-server/6.0

  1. 6.0-translation-import-nosrc
  2. Merge into 6.0
Proposed by Christophe Simonis (OpenERP)
Status: Merged
Merged at revision: 3489
Proposed branch: lp:~kangol/openobject-server/6.0-translation-import-nosrc
Merge into: lp:openobject-server/6.0
Diff against target: 21 lines (+3/-1)
1 file modified
bin/tools/translate.py (+3/-1)
To merge this branch: bzr merge lp:~kangol/openobject-server/6.0-translation-import-nosrc
Reviewer Review Type Date Requested Status
Raphael Collet (OpenERP) (community) Approve
Review via email: mp+63855@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/tools/translate.py'
2--- bin/tools/translate.py 2011-01-20 12:57:58 +0000
3+++ bin/tools/translate.py 2011-06-08 13:01:02 +0000
4@@ -916,7 +916,6 @@
5 ('lang', '=', lang),
6 ('type', '=', dic['type']),
7 ('name', '=', dic['name']),
8- ('src', '=', dic['src']),
9 ]
10 if dic['type'] == 'model':
11 if dic['res_id'] is False:
12@@ -924,6 +923,9 @@
13 args.append(('xml_id', '=', dic['xml_id']))
14 else:
15 args.append(('res_id', '=', dic['res_id']))
16+ else:
17+ args.append(('src', '=', dic['src']))
18+
19 ids = trans_obj.search(cr, uid, args)
20 if ids:
21 if context.get('overwrite') and dic['value']: