From 6232b2e8ab94c5c8be5841182780ca2875ca8fc8 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Mon, 11 Jun 2007 06:35:11 +0000
Subject: [PATCH] KERNEL: fix print screen

bzr revid: ced-0af742cede276df9dbbcf723a38b3dea755f4ff9
---
 bin/addons/base/ir/ir_values.py   | 7 ++++++-
 bin/report/printscreen/ps_form.py | 4 +---
 bin/report/printscreen/ps_list.py | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bin/addons/base/ir/ir_values.py b/bin/addons/base/ir/ir_values.py
index fceeea174e7..cb189917354 100644
--- 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 b1b6de7106e..06bf69545ed 100644
--- 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 6ab95bd37e3..ab81f2395c0 100644
--- 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)