From 04e94e31a07cb4787777573eda9937492e8de9e6 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 27 May 2011 16:48:57 +0530
Subject: [PATCH 1/2] [IMP]base_setup,point_of_sale: button preview reports is
 smaller and on top right of tab header/footer and Tab Other  merged with  Tab
 configuration

bzr revid: aag@tinyerp.co.in-20110527111857-1npksiluu66vabfm
---
 addons/base_setup/base_setup_installer.xml  | 12 ++++++------
 addons/point_of_sale/point_of_sale_view.xml | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 0956bef5f20..591d3b891b5 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -217,12 +217,12 @@
           <field name="type">form</field>
           <field name="inherit_id" ref="base.view_company_form" />
           <field name="arch" type="xml">
-                <field name="rml_footer2" position="after">
-                     <newline/>
-                     <separator string="" colspan="4"/>
-                     <group colspan="4" col="2">
-                     <button name="preview_report" string="Preview Report" type="object" icon="gtk-print"/>
-                     </group>
+                <field name="rml_header" position="before">
+                    <group colspan="4" col="8">
+                        <label string="" colspan="7"/>
+                        <button name="preview_report" string="Preview Report" type="object" icon="gtk-print"/>
+                        <separator string="" colspan="8"/>
+                    </group>
                 </field>
           </field>
       </record>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 18bbfb2a7f8..968e6490051 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -639,12 +639,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Other">
-                      <field  name="company_discount" colspan="4"/>
-                      <field  name="max_diff" colspan="4"/>
-                    </page>
-                </notebook>
+                <field name="currency_id" position="after">
+                    <separator string="Other Information" colspan="4"/>
+                    <field  name="company_discount" />
+                    <newline/>
+                    <field  name="max_diff" />
+                </field>
             </field>
            </record>
 

From 6fa71aab39c7af95d2b516f679243cd9619f3107 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 27 May 2011 17:33:13 +0530
Subject: [PATCH 2/2] [IMP]base_setup: button preview reports move at the right
 of group of header/footer of report

bzr revid: aag@tinyerp.co.in-20110527120313-62jjchhe6mapt9ln
---
 addons/base_setup/base_setup_installer.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 591d3b891b5..aa4fe1b9532 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -217,11 +217,10 @@
           <field name="type">form</field>
           <field name="inherit_id" ref="base.view_company_form" />
           <field name="arch" type="xml">
-                <field name="rml_header" position="before">
+                <field name="rml_header1" position="before">
                     <group colspan="4" col="8">
                         <label string="" colspan="7"/>
                         <button name="preview_report" string="Preview Report" type="object" icon="gtk-print"/>
-                        <separator string="" colspan="8"/>
                     </group>
                 </field>
           </field>