Merge lp:~openerp-dev/openobject-addons/6.1-opw-574764-ron into lp:openobject-addons/6.1

Proposed by Rohan Nayani(Open ERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 6821
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-574764-ron
Merge into: lp:openobject-addons/6.1
Diff against target: 26 lines (+7/-0)
1 file modified
base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py (+7/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-574764-ron
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Olivier Dony (Odoo) Pending
Review via email: mp+108146@code.launchpad.net

Description of the change

Hello,

      Report designer plug-in is not working while using libreoffice for report creation
Steps to reproduce:
1)Create a new report, don't save file as .sxw Extension
2)Add some Report regarding Information
3)Click on "Send To Server"

Now, check on Report Its generate Traceback.

Kindly review the code,

Thanks
ron

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello,

This bug was qualified as Not Reproducible on Trunk . If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6821. By Rohan Nayani(Open ERP)

report designer plugin is not working while using libreoffice for report creation (Case: Ref 574764)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'base_report_designer/plugin/openerp_report_designer.zip'
2Binary files base_report_designer/plugin/openerp_report_designer.zip 2011-06-17 14:10:24 +0000 and base_report_designer/plugin/openerp_report_designer.zip 2012-05-31 11:40:27 +0000 differ
3=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py'
4--- base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py 2011-12-19 16:54:40 +0000
5+++ base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py 2012-05-31 11:40:27 +0000
6@@ -54,6 +54,9 @@
7 from com.sun.star.task import XJobExecutor
8 import os
9 import sys
10+import zipfile
11+from StringIO import StringIO
12+
13 if __name__<>'package':
14 from lib.gui import *
15 from lib.error import *
16@@ -191,6 +194,10 @@
17 #sock = xmlrpclib.ServerProxy(docinfo.getUserFieldValue(0) +'/xmlrpc/object')
18
19 file_type = oDoc2.getURL()[7:].split(".")[-1]
20+ content_sxw = zipfile.ZipFile(StringIO(data),"r")
21+ meta_data = content_sxw.read('meta.xml')
22+ if 'urn:oasis:names:tc:opendocument:xmlns:office' in meta_data:
23+ file_type = 'odt'
24 res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'upload_report', int(docinfo.getUserFieldValue(2)),base64.encodestring(data),file_type,{})
25 params = {
26 'name': self.win.getEditText("txtName"),