diff options
| author | Vo Minh Thu <vmt@openerp.com> | 2010-12-29 15:53:13 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2010-12-29 15:53:13 +0100 |
| commit | 3ecea6df634cd7ae1a0c9d6034002b21a79773f8 (patch) | |
| tree | 746e7c8c6f5e42d856caf4cb5c9156f53c0cafb0 /bin/tools | |
| parent | cffcef1a9dab854b11db91b35af368d24afd22b5 (diff) | |
| parent | 799ef1b9884364ccdff01e1d6764ca9e52950bee (diff) | |
[MERGE] tools.translate, module: load generic PO files before specific ones (e.g fr.po before fr_BE.po)
bzr revid: odo@openerp.com-20101229145313-7v7rv3ntmqehzdyi
Diffstat (limited to 'bin/tools')
| -rw-r--r-- | bin/tools/translate.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/tools/translate.py b/bin/tools/translate.py index 1e29b4f474e..6bd5f0dbce2 100644 --- a/bin/tools/translate.py +++ b/bin/tools/translate.py @@ -935,7 +935,7 @@ def trans_load_data(db_name, fileobj, fileformat, lang, lang_name=None, verbose= args.append(('res_id', '=', dic['res_id'])) ids = trans_obj.search(cr, uid, args) if ids: - if context.get('overwrite'): + if context.get('overwrite') and dic['value']: trans_obj.write(cr, uid, ids, {'value': dic['value']}) else: trans_obj.create(cr, uid, dic) |