Merge lp:~dorian-kemps/unifield-web/US-10051 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/controllers/impex.py'
--- addons/openerp/controllers/impex.py	2018-11-29 14:31:11 +0000
+++ addons/openerp/controllers/impex.py	2022-06-16 12:50:14 +0000
@@ -196,7 +196,7 @@
         else:
             m2ofields = []
 
-        fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
+        fields.update({'id': {'string': 'SDref'}, '.id': {'string': 'ID'}})
 
         fields_order = fields.keys()
         fields_order.sort(lambda x,y: -cmp(fields[x].get('string', ''), fields[y].get('string', '')))
@@ -327,7 +327,7 @@
             fields.update(f2)
 
         def rec(fields):
-            _fields = {'id': 'ID' , '.id': 'Database ID' }
+            _fields = {'id': 'SDref', '.id': 'ID'}
 
             def model_populate(fields, prefix_node='', prefix=None, prefix_value='', level=2):
                 fields_order = fields.keys()
@@ -471,7 +471,7 @@
         error = None
 
         fields = dict(rpc.RPCProxy(params.model).fields_get(False, rpc.session.context))
-        fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
+        fields.update({'id': {'string': 'SDref'}, '.id': {'string': 'ID'}})
 
         def model_populate(fields, prefix_node='', prefix=None, prefix_value='', level=2):
             def str_comp(x,y):
@@ -495,9 +495,9 @@
                         model_populate(fields2, prefix_node+field+'/', None, st_name+'/', level-1)
 
                     if fields[field].get('relation',False) and level>0:
-                        model_populate({'/id': {'type': 'char', 'string': 'ID'}, '.id': {'type': 'char', 'string': 'Database ID'}},
+                        model_populate({'/id': {'type': 'char', 'string': 'SDref'}, '.id': {'type': 'char', 'string': 'ID'}},
                                        prefix_node+field, None, st_name+'/', level-1)
-        fields.update({'id':{'string':'ID'},'.id':{'string':_('Database ID')}})
+        fields.update({'id': {'string': 'SDref'}, '.id': {'string': _('ID')}})
         model_populate(fields)
 
 
 
=== modified file 'addons/openerp/controllers/view_log.py'
--- addons/openerp/controllers/view_log.py	2019-04-24 10:33:40 +0000
+++ addons/openerp/controllers/view_log.py	2022-06-16 12:50:14 +0000
@@ -77,7 +77,6 @@
         ('uid', _('Owner')),
         ('gid', _('Group Owner')),
         ('level', _('Access Level')),
-        ('xmlid',_('Internal module data ID'))
     ]
 
     @expose(template="/openerp/controllers/templates/view_log.mako")
@@ -95,11 +94,17 @@
                         line[field] = line[field][1]
 
                     values[field] = ustr(line.get(field) or '/')
+                if line.get('xmlid'):
+                    values['xmlid'] = ustr(line.get('xmlid') or '/')
+                    if model == 'product.product':
+                        fields.append(('xmlid', _('SDref')))
+                    else:
+                        fields.append(('xmlid', _('Internal module data ID')))
 
             if model == 'product.product':
                 xmlid = rpc.session.execute('object', 'execute', model, 'read', [id], ['xmlid_code'], rpc.session.context)
                 values['xmlid_code'] = xmlid[0]['xmlid_code']
-                fields.append(('xmlid_code', _('UniData xmlid_code')))
+                fields.append(('xmlid_code', _('xmlid_code')))
 
             if rpc.session.uid == 1:
                 model_ids = rpc.session.execute('object', 'execute', 'ir.model', 'search', [('model', '=', model)])
 
=== modified file 'addons/openerp/po/messages/fr.po'
--- addons/openerp/po/messages/fr.po	2022-05-09 12:28:10 +0000
+++ addons/openerp/po/messages/fr.po	2022-06-16 12:50:14 +0000
@@ -391,8 +391,8 @@
 msgstr "Erreur d'exportation"
 
 #: controllers/impex.py:469
-msgid "Database ID"
-msgstr "Identifiant de base de donnée"
+msgid "ID"
+msgstr "Identifiant"
 
 #: controllers/impex.py:476
 msgid "Error opening .CSV file"
@@ -552,7 +552,15 @@
 msgid "Access Level"
 msgstr "Niveau d'accès"
 
-#: controllers/view_log.py:40
+#: controllers/view_log.py:101
+msgid "SDref"
+msgstr "SDref"
+
+#: controllers/view_log.py:103
+msgid "xmlid_code"
+msgstr "xmlid_code"
+
+#: controllers/view_log.py:107
 msgid "Internal module data ID"
 msgstr "ID du module de données interne"