Unifield Web

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

  1. US-10051
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5040
Proposed branch: lp:~dorian-kemps/unifield-web/US-10051
Merge into: lp:unifield-web
Diff against target: 104 lines (+23/-10)
3 files modified
addons/openerp/controllers/impex.py (+5/-5)
addons/openerp/controllers/view_log.py (+7/-2)
addons/openerp/po/messages/fr.po (+11/-3)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-web/US-10051
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+424867@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/controllers/impex.py'
2--- addons/openerp/controllers/impex.py 2018-11-29 14:31:11 +0000
3+++ addons/openerp/controllers/impex.py 2022-06-16 12:50:14 +0000
4@@ -196,7 +196,7 @@
5 else:
6 m2ofields = []
7
8- fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
9+ fields.update({'id': {'string': 'SDref'}, '.id': {'string': 'ID'}})
10
11 fields_order = fields.keys()
12 fields_order.sort(lambda x,y: -cmp(fields[x].get('string', ''), fields[y].get('string', '')))
13@@ -327,7 +327,7 @@
14 fields.update(f2)
15
16 def rec(fields):
17- _fields = {'id': 'ID' , '.id': 'Database ID' }
18+ _fields = {'id': 'SDref', '.id': 'ID'}
19
20 def model_populate(fields, prefix_node='', prefix=None, prefix_value='', level=2):
21 fields_order = fields.keys()
22@@ -471,7 +471,7 @@
23 error = None
24
25 fields = dict(rpc.RPCProxy(params.model).fields_get(False, rpc.session.context))
26- fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
27+ fields.update({'id': {'string': 'SDref'}, '.id': {'string': 'ID'}})
28
29 def model_populate(fields, prefix_node='', prefix=None, prefix_value='', level=2):
30 def str_comp(x,y):
31@@ -495,9 +495,9 @@
32 model_populate(fields2, prefix_node+field+'/', None, st_name+'/', level-1)
33
34 if fields[field].get('relation',False) and level>0:
35- model_populate({'/id': {'type': 'char', 'string': 'ID'}, '.id': {'type': 'char', 'string': 'Database ID'}},
36+ model_populate({'/id': {'type': 'char', 'string': 'SDref'}, '.id': {'type': 'char', 'string': 'ID'}},
37 prefix_node+field, None, st_name+'/', level-1)
38- fields.update({'id':{'string':'ID'},'.id':{'string':_('Database ID')}})
39+ fields.update({'id': {'string': 'SDref'}, '.id': {'string': _('ID')}})
40 model_populate(fields)
41
42
43
44=== modified file 'addons/openerp/controllers/view_log.py'
45--- addons/openerp/controllers/view_log.py 2019-04-24 10:33:40 +0000
46+++ addons/openerp/controllers/view_log.py 2022-06-16 12:50:14 +0000
47@@ -77,7 +77,6 @@
48 ('uid', _('Owner')),
49 ('gid', _('Group Owner')),
50 ('level', _('Access Level')),
51- ('xmlid',_('Internal module data ID'))
52 ]
53
54 @expose(template="/openerp/controllers/templates/view_log.mako")
55@@ -95,11 +94,17 @@
56 line[field] = line[field][1]
57
58 values[field] = ustr(line.get(field) or '/')
59+ if line.get('xmlid'):
60+ values['xmlid'] = ustr(line.get('xmlid') or '/')
61+ if model == 'product.product':
62+ fields.append(('xmlid', _('SDref')))
63+ else:
64+ fields.append(('xmlid', _('Internal module data ID')))
65
66 if model == 'product.product':
67 xmlid = rpc.session.execute('object', 'execute', model, 'read', [id], ['xmlid_code'], rpc.session.context)
68 values['xmlid_code'] = xmlid[0]['xmlid_code']
69- fields.append(('xmlid_code', _('UniData xmlid_code')))
70+ fields.append(('xmlid_code', _('xmlid_code')))
71
72 if rpc.session.uid == 1:
73 model_ids = rpc.session.execute('object', 'execute', 'ir.model', 'search', [('model', '=', model)])
74
75=== modified file 'addons/openerp/po/messages/fr.po'
76--- addons/openerp/po/messages/fr.po 2022-05-09 12:28:10 +0000
77+++ addons/openerp/po/messages/fr.po 2022-06-16 12:50:14 +0000
78@@ -391,8 +391,8 @@
79 msgstr "Erreur d'exportation"
80
81 #: controllers/impex.py:469
82-msgid "Database ID"
83-msgstr "Identifiant de base de donnée"
84+msgid "ID"
85+msgstr "Identifiant"
86
87 #: controllers/impex.py:476
88 msgid "Error opening .CSV file"
89@@ -552,7 +552,15 @@
90 msgid "Access Level"
91 msgstr "Niveau d'accès"
92
93-#: controllers/view_log.py:40
94+#: controllers/view_log.py:101
95+msgid "SDref"
96+msgstr "SDref"
97+
98+#: controllers/view_log.py:103
99+msgid "xmlid_code"
100+msgstr "xmlid_code"
101+
102+#: controllers/view_log.py:107
103 msgid "Internal module data ID"
104 msgstr "ID du module de données interne"
105

Subscribers

People subscribed via source and target branches