[Erp5-report] r35385 nicolas - in /erp5/trunk/products/ERP5OOo: FormPrintout.py OOoTemplate.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Mon May 17 14:01:45 2010
New Revision: 35385

URL: http://svn.erp5.org?rev=35385&view=rev
Log:
Any TempOOoDocument needs to be created with data not base_data.
Calling convertToBaseFormat will fill in base_data with odf content.


Modified:
    erp5/trunk/products/ERP5OOo/FormPrintout.py
    erp5/trunk/products/ERP5OOo/OOoTemplate.py

Modified: erp5/trunk/products/ERP5OOo/FormPrintout.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/FormPrintout.py?rev=35385&r1=35384&r2=35385&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/FormPrintout.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/FormPrintout.py [utf8] Mon May 17 14:01:45 2010
@@ -275,11 +275,11 @@
       return printout
     from Products.ERP5Type.Document import newTempOOoDocument
     tmp_ooo = newTempOOoDocument(self, self.title_or_id())
-    tmp_ooo.edit(base_data=printout,
+    tmp_ooo.edit(data=printout,
                  fname=self.title_or_id(),
                  source_reference=self.title_or_id(),
-                 base_content_type=content_type)
-    tmp_ooo.oo_data = printout
+                 content_type=content_type)
+    tmp_ooo.convertToBaseFormat()
     mime, data = tmp_ooo.convert(format)
     if REQUEST is not None and not batch_mode:
       REQUEST.RESPONSE.setHeader('Content-type', mime)

Modified: erp5/trunk/products/ERP5OOo/OOoTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/OOoTemplate.py?rev=35385&r1=35384&r2=35385&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/OOoTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/OOoTemplate.py [utf8] Mon May 17 14:01:45 2010
@@ -602,11 +602,11 @@
     # Now create a temp OOoDocument to convert data to pdf
     from Products.ERP5Type.Document import newTempOOoDocument
     tmp_ooo = newTempOOoDocument(self, self.title_or_id())
-    tmp_ooo.edit(base_data=ooo,
+    tmp_ooo.edit(data=ooo,
                  fname=self.title_or_id(),
                  source_reference=self.title_or_id(),
-                 base_content_type=self.content_type,)
-    tmp_ooo.oo_data = ooo
+                 content_type=self.content_type,)
+    tmp_ooo.convertToBaseFormat()
     if format == 'pdf' and not batch_mode:
       # Slightly different implementation
       # now convert it to pdf