KERNEL: fix print screen

bzr revid: ced-0af742cede276df9dbbcf723a38b3dea755f4ff9

diff --git a/bin/addons/base/ir/ir_values.py b/bin/addons/base/ir/ir_values.py
index fceeea1..cb18991 100644 (file)
--- a/bin/addons/base/ir/ir_values.py
+++ b/bin/addons/base/ir/ir_values.py
@@ -145,7 +145,12 @@ class ir_values(osv.osv):
                                if not len(datas):
                                        #ir_del(cr, uid, x[0])
                                        return False
-                               datas = datas[0]
+                               def clean(x):
+                                       for key in ('report_sxw_content', 'report_rml_content', 'report_sxw', 'report_rml'):
+                                               if key in x:
+                                                       del x[key]
+                                       return x
+                               datas = clean(datas[0])
                        else:
                                datas = pickle.loads(x[2])
                        if meta:

diff --git a/bin/report/printscreen/ps_form.py b/bin/report/printscreen/ps_form.py
index b1b6de7..06bf695 100644 (file)
--- a/bin/report/printscreen/ps_form.py
+++ b/bin/report/printscreen/ps_form.py
@@ -79,7 +79,7 @@ class report_printscreen_list(report_int):
 
 
        def _create_table(self, uid, ids, fields, fields_order, results, context, title=''):
-               pageSize=[297.0,210.0]
+               pageSize=[210.0,297.0]
 
                impl = minidom.getDOMImplementation()
                new_doc = impl.createDocument(None, "report", None)
@@ -146,8 +146,6 @@ class report_printscreen_list(report_int):
                        lines.appendChild(node_line)
                new_doc.childNodes[0].appendChild(lines)
 
-               file('/tmp/terp.xml','w+').write(new_doc.toxml())
-
                styledoc = libxml2.parseFile(os.path.join(tools.config['root_path'],'addons/base/report/custom_new.xsl'))
                style = libxslt.parseStylesheetDoc(styledoc)
                doc = libxml2.parseDoc(new_doc.toxml())

diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index 6ab95bd..ab81f23 100644 (file)
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -80,7 +80,7 @@ class report_printscreen_list(report_int):
 
 
        def _create_table(self, uid, ids, fields, fields_order, results, context, title=''):
-               pageSize=[297.0,210.0]
+               pageSize=[210.0,297.0]
 
                impl = minidom.getDOMImplementation()
                new_doc = impl.createDocument(None, "report", None)