Merge lp:~julie-w/unifield-server/US-5809 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 5334
Proposed branch: lp:~julie-w/unifield-server/US-5809
Merge into: lp:unifield-server
Diff against target: 13 lines (+2/-1)
1 file modified
bin/addons/analytic_distribution/wizard/import_commitment_wizard.py (+2/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-5809
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+366893@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
=== modified file 'bin/addons/analytic_distribution/wizard/import_commitment_wizard.py'
--- bin/addons/analytic_distribution/wizard/import_commitment_wizard.py 2018-08-21 13:08:14 +0000
+++ bin/addons/analytic_distribution/wizard/import_commitment_wizard.py 2019-05-03 09:51:58 +0000
@@ -428,7 +428,8 @@
428 ]428 ]
429 export_ids = aal_obj.search(cr, uid, domain, context=context)429 export_ids = aal_obj.search(cr, uid, domain, context=context)
430 for export_br in aal_obj.browse(cr, uid, export_ids, context=context):430 for export_br in aal_obj.browse(cr, uid, export_ids, context=context):
431 csv_writer.writerow(self._export_entry(export_br))431 line_data = self._export_entry(export_br)
432 csv_writer.writerow(map(lambda x: isinstance(x, unicode) and x.encode('utf8') or x, line_data))
432433
433 # download csv434 # download csv
434 vals = {435 vals = {

Subscribers

People subscribed via source and target branches