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
=== modified file 'bin/tools/translate.py'
--- bin/tools/translate.py 2011-01-20 12:57:58 +0000
+++ bin/tools/translate.py 2011-06-08 13:01:02 +0000
@@ -916,7 +916,6 @@
916 ('lang', '=', lang),916 ('lang', '=', lang),
917 ('type', '=', dic['type']),917 ('type', '=', dic['type']),
918 ('name', '=', dic['name']),918 ('name', '=', dic['name']),
919 ('src', '=', dic['src']),
920 ]919 ]
921 if dic['type'] == 'model':920 if dic['type'] == 'model':
922 if dic['res_id'] is False:921 if dic['res_id'] is False:
@@ -924,6 +923,9 @@
924 args.append(('xml_id', '=', dic['xml_id']))923 args.append(('xml_id', '=', dic['xml_id']))
925 else:924 else:
926 args.append(('res_id', '=', dic['res_id']))925 args.append(('res_id', '=', dic['res_id']))
926 else:
927 args.append(('src', '=', dic['src']))
928
927 ids = trans_obj.search(cr, uid, args)929 ids = trans_obj.search(cr, uid, args)
928 if ids:930 if ids:
929 if context.get('overwrite') and dic['value']:931 if context.get('overwrite') and dic['value']: