From 65405e956c93286aaffd88e35a10a12481e8fbaa Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 21 Dec 2012 16:49:06 +0100
Subject: [PATCH] [FIX] rml reports: no hardcoded template pageSize - is set by
 company header/footer to A4 or US Letter

bzr revid: odo@openerp.com-20121221154906-urv7cxsudhmu8nl5
---
 openerp/addons/base/module/report/ir_module_reference.rml | 2 +-
 openerp/addons/base/report/custom_rml_printscreen.xsl     | 2 +-
 openerp/addons/base/report/preview_report.rml             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/module/report/ir_module_reference.rml b/openerp/addons/base/module/report/ir_module_reference.rml
index 00030a10596..0fd3c492110 100644
--- a/openerp/addons/base/module/report/ir_module_reference.rml
+++ b/openerp/addons/base/module/report/ir_module_reference.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template title="Test" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="42.0" y1="42.0" width="511" height="758"/>
         <header>
diff --git a/openerp/addons/base/report/custom_rml_printscreen.xsl b/openerp/addons/base/report/custom_rml_printscreen.xsl
index 38e3a207b6f..43e3fbecefe 100644
--- a/openerp/addons/base/report/custom_rml_printscreen.xsl
+++ b/openerp/addons/base/report/custom_rml_printscreen.xsl
@@ -6,7 +6,7 @@
 
 	<xsl:template name="rml">
 		<document filename="example.pdf">
-			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Report" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
+			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Report" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
 				<pageTemplate id="first_page">
 					<pageGraphics>
 						<xsl:call-template name="first_page_graphics_corporation"/>
diff --git a/openerp/addons/base/report/preview_report.rml b/openerp/addons/base/report/preview_report.rml
index f41319f2261..8643f04db75 100644
--- a/openerp/addons/base/report/preview_report.rml
+++ b/openerp/addons/base/report/preview_report.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="preview_report.pdf">
-  <template pageSize="(595.0,842.0)" title="Preview Report" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
+  <template title="Preview Report" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>