Merge lp:~camptocamp/openobject-server/trunk-fix-translate-1029334 into lp:openobject-server

[Guewen Baconnier @ Camptocamp]

Fix for bug: lp:1029344

Synchronization of translation does not work when an abstract model is defined.

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

style note: "not a or not b or not c" can be rewritten to "not (a and b and c)" which I think could be more readable in this case.

[lp:~camptocamp/openobject-server/trunk-fix-translate-1029334]

4269. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-07-26

[IMP] improved style as suggested by Alexandre Fayolle

[Vo Minh Thu (thu)]

As said on the bug report, the condition is not good enough (we will filter out false positives). I put the merge prop. `on hold` while waiting back for your comments on the bug report. Feel free to put it back to `need review`. Thanks!

Unmerged revisions

4269. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-07-26

[IMP] improved style as suggested by Alexandre Fayolle

4268. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-07-26

[FIX] do not try to translate fields on models which are not stored in database (when _auto is False)

=== modified file 'openerp/tools/translate.py'
--- openerp/tools/translate.py	2012-06-28 14:16:32 +0000
+++ openerp/tools/translate.py	2012-07-26 12:53:30 +0000
@@ -646,7 +646,9 @@
                 _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 and
+                    objmodel._auto and
+                    field_name in objmodel._columns):
                 continue
             field_def = objmodel._columns[field_name]