From 46d2109198ceb3fda4b8633893345d87ffe96704 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 16:01:12 +0530
Subject: [PATCH 1/4] [IMP] improved view

bzr revid: tpa@tinyerp.com-20120426103112-4tj65nqfpokwn4kh
---
 addons/account/project/project_view.xml       |  6 +++++-
 .../hr_timesheet_invoice_view.xml             | 19 ++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 648af6dda4c..e7886702971 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -80,7 +80,10 @@
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Analytic account">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                </div>
+                <sheet string="Analytic account" layout="auto">
                     <group colspan="4" col="6">
                         <field name="name" colspan="4"/>
                         <field name="code"/>
@@ -106,6 +109,7 @@
                             <field colspan="4" name="description" nolabel="1"/>
                         </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 2f5c8d24d79..edd4d17ceab 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -21,16 +21,17 @@
                         <separator colspan="4" string="Invoicing Statistics"/>
                         <field name="amount_invoiced"/>
                     </group>
-                    <separator colspan="4"/>
-                    <group col="9" colspan="8">
-                        <field name="state" readonly="1" widget="statusbar"
-                            statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
-                        <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
-                        <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
-                        <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
-                        <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
-                    </group>
                 </group>
+                <xpath expr="/form/div" position='inside'>
+                    <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
+                    <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
+                    <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
+                    <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" readonly="1" widget="statusbar" nolabel="1"
+                        statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
+                    </div>
+                </xpath>
             </field>
         </record>
 

From 24179320955d3b306038bbcc7fb562461c5a6a93 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 27 Apr 2012 10:30:27 +0530
Subject: [PATCH 2/4] [IMP]account_voucher: Move state and button on top bar
 and added sheet teg

bzr revid: mma@tinyerp.com-20120427050027-9nxro5jg0nusoqg1
---
 .../account_voucher/account_voucher_view.xml  | 22 ++++---
 .../voucher_payment_receipt_view.xml          | 44 ++++++++------
 .../voucher_sales_purchase_view.xml           | 59 +++++++++++--------
 3 files changed, 73 insertions(+), 52 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index e519d23b09e..a98c72fe414 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -40,8 +40,18 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Accounting Voucher">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                  <div class="oe_form_topbar">
+                        <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
+                        <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                  <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                  </div>
+                  </div>
+                  <sheet string="Accounting Voucher" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
                         <field name="journal_id" widget="selection" select="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
@@ -101,13 +111,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
-                        <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
-                        <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
-                    </group>
+                   </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index b422c0dbe73..a20eb3b6bf1 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -143,8 +143,18 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bill Payment">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
+                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
+                <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </div>
+                </div>
+                <sheet string="Bill Payment" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
                         <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                         <field name="journal_id"
@@ -249,13 +259,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
-                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -292,8 +296,18 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Customer Payment">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
+                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
+                <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </div>
+                </div>
+                <sheet string="Customer Payment" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
                         <field name="currency_id" invisible="1"/>
                         <field name="amount"
@@ -401,13 +415,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
-                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile and cancel this record ?"/>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 162605be36c..75161eec3e4 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -80,8 +80,22 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Receipt">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
+                        <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
+                           <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
+                        </group>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
+                        <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
+                        
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </div>
+                </div>
+                <sheet string="Sales Receipt" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
                         <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                         <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
@@ -148,16 +162,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
-                        <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                        <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
-                           <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
-                        </group>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -206,8 +211,22 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Supplier Voucher">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
+                        <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
+                            <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|', ('state','!=','posted'), ('paid','=',True)]}"/>
+                        </group>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
+                        <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
+                        <field name="pay_now" invisible="1"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </div>
+                </div>
+                <sheet string="Supplier Voucher" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
                         <field name="date" string="Bill Date" select="1" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                         <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
@@ -268,17 +287,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
-                        <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
-                        <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
-                            <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
-                        </group>
-                        <field name="pay_now" invisible="1"/>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From efccfbc143bb26aa67c4097bea7c87b1e951b769 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 30 Apr 2012 12:45:42 +0530
Subject: [PATCH 3/4] [IMP] Improved code.

bzr revid: tpa@tinyerp.com-20120430071542-gockdwuv70ok2vp3
---
 addons/account/project/project_view.xml        |  2 --
 .../hr_timesheet_invoice_view.xml              | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e7886702971..ee8ea3dbf87 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -81,8 +81,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
-                </div>
                 <sheet string="Analytic account" layout="auto">
                     <group colspan="4" col="6">
                         <field name="name" colspan="4"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index edd4d17ceab..12b782f239c 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -22,14 +22,16 @@
                         <field name="amount_invoiced"/>
                     </group>
                 </group>
-                <xpath expr="/form/div" position='inside'>
-                    <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
-                    <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
-                    <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
-                    <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
-                    <div class="oe_right">
-                        <field name="state" readonly="1" widget="statusbar" nolabel="1"
-                        statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
+                <xpath expr="/form/sheet" position='before'>
+                    <div class="oe_form_topbar">
+                        <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
+                        <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
+                        <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
+                        <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
+                        <div class="oe_right">
+                            <field name="state" readonly="1" widget="statusbar" nolabel="1"
+                            statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
+                        </div>
                     </div>
                 </xpath>
             </field>

From 43d0476172444dbee7c61a67a48f99bbe842a940 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 30 Apr 2012 14:46:38 +0530
Subject: [PATCH 4/4] [FIX] delivery: improved code

bzr revid: tpa@tinyerp.com-20120430091638-onnnbxvw2mkks63h
---
 addons/delivery/delivery_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 8ec3c144eee..db46a4ba7e7 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -316,7 +316,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Products']/group/button[@string='Create Invoice']" position="after">
+                <xpath expr="/form/sheet/notebook/page[@string='Products']/group/button[@string='Create Invoice']" position="after">
                     <button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
                 </xpath>
             </field>