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

[Rohan Nayani(Open ERP)]

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

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

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) on 2012-05-31

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

=== modified file 'base_report_designer/plugin/openerp_report_designer.zip'
 Binary 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
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py	2011-12-19 16:54:40 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py	2012-05-31 11:40:27 +0000
@@ -54,6 +54,9 @@
 from com.sun.star.task import XJobExecutor
 import os
 import sys
+import zipfile
+from StringIO import StringIO
+
 if __name__<>'package':
     from lib.gui import *
     from lib.error import *
@@ -191,6 +194,10 @@
             #sock = xmlrpclib.ServerProxy(docinfo.getUserFieldValue(0) +'/xmlrpc/object')
 
             file_type = oDoc2.getURL()[7:].split(".")[-1]
+            content_sxw = zipfile.ZipFile(StringIO(data),"r")
+            meta_data = content_sxw.read('meta.xml')
+            if 'urn:oasis:names:tc:opendocument:xmlns:office' in meta_data:
+                file_type = 'odt'
             res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'upload_report', int(docinfo.getUserFieldValue(2)),base64.encodestring(data),file_type,{})
             params = {
                 'name': self.win.getEditText("txtName"),