openerp-dev-web team mailing list archive

["Sbh \(Open ERP\)" <sbh@xxxxxxxxxxx>]

Sbh (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/sbh-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #644398 Resource : there is no menu entry to configure resource.calendar
  https://bugs.launchpad.net/bugs/644398
  #671360 [RC1] base_report_designer can't push report to db
  https://bugs.launchpad.net/bugs/671360
  #680121 Partner : History tab should be invisible by default,must be available on request of concerned modules.
  https://bugs.launchpad.net/bugs/680121
  #684791 troubles with recurency in calendar
  https://bugs.launchpad.net/bugs/684791
  #689574 Not possible to create a Inbound call from the history tab of the partner form
  https://bugs.launchpad.net/bugs/689574
  #691006 cannot save new lead after have duplicated it.
  https://bugs.launchpad.net/bugs/691006
  #691640 Required field customer in project empty after customer delete
  https://bugs.launchpad.net/bugs/691640
  #692971 Sign in / Sign out by project : shouldn't be available if the project module isn't installed
  https://bugs.launchpad.net/bugs/692971
  #697066 Encoding problem in OpenOffice Plugin
  https://bugs.launchpad.net/bugs/697066

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/sbh-dev-addons1/+merge/45364

Bug fix lp:697066
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/sbh-dev-addons1/+merge/45364
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/sbh-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

=== modified file 'base_report_designer/base_report_designer.py'
--- base_report_designer/base_report_designer.py	2010-12-20 12:01:55 +0000
+++ base_report_designer/base_report_designer.py	2011-01-06 13:08:00 +0000
@@ -60,12 +60,15 @@
 
     def report_get(self, cr, uid, report_id, context=None):
         report = self.browse(cr, uid, report_id, context=context)
-        reload(sys) 
-        sys.setdefaultencoding( "latin-1" )    
+        try:
+            sxw_data=(report.report_sxw_content).encode("iso-8859-1", "replace")
+            rml_data= (report.report_rml_content).encode("iso-8859-1", "replace")
+        except :
+            pass
         return {
             'file_type' : report.report_type, 
-            'report_sxw_content': report.report_sxw_content and base64.encodestring(report.report_sxw_content) or False, 
-            'report_rml_content': report.report_rml_content and base64.encodestring(report.report_rml_content) or False
+            'report_sxw_content': report.report_sxw_content and base64.encodestring(sxw_data) or False, 
+            'report_rml_content': report.report_rml_content and base64.encodestring(rml_data) or False
         }
 
 report_xml()