From 0fd39ebd7e231b77312d5861f94302339ecf69f7 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Wed, 27 Jun 2012 17:14:28 +0530
Subject: [PATCH 1/2] [IMP] improved bank statement view

bzr revid: bde@tinyerp.com-20120627114428-t1wtl2fkbfhedvj0
---
 addons/account/account_view.xml               | 19 +++++++++++++++----
 .../account_payment/account_payment_view.xml  |  6 +++---
 ...ccount_payment_populate_statement_view.xml |  1 -
 .../account_voucher/account_voucher_view.xml  |  6 +++---
 .../account_statement_from_invoice_view.xml   |  1 -
 addons/l10n_ch/wizard/bvr_import_view.xml     |  7 +++----
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ab46f7519f8..6c7c750a6cf 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -598,14 +598,25 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
+                        
+                    <div class="oe_right oe_button_box_new" name="import_buttons">
+                    </div>
+                    
+                    <label for="name" class="oe_edit_only"/>
+                    <h1>
+                        <field name="name" class="oe_inline"/>-
+                        <field name="period_id" class="oe_inline"/>
+                    </h1>
+                    <label for="journal_id" class="oe_edit_only"/>
+                    <h2>
+                        <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>                        
+                    </h2>
                     <group>
                         <group>
-                            <field name="name"/>
                             <field name="date" on_change="onchange_date(date, company_id)"/>
-                            <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>
-                            <field name="period_id"/>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
-                        </group><group>
+                        </group>
+                        <group>
                             <field name="balance_start"/>
                             <field name="balance_end_real"/>
                             <field name="currency" invisible="1"/>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index aa4cd18308f..f214930e230 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -330,9 +330,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <field name="journal_id" position="after">
-                    <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import payment lines" type="action" icon="gtk-execute"/>
-                </field>
+                <xpath expr="//div[@name='import_buttons']" position="inside">
+                    <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="gtk-execute"/>
+                </xpath>      
             </field>
         </record>
 
diff --git a/addons/account_payment/wizard/account_payment_populate_statement_view.xml b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
index afcaf82be3a..1e0ba141ff5 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml
+++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
@@ -10,7 +10,6 @@
                 <form string="Populate Statement:" version="7.0">
                     <header>
                         <button name="populate_statement" string="ADD" type="object" icon="gtk-ok"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                     </header>
                     <field name="lines"/>
                 </form>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 6177da71eed..d2105c2d8a2 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -206,11 +206,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-              <field name="currency" invisible="1" position="after">
-                <button name="%(action_view_account_statement_from_invoice_lines)d"
+                <xpath expr="//div[@name='import_buttons']" position="inside">
+                    <button name="%(action_view_account_statement_from_invoice_lines)d"
                             string="Import Invoices" type="action" icon="gtk-execute"
                             attrs="{'invisible':[('state','=','confirm')]}"/>
-              </field>
+                </xpath>      
             </field>
         </record>
 
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
index 1c0c00bd662..9617e895920 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@ -42,7 +42,6 @@
                     </group>
                     <group colspan="4" col="6">
                         <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-execute" string="Ok" name="populate_statement" type="object"/>
                    </group>
                </form>
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index 6625aaef9cd..f7a1ace6614 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -10,7 +10,6 @@
                 <form string="BVR Import" version="7.0">
                     <header>
                         <button name="import_bvr" string="Import" type="object" icon="gtk-ok" colspan="2"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"  colspan="2"/>
                     </header>
                     <group>
                         <field name="file"/>
@@ -35,9 +34,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <field name="balance_end_real" position="after">
-                    <button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action" colspan="2"/>
-                </field>
+                <xpath expr="//div[@name='import_buttons']" position="inside">
+                    <button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action"/>
+                </xpath>
             </field>
         </record>
     </data>

From 87a8a5660f9712ffbbea78bcdaeba408c9804c89 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Thu, 28 Jun 2012 17:31:50 +0530
Subject: [PATCH 2/2] [IMP] arranged the buttons in Bank Statements

bzr revid: bde@tinyerp.com-20120628120150-9hr4a4iq85tcpsgq
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 6c7c750a6cf..4f45ec79091 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -599,7 +599,7 @@
                 </header>
                 <sheet>
                         
-                    <div class="oe_right oe_button_box_new" name="import_buttons">
+                    <div class="oe_right oe_button_box" name="import_buttons">
                     </div>
                     
                     <label for="name" class="oe_edit_only"/>