Merge lp:~fabien-morin/unifield-server/fm-fix-orm-translation into lp:unifield-server

[Fabien MORIN]

Found a bug in the way forms are translated (only one attribute of each node where some of them can have many attributes to translate : string and confirm for example).

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2016-11-17 08:46:41 +0000
+++ bin/osv/orm.py	2016-12-13 15:16:07 +0000
@@ -1450,11 +1450,11 @@
                 trans = translation_obj._get_source(cr, user, self._name, 'view', context['lang'], node.get('sum'))
                 if trans:
                     node.set('sum', trans)
-            elif node.get('confirm'):
+            if node.get('confirm'):
                 trans = translation_obj._get_source(cr, user, self._name, 'view', context['lang'], node.get('confirm'))
                 if trans:
                     node.set('confirm', trans)
-            elif node.get('string'):
+            if node.get('string'):
                 trans = translation_obj._get_source(cr, user, self._name, 'view', context['lang'], node.get('string'))
                 if trans == node.get('string') and ('base_model_name' in context):
                     # If translation is same as source, perhaps we'd have more luck with the alternative model name
@@ -1462,7 +1462,7 @@
                     trans = translation_obj._get_source(cr, user, context['base_model_name'], 'view', context['lang'], node.get('string'))
                 if trans:
                     node.set('string', trans)
-            elif node.tag == 'translate':
+            if node.tag == 'translate':
                 parent = node.getparent()
                 source = node.text
                 for child in node.getchildren():