Merge lp:~unifield-team/unifield-web/bklg-42 into lp:unifield-web

Proposed by jftempo
Status: Merged
Merged at revision: 4749
Proposed branch: lp:~unifield-team/unifield-web/bklg-42
Merge into: lp:unifield-web
Diff against target: 14 lines (+4/-0)
1 file modified
addons/openerp/controllers/impex.py (+4/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/bklg-42
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+253491@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 2014-03-21 09:05:19 +0000
3+++ addons/openerp/controllers/impex.py 2015-03-19 09:50:55 +0000
4@@ -156,6 +156,10 @@
5 if '_export_id' in kw and kw['_export_id']:
6 export_id = int(kw['_export_id'])
7
8+ if params.model:
9+ proxy = rpc.RPCProxy(params.model)
10+ default = proxy.update_exported_fields(default)
11+
12 if params.model == 'product.product':
13 default = [x for x in default if x[0] not in product_remove_fields]
14 default = simplejson.dumps(default)

Subscribers

People subscribed via source and target branches

to all changes: