Unifield Web

Merge lp:~unifield-team/unifield-web/us-243 into lp:unifield-web

  1. us-243
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4761
Proposed branch: lp:~unifield-team/unifield-web/us-243
Merge into: lp:unifield-web
Diff against target: 11 lines (+1/-0)
1 file modified
addons/openerp/controllers/impex.py (+1/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/us-243
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+260259@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 2015-03-18 09:48:36 +0000
3+++ addons/openerp/controllers/impex.py 2015-05-27 09:29:23 +0000
4@@ -481,6 +481,7 @@
5 process_data(data_line)
6 result = self.get_grp_data(result_tmp, flds)
7
8+ result, params.fields2 = rpc_obj.filter_export_data_result(result, params.fields2)
9 if export_format == "excel":
10 return self.export_html(params.fields2, result, view_name)
11 return export_csv(params.fields2, result)

Subscribers

People subscribed via source and target branches

to all changes: