← Back to team overview

openerp-community-reviewer team mailing list archive

[Merge] lp:~yann-papouin/ocb-server/6.1-bug-1029344-translation-sync-abstract-model into lp:ocb-server/6.1

 

Yann Papouin has proposed merging lp:~yann-papouin/ocb-server/6.1-bug-1029344-translation-sync-abstract-model into lp:ocb-server/6.1.

Requested reviews:
  OpenERP Community Backports Team (ocb)
Related bugs:
  Bug #1029344 in OpenERP Community Backports (Server): "Synchronize translation terms crash when abstract models are used"
  https://bugs.launchpad.net/ocb-server/+bug/1029344

For more details, see:
https://code.launchpad.net/~yann-papouin/ocb-server/6.1-bug-1029344-translation-sync-abstract-model/+merge/205104

Fix made from comments and proposals linked to the bug report
-- 
https://code.launchpad.net/~yann-papouin/ocb-server/6.1-bug-1029344-translation-sync-abstract-model/+merge/205104
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~yann-papouin/ocb-server/6.1-bug-1029344-translation-sync-abstract-model into lp:ocb-server/6.1.
=== modified file 'openerp/tools/translate.py'
--- openerp/tools/translate.py	2012-10-08 11:09:46 +0000
+++ openerp/tools/translate.py	2014-02-06 09:58:42 +0000
@@ -28,6 +28,7 @@
 import os
 import openerp.pooler as pooler
 import openerp.sql_db as sql_db
+import openerp.osv.orm 
 import re
 import logging
 import tarfile
@@ -669,7 +670,8 @@
                 _logger.error("name error in %s: %s", xml_name, str(exc))
                 continue
             objmodel = pool.get(obj.model)
-            if not objmodel or not field_name in objmodel._columns:
+            if not objmodel or (not field_name in objmodel._columns)\
+            or (isinstance(objmodel, openerp.osv.orm.AbstractModel) and objmodel._auto == False):
                 continue
             field_def = objmodel._columns[field_name]
 


Follow ups