Merge lp:~unifield-team/unifield-server/us-1840 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 4023
Proposed branch: lp:~unifield-team/unifield-server/us-1840
Merge into: lp:unifield-server
Diff against target: 16 lines (+2/-1)
1 file modified
bin/addons/account_mcdb/report/mcdb_result.py (+2/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1840
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+309823@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/account_mcdb/report/mcdb_result.py'
--- bin/addons/account_mcdb/report/mcdb_result.py 2016-05-26 10:10:34 +0000
+++ bin/addons/account_mcdb/report/mcdb_result.py 2016-11-02 09:24:43 +0000
@@ -101,11 +101,12 @@
101 out = outfile.read()101 out = outfile.read()
102 outfile.close()102 outfile.close()
103 if len(ids) > limit_tozip:103 if len(ids) > limit_tozip:
104 null, tmpzipname = tempfile.mkstemp()104 fd, tmpzipname = tempfile.mkstemp()
105 zf = zipfile.ZipFile(tmpzipname, 'w')105 zf = zipfile.ZipFile(tmpzipname, 'w')
106 zf.writestr('export_result.csv', out)106 zf.writestr('export_result.csv', out)
107 zf.close()107 zf.close()
108 out = file(tmpzipname, 'rb').read()108 out = file(tmpzipname, 'rb').read()
109 os.close(fd)
109 os.unlink(tmpzipname)110 os.unlink(tmpzipname)
110 return (out, 'zip')111 return (out, 'zip')
111112

Subscribers

People subscribed via source and target branches

to all changes: