Unifield Web

Merge lp:~jfb-tempo-consulting/unifield-web/US-4948 into lp:unifield-web

  1. US-4948
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4926
Proposed branch: lp:~jfb-tempo-consulting/unifield-web/US-4948
Merge into: lp:unifield-web
Diff against target: 33 lines (+8/-2)
1 file modified
addons/openerp/controllers/view_log.py (+8/-2)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-web/US-4948
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+353095@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/view_log.py'
2--- addons/openerp/controllers/view_log.py 2011-01-17 11:57:11 +0000
3+++ addons/openerp/controllers/view_log.py 2018-08-14 15:01:00 +0000
4@@ -19,7 +19,7 @@
5 #
6 ###############################################################################
7 from openerp.controllers import SecuredController
8-from openerp.utils import rpc, TinyDict
9+from openerp.utils import rpc
10
11 from openobject.tools import expose
12
13@@ -44,6 +44,7 @@
14 def index(self, id=None, model=None):
15
16 values = {}
17+ fields = self.fields[:]
18 if id:
19 res = rpc.session.execute('object', 'execute', model,
20 'perm_read', [id], rpc.session.context)
21@@ -55,6 +56,11 @@
22
23 values[field] = ustr(line.get(field) or '/')
24
25- return {'values':values, 'fields':self.fields}
26+ if model == 'product.product':
27+ xmlid = rpc.session.execute('object', 'execute', model, 'read', [id], ['xmlid_code'], rpc.session.context)
28+ values['xmlid_code'] = xmlid[0]['xmlid_code']
29+ fields.append(('xmlid_code', _('UniData xmlid_code')))
30+
31+ return {'values':values, 'fields': fields}
32
33 # vim: ts=4 sts=4 sw=4 si et

Subscribers

People subscribed via source and target branches