From 5fbb9b5e6adf552875d651c5751c738562eaf28f Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 25 Apr 2012 17:23:27 +0530
Subject: [PATCH 001/117] [IMP] crm: improved view

bzr revid: tpa@tinyerp.com-20120425115327-0zhzw6pihh02p98n
---
 addons/crm/crm_lead_view.xml      | 10 ++++-----
 addons/crm/crm_phonecall_view.xml | 34 ++++++++++++++-----------------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 7de9858713a..40bca1a6dab 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -53,12 +53,12 @@
         <field name="arch" type="xml">
             <form string="Leads Form" layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
                     <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
                     <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause" />
                     <button name="case_escalate" string="Escalate" states="open,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
@@ -401,13 +401,13 @@
         <field name="arch" type="xml">
             <form string="Opportunities" layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />
-                    <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
                     <button name="case_escalate" string="Escalate" states="open,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
                     <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
+                    <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
+                    <button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
@@ -458,7 +458,7 @@
                                 string="Create"
                                 attrs="{'invisible':[('partner_id','!=',False)]}"/>
                         </group>
-                        
+
                         <group col="3" colspan="2">
                             <field name="email_from" string="Email" />
                             <button string="Mail"
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index eb836428b6e..be6a29faee3 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -58,7 +58,18 @@
         <field name="model">crm.phonecall</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Phone Call">
+            <form layout="manual">
+				<div class="oe_form_topbar">
+                    <button name="case_open" string="Todo" states="pending" type="object" icon="gtk-go-forward" />
+                    <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause" />
+                    <button name="case_close" string="Held" states="open,pending" type="object" icon="gtk-jump-to" />
+                    <button name="case_reset" string="Reset to Todo" states="cancel" type="object" icon="gtk-convert" />
+				    <button name="case_cancel" string="Cancel" states="open,pending" type="object" icon="gtk-cancel" />
+				    <div class="oe_right">
+				        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done" statusbar_colors='{"pending":"red"}' select="1"/>
+				    </div>
+				</div>
+                <sheet string="Phone Call" layout="auto">
                  <group colspan="6" col="7">
                     <field name="name" required="1"/>
                     <field name="partner_phone"/>
@@ -103,25 +114,10 @@
                 </group>
                 <separator string="Description" colspan="4" />
                 <field name="description" nolabel="1" colspan="4" />
-                <separator colspan="4" />
-                <group col="8" colspan="4">
-                    <field name="state" widget="statusbar" statusbar_visible="open,done" statusbar_colors='{"pending":"red"}' select="1"/>
-                    <button name="case_cancel" string="Cancel"
-                        states="open,pending" type="object"
-                        icon="gtk-cancel" />
-                    <button name="case_open" string="Todo"
-                        states="pending" type="object"
-                        icon="gtk-go-forward" />
-                    <button name="case_pending" string="Not Held"
-                        states="open" type="object" icon="gtk-media-pause" />
-                    <button name="case_close" string="Held"
-                        states="open,pending" type="object"
-                        icon="gtk-jump-to" />
-                    <button name="case_reset" string="Reset to Todo"
-                        states="cancel" type="object"
-                        icon="gtk-convert" />
-                </group>
+            </sheet>
+            <div class="oe_form_sheet_width">
                 <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+            </div>
             </form>
         </field>
     </record>

From eef8d03d411c6b5d7bb0711f403e42a3e3894c55 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 25 Apr 2012 17:39:35 +0530
Subject: [PATCH 002/117] [IMP] crm_claim: improved view

bzr revid: tpa@tinyerp.com-20120425120935-u0yjq2ltezf9wxju
---
 addons/crm_claim/crm_claim_view.xml | 33 ++++++++++++-----------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index ada4db06237..4f555f2a2ac 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -66,7 +66,18 @@
             <field name="model">crm.claim</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Claims">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
+                    <button name="case_close" string="Done" states="open,pending" type="object" icon="gtk-jump-to" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
+                    <div class="oe_right">
+                        <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Claims" layout="auto">
                     <group>
                         <field name="name" />
                         <field name="date"/>
@@ -102,25 +113,6 @@
                                 </group>
                                 <separator colspan="4" string="Claim/Action Description"/>
                                 <field name="description" colspan="4" nolabel="1"/>
-                                <separator colspan="4" string=""/>
-                                <group col="8" colspan="4">
-                                    <field name="state" select="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                                    <button name="case_cancel" string="Cancel"
-                                        states="draft,open,pending" type="object"
-                                        icon="gtk-cancel" />
-                                    <button name="case_pending" string="Pending"
-                                        states="draft,open" type="object"
-                                        icon="gtk-media-pause" />
-                                    <button name="case_open" string="Open"
-                                        states="draft,pending" type="object"
-                                        icon="gtk-go-forward" />
-                                    <button name="case_close" string="Done"
-                                        states="open,pending" type="object"
-                                        icon="gtk-jump-to" />
-                                    <button name="case_reset"
-                                        string="Reset to Draft" states="done,cancel"
-                                        type="object" icon="gtk-convert" />
-                                </group>
                             </page>
                             <page string="Follow Up">
                                 <group colspan="2" col="2">
@@ -170,6 +162,7 @@
                             </page>
                         </notebook>
                     </group>
+                </sheet>
                 </form>
             </field>
         </record>

From 087b673564d8f3d5b30ea9d3c802e87d14c5acb4 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 25 Apr 2012 18:15:59 +0530
Subject: [PATCH 003/117] [IMP] crm_helpdesk: improved view

bzr revid: tpa@tinyerp.com-20120425124559-zk226lcgs4n6g2yt
---
 addons/crm_helpdesk/crm_helpdesk_view.xml | 41 +++++++++--------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 5f2fee07ff1..bc25468b5fb 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -28,8 +28,20 @@
             <field name="model">crm.helpdesk</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Helpdesk Support">
-                    <group colspan="4" col="7">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="case_open" states="draft,pending" string="Open" type="object" icon="gtk-go-forward" />
+                    <button name="case_pending" states="draft,open" string="Pending" type="object" icon="gtk-media-pause" />
+                    <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object" icon="gtk-go-up" />
+                    <button name="case_close" states="open,draft,pending" string="Close" type="object" icon="gtk-jump-to" />
+                    <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
+                    <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" />
+                    <div class="oe_right">
+                        <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Helpdesk Support" layout="auto">
+                    <group colspan="4" col="7" class="oe_form_header">
                         <field name="name" select="1" string="Query"/>
                         <field name="section_id" widget="selection"/>
                         <field name="user_id" select="1"/>
@@ -64,30 +76,6 @@
 
                             <separator colspan="4" string="Notes"/>
                             <field name="description" colspan="4" nolabel="1" />
-                            <separator colspan="4"/>
-                            <group col="8" colspan="4">
-                                <field name="state" select="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                                <button name="case_cancel"
-                                    states="draft,open,pending" string="Cancel"
-                                    type="object" icon="gtk-cancel" />
-                                <button name="case_open"
-                                    states="draft,pending" string="Open"
-                                    type="object" icon="gtk-go-forward" />
-                                <button name="case_pending"
-                                    states="draft,open" string="Pending"
-                                    type="object" icon="gtk-media-pause" />
-                                <button name="case_escalate"
-                                    states="open,draft,pending"
-                                    string="Escalate" type="object"
-                                    icon="gtk-go-up" />
-                                <button name="case_close"
-                                    states="open,draft,pending" string="Close"
-                                    type="object" icon="gtk-jump-to" />
-                                <button name="case_reset"
-                                    states="done,cancel"
-                                    string="Reset to Draft" type="object"
-                                    icon="gtk-convert" />
-                            </group>
                         </page>
                         <page string="Communication &amp; History" groups="base.group_extended">
                             <group colspan="4">
@@ -136,6 +124,7 @@
                             </group>
                         </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>

From 129499546120dd3e2cf099c75aee2a78478f65d8 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 25 Apr 2012 18:30:11 +0530
Subject: [PATCH 004/117] [IMP] event: improved view

bzr revid: tpa@tinyerp.com-20120425130011-ifxbaqreeu369cik
---
 addons/event/event_view.xml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 4e22569c3e1..7627ac94427 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -50,8 +50,18 @@
             <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Events">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
+                    </div>
+                </div>
+                <sheet string="Events" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="name"/>
                         <field name="date_begin"/>
                         <field name="date_end"/>
@@ -96,13 +106,6 @@
                                     </group>
                             </form>
                             </field>
-                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                        <group col="4" colspan="2">
-                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                        </group>
                     </page>
                     <page string="Speakers" groups="base.group_extended">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
@@ -127,6 +130,7 @@
                         </group>
                     </page>
                     </notebook>
+            </sheet>
             </form>
             </field>
         </record>

From 99c1d2cdc59ebea380d66851ae09d4a31dd7627f Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 25 Apr 2012 18:39:57 +0530
Subject: [PATCH 005/117] [IMP] hr: improved view.

bzr revid: tpa@tinyerp.com-20120425130957-6r6fih3emqyan6ip
---
 addons/hr/hr_view.xml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index a954d916385..ce49c8da6ca 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -346,7 +346,16 @@
             <field name="model">hr.job</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Job">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="job_recruitement" string="In Recruitement" states="open" type="object" icon="gtk-go-forward"/>
+                    <button name="job_open" string="In Position" states="old,recruit" type="object" icon="terp-camera_test"/>
+                    <button name="job_old" string="Mark as Old" states="open,recruit" type="object" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="recruit,open"/>
+                    </div>
+                </div>
+                <sheet string="Job" layout="auto">
                     <group col="6" colspan="4">
                     <field name="name" />
                     <field name="department_id" />
@@ -368,12 +377,7 @@
                             <field name="employee_ids" colspan="4" nolabel="1" widget="many2many" mode="tree,form"/>
                         </page>
                     </notebook>
-                    <group col="6" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
-                        <button name="job_recruitement" string="In Recruitement" states="open" type="object" icon="gtk-go-forward"/>
-                        <button name="job_open" string="In Position" states="old,recruit" type="object" icon="terp-camera_test"/>
-                        <button name="job_old" string="Mark as Old" states="open,recruit" type="object" icon="gtk-cancel"/>
-                    </group>
+                </sheet>
                 </form>
             </field>
         </record>

From 21f8477ce46c7c98301967344fb56461f1c1bf24 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 25 Apr 2012 18:49:43 +0530
Subject: [PATCH 006/117] [IMP] hr_evaluation: improved view

bzr revid: tpa@tinyerp.com-20120425131943-heu93zp6l4i7pu67
---
 addons/hr_evaluation/hr_evaluation_view.xml | 28 ++++++++++-----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e38a8796895..2c192513ed4 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -154,7 +154,18 @@
             <field name="model">hr_evaluation.evaluation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Appraisal">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object" icon="gtk-execute"/>
+                    <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object" icon="gtk-go-forward"/>
+                    <button name="button_done" string="Done" states="progress" type="object" icon="gtk-jump-to"/>
+                    <button name="button_draft" string="Reset to Draft" states="cancel" type="object" icon="terp-stock_effects-object-colorize"/>
+                    <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Appraisal" layout="auto">
                     <group col="4" colspan="3">
                         <separator string="Appraisal Data" colspan="4"/>
                         <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
@@ -198,20 +209,7 @@
                             <field name="note_summary" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
-                    <newline/>
-                    <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
-                        <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
-                                icon="gtk-cancel"/>
-                        <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object"
-                                icon="gtk-execute"/>
-                        <button name="button_done" string="Done" states="progress" type="object"
-                                icon="gtk-jump-to"/>
-                        <button name="button_draft" string="Reset to Draft" states="cancel" type="object"
-                                icon="terp-stock_effects-object-colorize"/>
-                        <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object"
-                                icon="gtk-go-forward"/>
-                    </group>
+              </sheet>
               </form>
             </field>
         </record>

From bbe06d51043c25e1145c2036d743b26a8badc126 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 25 Apr 2012 18:57:01 +0530
Subject: [PATCH 007/117] [IMP] hr_expence: improved view

bzr revid: tpa@tinyerp.com-20120425132701-bsr6t8n5yocneegs
---
 addons/hr_expense/hr_expense_view.xml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 66d2aa89617..c5aaa8a83d7 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -65,7 +65,18 @@
             <field name="type">form</field>
             <field name="model">hr.expense.expense</field>
             <field name="arch" type="xml">
-                <form string="Expenses Sheet">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="confirm" states="draft" string="Submit to Manager" type="workflow" icon="gtk-apply"/>
+                    <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_user"/>
+                    <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_user"/>
+                    <button name="invoice" states="accepted" string="Invoice" type="object" icon="gtk-go-forward" groups="base.group_hr_user"/>
+                    <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,accepted,invoiced" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
+                    </div>
+                </div>
+                <sheet string="Expenses Sheet" layout="auto">
                     <group colspan="4" col="6">
                         <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
                         <field name="name"/>
@@ -99,14 +110,6 @@
                                     </group>
                                 </form>
                             </field>
-                            <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,invoiced" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
-                            <group col="6" colspan="2">
-                                <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_user"/>
-                                <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
-                                <button name="confirm" states="draft" string="Submit to Manager" type="workflow" icon="gtk-apply"/>
-                                <button name="invoice" states="accepted" string="Invoice" type="object" icon="gtk-go-forward" groups="base.group_hr_user"/>
-                                <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_user"/>
-                            </group>
                         </page>
                         <page string="Other Info" groups="base.group_extended">
                             <group col="2" colspan="2">
@@ -124,6 +127,7 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>

From f2801c6071c4fb9f77f1c8d0291176cb5c4c5bb2 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 10:19:51 +0530
Subject: [PATCH 008/117] [IMP] Improved view of leave request

bzr revid: tpa@tinyerp.com-20120426044951-5qfdb1itenm2afux
---
 addons/hr_holidays/hr_holidays_view.xml | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 066ac29c6e3..c1fd627f139 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -63,7 +63,18 @@
             <field name="type">form</field>
             <field name="priority">1</field>
             <field name="arch" type="xml">
-                <form string="Leave Request">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
+                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
+                    <button string="Set to Draft" name="set_to_draft" states="refuse,validate" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
+                    </div>
+                </div>
+                <sheet string="Leave Request" layout="auto">
                     <group col="8" colspan="4">
                     <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
                     <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_manager"/>
@@ -87,17 +98,13 @@
                             <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                             <separator string="Reasons" colspan="4"/>
                             <field name="notes" nolabel="1" colspan="4"/>
-                            <group colspan="4" col="8">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
-                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
-                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                                <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                                <button string="Set to Draft" name="set_to_draft" states="refuse,validate" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
-                            </group>
                             <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
+                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>

From 01a55597b319a3e0c5e44407373d4ff4031210a5 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 10:32:23 +0530
Subject: [PATCH 009/117] [IMP] Improved view of allocation request

bzr revid: tpa@tinyerp.com-20120426050223-1e22zbue2es6qfka
---
 addons/hr_holidays/hr_holidays_view.xml | 29 +++++++++++++++----------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index c1fd627f139..ab31447aa86 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -98,7 +98,6 @@
                             <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                             <separator string="Reasons" colspan="4"/>
                             <field name="notes" nolabel="1" colspan="4"/>
-                            <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                         </page>
                     </notebook>
                 </sheet>
@@ -115,8 +114,19 @@
             <field name="model">hr.holidays</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Allocation Request">
-                <group col="8" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
+                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
+                    <button string="Set to Draft" name="set_to_draft" states="cancel,validate,refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
+                    </div>
+                </div>
+                <sheet string="Allocation Request" layout="auto">
+                <group col="8" colspan="4" class="oe_form_header">
                     <field name="name"/>
                     <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
                         <group attrs="{'invisible':[('holiday_type','=','category')]}">
@@ -137,17 +147,12 @@
                         <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                         <separator string="Reasons" colspan="4"/>
                         <field name="notes" nolabel="1" colspan="4"/>
-                        <group colspan="4" col="8">
-                            <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
-                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
-                            <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                            <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                            <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                            <button string="Set to Draft" name="set_to_draft" states="cancel,validate,refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
-                        </group>
-                        <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                     </page>
                 </notebook>
+            </sheet>
+            <div class="oe_form_sheet_width">
+                <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+            </div>
             </form>
             </field>
         </record>

From f0ccc94e139bac0cacf2e9de1eb68c3a658d03e9 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 26 Apr 2012 10:56:33 +0530
Subject: [PATCH 010/117] [IMP]project: change sequence of button

bzr revid: kjo@tinyerp.com-20120426052633-wz91k7qetnlw3a5l
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 956b159a0bb..f4a301ef084 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -20,13 +20,13 @@
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                     <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
                     <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
                     <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
                     <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
                     <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
                     <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" icon="gtk-new" context="{'parent_id':parent_id}"/>
+                    <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
                     </div>
@@ -224,13 +224,13 @@
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
                     <div class="oe_form_topbar">
-                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                         <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
                         <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/>
                         <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
                         <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                         <button name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
                         <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
+                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                         <div class="oe_right">
                             <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
                         </div>

From c784871374d5daa2507a395606f51d887206ed20 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 11:19:03 +0530
Subject: [PATCH 011/117] [IMP] hr_timesheet_sheet:improved view

bzr revid: tpa@tinyerp.com-20120426054903-vk2931wzi2a8b83q
---
 .../hr_timesheet_sheet_view.xml               | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index d822f10d944..21cfb8482b5 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -60,8 +60,18 @@
             <field name="model">hr_timesheet_sheet.sheet</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Timesheet">
-                    <group colspan="4" col="6">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="button_confirm" states="draft" string="Submited to Manager" type="object" icon="terp-check"/>
+                    <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_user"/>
+                    <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+                    <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_user"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="new,confirm,done"/>
+                    </div>
+                </div>
+                <sheet string="Timesheet" layout="auto">
+                    <group colspan="4" col="6" class="oe_form_header">
                         <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
                         <field name="user_id" invisible="1"/>
                         <field name="date_from"/>
@@ -142,13 +152,7 @@
                             </group>
                         </page>
                     </notebook>
-                    <group col="6" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
-                        <button name="button_confirm" states="draft" string="Submited to Manager" type="object" icon="terp-check"/>
-                        <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                        <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_user"/>
-                        <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_user"/>
-                    </group>
+                </sheet>
                 </form>
             </field>
         </record>

From 313bbfd5d522d6c4bd6ee23ae6f9dffde33714fe Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 11:33:59 +0530
Subject: [PATCH 012/117] [IMP] idea: improved view

bzr revid: tpa@tinyerp.com-20120426060359-3cmt4bgvkm7uhb43
---
 addons/idea/idea_view.xml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index b5a23b80481..72b8dbfa3fc 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -182,8 +182,17 @@
         <field name="model">idea.idea</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-        <form string="New Idea">
-            <group col="6" colspan="4">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                <button name="idea_open" string="Open" states="draft" icon="gtk-go-forward"/>
+                <button name="idea_close" string="Accept" states="open" icon="gtk-jump-to"/>
+                <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/>
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,close"/>
+                </div>
+            </div>
+            <sheet string="New Idea" layout="auto">
+            <group col="6" colspan="4" class="oe_form_header">
                 <field name="name" select="1" />
                 <field name="category_id" select="1"/>
                 <field name="open_date" select="1"/>
@@ -234,15 +243,9 @@
                             <field name="nbr"/>
                         </tree>
                     </field>
-
                 </page>
             </notebook>
-            <group colspan="4" col="6">
-                <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
-                <button name="idea_open" string="Open" states="draft" icon="gtk-go-forward"/>
-                <button name="idea_close" string="Accept" states="open" icon="gtk-jump-to"/>
-                <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/>
-            </group>
+        </sheet>
         </form>
         </field>
     </record>

From e175b4b5f4a3efe4f897db87ee13e70c94fd6445 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 26 Apr 2012 11:36:16 +0530
Subject: [PATCH 013/117] [IMP]project_issuer: add button and state at topbar

bzr revid: kjo@tinyerp.com-20120426060616-aamxajk5xo2ps1yk
---
 addons/project_issue/project_issue_view.xml | 26 +++++++++++++--------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 7c22ad748c0..705f8fc7b05 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -50,7 +50,19 @@
             <field name="model">project.issue</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Issue Tracker Form">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                    <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
+                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Issue Tracker Form" layout="auto">
                     <group colspan="4" col="6">
                         <field name="name"/>
                         <field name="project_id" required="True" on_change="on_change_project(project_id)"/>
@@ -86,15 +98,6 @@
                             <separator string= "Description" colspan="4"/>
                             <field name="description" nolabel="1" colspan="4"/>
                             <separator colspan="4"/>
-                            <group col="8" colspan="4">
-                            <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                            <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                            <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                            <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
-                            <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                            <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                            <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
-                            </group>
                         </page>
                         <page string="Extra Info">
                             <group col="4" colspan="4">
@@ -113,7 +116,10 @@
                             </group>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>

From 4a3025550b745b4995876b11608ba756792665be Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 11:39:21 +0530
Subject: [PATCH 014/117] [IMP] lunch: improved view

bzr revid: tpa@tinyerp.com-20120426060921-akgutslerj1l8oxi
---
 addons/lunch/lunch_view.xml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 7d9cd7255d3..d8ddf82f849 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -23,7 +23,15 @@
             <field name="name">Order</field>
             <field name="model">lunch.order</field>
             <field name="arch" type="xml">
-                <form string="Order">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" icon="gtk-ok" attrs="{'invisible':[('state','=','confirmed')]}"/>
+                    <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed"/>
+                    </div>
+                </div>
+                <sheet string="Order" layout="auto">
                     <field name="user_id" select="1"/>
                     <field name="date" select="1"/>
                     <field name="product" select="1" on_change="onchange_product(product)"/>
@@ -31,13 +39,7 @@
                     <field name="descript"/>
                     <field name="price"/>
                     <field name="cashmove"/>
-                    <newline/>
-                   <separator string="" colspan="4"/>
-                    <group colspan="4" col="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
-                        <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" icon="gtk-ok" attrs="{'invisible':[('state','=','confirmed')]}"/>
-                        <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" icon="gtk-cancel"/>
-                    </group>
+                </sheet>
                 </form>
             </field>
         </record>

From c2c2f87dd165dd74b5359042fd78a471ee353328 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 26 Apr 2012 11:59:46 +0530
Subject: [PATCH 015/117] [IMP] revert the last change

bzr revid: kjo@tinyerp.com-20120426062946-4zxstuvx0ddm0kd1
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index ba6bf6ba780..f4a301ef084 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -229,7 +229,6 @@
                         <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
                         <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                         <button name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
-                        <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
                         <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
                         <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                         <div class="oe_right">
@@ -259,6 +258,7 @@
                             </group>
                             <group col="3" colspan="2">
                                 <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
+                                <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
                             </group>
 
                             <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}"/>

From e2ad2c91bf2505dc832c72bd84a866b222b26790 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 12:12:38 +0530
Subject: [PATCH 016/117] [IMP] improved indentation

bzr revid: tpa@tinyerp.com-20120426064238-vmg237l0jd5td2jb
---
 addons/crm/crm_phonecall_view.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 0a7103cb510..9e4280f1e64 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -59,17 +59,17 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form layout="manual">
-				<div class="oe_form_topbar">
-                    <button name="case_open" string="Todo" states="pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause" />
-                    <button name="case_close" string="Held" states="open,pending" type="object" icon="gtk-jump-to" />
-                    <button name="case_reset" string="Reset to Todo" states="cancel" type="object" icon="gtk-convert" />
-				    <button name="case_cancel" string="Cancel" states="open,pending" type="object" icon="gtk-cancel" />
-				    <div class="oe_right">
-				        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done" statusbar_colors='{"pending":"red"}' select="1"/>
-				    </div>
-				</div>
-                <sheet string="Phone Call" layout="auto">
+            <div class="oe_form_topbar">
+                <button name="case_open" string="Todo" states="pending" type="object" icon="gtk-go-forward" />
+                <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause" />
+                <button name="case_close" string="Held" states="open,pending" type="object" icon="gtk-jump-to" />
+                <button name="case_reset" string="Reset to Todo" states="cancel" type="object" icon="gtk-convert" />
+                <button name="case_cancel" string="Cancel" states="open,pending" type="object" icon="gtk-cancel" />
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done" statusbar_colors='{"pending":"red"}' select="1"/>
+                </div>
+            </div>
+            <sheet string="Phone Call" layout="auto">
                  <group colspan="6" col="7">
                     <field name="name" required="1"/>
                     <field name="partner_phone"/>

From 56e5d0de6250317cee3971e25c58bafd3bb6b4e3 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 26 Apr 2012 12:32:01 +0530
Subject: [PATCH 017/117] [IMP]project_long_term: add button and state at
 topbar

bzr revid: kjo@tinyerp.com-20120426070201-zwwqq9uijfh2byex
---
 .../project_long_term_view.xml                | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7231395a2a9..219cccae6e2 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -103,7 +103,18 @@
             <field name="model">project.phase</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project Phase">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
+                    <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
+                    <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/>
+                    <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
+                    <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
+                    </div>
+                </div>
+                <sheet string="Project Phase" layout="auto">
                     <group colspan="6" col="6">
                         <group colspan="6" col="7" >
                             <field name="name" colspan="4"/>
@@ -128,15 +139,6 @@
                                     <field name="date_end"/>
                                   </form>
                              </field>
-                            <separator string="" colspan="4"/>
-                            <group col="12" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
-                                <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
-                                <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
-                                <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
-                                <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/>
-                                <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
-                            </group>
                         </page>
                         <page string="Tasks Details">
                             <field colspan="4" name="task_ids" readonly="1" context="{'default_project_id' :project_id}" nolabel="1">
@@ -173,6 +175,7 @@
                         </page>
                     </notebook>
                     <newline/>
+                </sheet>
                 </form>
             </field>
         </record>

From 83b6b2a1e58afd04f1942da2fb335ee9a0511ee8 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 12:36:55 +0530
Subject: [PATCH 018/117] [IMP] market_campaign: improved view of campaign

bzr revid: tpa@tinyerp.com-20120426070655-sz8wz151snmlx5yd
---
 .../marketing_campaign_view.xml               | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index d04cde0e428..b618e2d0390 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -15,7 +15,17 @@
         <field name="model">marketing.campaign</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Campaign">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
+                <button name="state_done_set" string="Done" states="running" icon="terp-dialog-close"/>
+                <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
+                <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
+                <div class="oe_right">
+                    <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,running,done"/>
+                </div>
+            </div>
+            <sheet string="Campaign" layout="auto">
                 <group colspan="4" col="6">
                     <group colspan="2" col="2">
                         <separator string="Campaign" colspan="2" />
@@ -34,14 +44,7 @@
                     </group>
                 </group>
                 <field name="activity_ids" nolabel = "1" colspan="4" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" />
-                <separator string="" colspan="4" />
-                <group col="10" colspan="4">
-                    <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
-                    <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
-                    <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
-                    <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
-                    <button name="state_done_set" string="Done" states="running" icon="terp-dialog-close"/>
-                </group>
+              </sheet>
               </form>
         </field>
     </record>

From bdeac6b5f36dd4d24481695180d86583164af999 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 12:39:23 +0530
Subject: [PATCH 019/117] [IMP] market_campaign: improved view of segments

bzr revid: tpa@tinyerp.com-20120426070923-jttlccs7hoesx2xj
---
 .../marketing_campaign_view.xml               | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index b618e2d0390..315cce6966a 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -138,7 +138,17 @@
         <field name="model">marketing.campaign.segment</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Segments">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
+                <button name="state_done_set" string="Close" states="running" icon="terp-dialog-close"/>
+                <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
+                <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
+                <div class="oe_right">
+                    <field name="state" readonly="1" nolabel="1" widget="statusbar" statusbar_visible="draft,running,done"/>
+                </div>
+            </div>
+            <sheet string="Segments" layout="auto">
                 <group colspan="2" col="2">
                     <separator string="Segment" colspan="4"/>
                     <field name="name"/>
@@ -162,14 +172,7 @@
                     <field name="date_run" readonly="1"/>
                     <field name="date_done" readonly="1"/>
                 </group>
-                <separator string="" colspan="4"/>
-                <group col="6" colspan="4">
-                    <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
-                    <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
-                    <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
-                    <button name="state_done_set" string="Close" states="running" icon="terp-dialog-close"/>
-                    <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
-                </group>
+            </sheet>
             </form>
         </field>
     </record>

From baa8158e77b1bacd2ae8e332497b6dcfa2b9cc9f Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 12:42:37 +0530
Subject: [PATCH 020/117] [IMP] market_campaign: improved view of market
 campaign activities

bzr revid: tpa@tinyerp.com-20120426071237-ev10lthxgp0pb4pm
---
 .../marketing_campaign_view.xml               | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 315cce6966a..efef0f7be72 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -362,7 +362,16 @@
         <field name="model">marketing.campaign.workitem</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Marketing Campaign Activities">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
+                <button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-undo"/>
+                <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="terp-gtk-stop"/>
+                <div class="oe_right">
+                    <field name="state" readonly="True" nolabel="1" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
+                </div>
+            </div>
+            <sheet string="Marketing Campaign Activities" layout="auto">
                 <group colspan="4" col="6">
                     <group colspan="2" col="2">
                         <separator string="Campaign Step" colspan="2"/>
@@ -386,13 +395,7 @@
                     <separator string="Error Message" colspan="4"/>
                     <field name="error_msg" nolabel="1" colspan="4"/>
                 </group>
-                <separator string="" colspan="4"/>
-                <group colspan="4" col="11">
-                    <field name="state" readonly="True" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
-                    <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="terp-gtk-stop"/>
-                    <button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-undo"/>
-                    <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
-                </group>
+            </sheet>
             </form>
         </field>
     </record>

From de51d6b236448b8b4be499ac6b59ec151a067c45 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 13:00:27 +0530
Subject: [PATCH 021/117] [IMP] improved sequence of the button

bzr revid: tpa@tinyerp.com-20120426073027-4plcov0livglxv5m
---
 addons/crm/crm_lead_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a242596a677..7add9410491 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -54,11 +54,11 @@
             <form string="Leads Form" layout="manual">
                 <div class="oe_form_topbar">
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
                     <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause" />
                     <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
+                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
@@ -402,9 +402,9 @@
             <form string="Opportunities" layout="manual">
                 <div class="oe_form_topbar">
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
+                    <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
                     <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
-                    <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
                     <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
                     <button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />

From 29b04c66392c1192d5bb4b5c2a69881ef6bd6c92 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 14:10:41 +0530
Subject: [PATCH 022/117] [IMP] set buttons in proper sequence.

bzr revid: tpa@tinyerp.com-20120426084041-6t3ps0qt7frl05rl
---
 addons/crm_claim/crm_claim_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index e3853994f43..60d5379787f 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -69,8 +69,8 @@
                 <form layout="manual">
                 <div class="oe_form_topbar">
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
                     <button name="case_close" string="Done" states="open,pending" type="object" icon="gtk-jump-to" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
                     <div class="oe_right">

From f9c8ab38c08606170fe7d4780d5cffb369a06003 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 26 Apr 2012 14:12:45 +0530
Subject: [PATCH 023/117] [IMP]purchase: add state at topbar

bzr revid: kjo@tinyerp.com-20120426084245-mjpjg77mrosyy1sh
---
 addons/purchase/purchase_view.xml | 32 ++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index a074f4d7a08..483f090d4a7 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -130,7 +130,22 @@
             <field name="model">purchase.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Purchase Order">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                    <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
+                    <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
+                    <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
+                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
+                    <button name="purchase_approve" states="confirmed" string="Approved" icon="gtk-go-forward"/>
+                    <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
+                    <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
+                    <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
+                    </div>
+                </div>
+                <sheet string="Purchase Order" layout="auto">
                     <group col="6" colspan="4">
                         <field name="name"/>
                         <field name="date_order"/>
@@ -164,18 +179,6 @@
                                 <field name="amount_total" sum="Total amount"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                             </group>
-                            <group col="11" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
-                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
-                                <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                                <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
-                                <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
-                                <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
-                                <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
-                                <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
-                                <button name="purchase_approve" states="confirmed" string="Approved" icon="gtk-go-forward"/>
-                                <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
-                            </group>
                         </page>
                         <page string="Delivery &amp; Invoicing">
                             <group colspan="2" col="2">
@@ -203,7 +206,10 @@
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>

From 18a5714ab4d85529f1f51c0dc0e6b4474caa7457 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 14:14:00 +0530
Subject: [PATCH 024/117] [IMP] improved view

bzr revid: tpa@tinyerp.com-20120426084400-k36hv8xbqunb5v73
---
 addons/mrp/mrp_view.xml | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 121567b3e56..86e8b655f95 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -632,7 +632,20 @@
             <field name="model">mrp.production</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Manufacturing Orders">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
+                    <button name="button_produce" states="ready" string="Start Production" icon="terp-gtk-jump-to-ltr"/>
+                    <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
+                    <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
+                    <button name="button_recreate" states="picking_except" string="Recreate Picking" icon="terp-document-new"/>
+                    <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
+                    <button name="action_cancel" type="object" states="confirmed" string="Cancel" icon="gtk-stop"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Manufacturing Orders" layout="auto">
                     <group colspan="4" col="7">
                         <field name="name" string="Reference"/>
                         <field name="date_planned"/>
@@ -699,17 +712,6 @@
                                            states="done,cancel"/>
                                    </tree>
                                </field>
-                            <separator colspan="4"/>
-                            <group col="9" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
-                                <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
-                                <button name="action_cancel" type="object" states="confirmed" string="Cancel" icon="gtk-stop"/>
-                                <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
-                                <button name="button_produce" states="ready" string="Start Production" icon="terp-gtk-jump-to-ltr"/>
-                                <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
-                                <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
-                                <button name="button_recreate" states="picking_except" string="Recreate Picking" icon="terp-document-new"/>
-                            </group>
                         </page>
                         <page string="Finished Products">
                             <field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list"
@@ -787,7 +789,10 @@
                             <field name="move_prod_id"/>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>

From ba083690454213034895ad841db2f78405f0170a Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 14:21:11 +0530
Subject: [PATCH 025/117] [IMP] point_of_sale: improved view.

bzr revid: tpa@tinyerp.com-20120426085111-0ewm61gmf34wab2d
---
 addons/point_of_sale/point_of_sale_view.xml | 24 +++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 2622c2ba863..3b938c6ad4e 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -16,8 +16,18 @@
             <field name="model">pos.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="PoS Orders">
-                    <group col="7" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="%(action_pos_payment)d" string="Payment" icon="gtk-apply" type="action" states="draft"/>
+                    <button name="refund" string="Return Products" type="object" icon="gtk-ok"
+                        attrs="{'invisible':[('state','=','draft')]}"/>
+                    <button name="%(action_report_pos_receipt)d" string="Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
+                    </div>
+                </div>
+                <sheet string="PoS Orders" layout="auto">
+                    <group col="7" colspan="4" class="oe_form_header">
                         <field name="name"/>
                         <field name="date_order"/>
                         <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_customer':1}" attrs="{'readonly': [('state','=','invoiced')]}"/>
@@ -50,15 +60,6 @@
                                 <button name="button_dummy" string="Update" icon="gtk-execute" states="draft" />
                                 <button name="%(action_pos_discount)d" string="Discount" icon="gtk-remove" type="action" states="draft" />
                             </group>
-
-                            <separator colspan="4"/>
-                            <group colspan="4" col="8">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
-                                <button name="%(action_pos_payment)d" string="Payment" icon="gtk-apply" type="action" states="draft"/>
-                                <button name="refund" string="Return Products" type="object" icon="gtk-ok"
-                                    attrs="{'invisible':[('state','=','draft')]}"/>
-                                <button name="%(action_report_pos_receipt)d" string="Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
-                            </group>
                         </page>
                         <page string="Payment">
                             <field name="statement_ids" colspan="4" nolabel="1">
@@ -99,6 +100,7 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>

From 47ab09b285826ef1015fa971403799012b4d9622 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 26 Apr 2012 14:32:23 +0530
Subject: [PATCH 026/117] [IMP]purchase_requisition: add state at topbar

bzr revid: kjo@tinyerp.com-20120426090223-w0hz301bd4h1nyyg
---
 .../purchase_requisition_view.xml             | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index c03afa7b544..93fefe79c65 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -46,7 +46,17 @@
         <field name="type">form</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <form string="Purchase Requisition">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                <button name="tender_in_progress" states="draft" string="Start" type="object" icon="gtk-apply" />
+                <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
+                <button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
+                <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
+                <div class="oe_right">
+                    <field name="state" nolabel="1" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
+                </div>
+            </div>
+            <sheet string="Purchase Requisition" layout="auto">
                 <group colspan="4" col="6">
                     <field name="name"/>
                     <field name="user_id"/>
@@ -73,14 +83,6 @@
                             </form>
 
                         </field>
-                    <separator colspan="4"/>
-                    <group col="8" colspan="4">
-                        <field name="state" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
-                        <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
-                        <button name="tender_in_progress" states="draft" string="Start" type="object" icon="gtk-apply" />
-                        <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
-                        <button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
-                    </group>
                     </page>
                     <page string="Quotations">
                         <field colspan="4" name="purchase_ids" nolabel="1" mode="tree,form">
@@ -109,6 +111,7 @@
                         <field name="description" colspan="4" nolabel="1"/>
                     </page>
                 </notebook>
+            </sheet>
             </form>
         </field>
     </record>

From 85fa10c7633aabce77abde37ffad5c49a80a3d9c Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 14:58:07 +0530
Subject: [PATCH 027/117] [IMP] crm_fundraising:improved view

bzr revid: tpa@tinyerp.com-20120426092807-zex30x0effj3lyku
---
 .../crm_fundraising/crm_fundraising_view.xml  | 39 +++++++------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 48eb1aa3072..1bef2520f91 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -77,8 +77,20 @@
             <field name="model">crm.fundraising</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Funds Form">
-                    <group colspan="4" col="6">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
+                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-close" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Funds Form" layout="auto">
+                    <group colspan="4" col="6" class="oe_form_header">
                         <field name="name" select="1" string="Name"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="user_id" string="Responsible"/>
@@ -103,28 +115,6 @@
                             </group>
                             <separator colspan="4" string="Notes"/>
                                 <field name="description" nolabel="1" colspan="4"/>
-                            <separator colspan="4"/>
-                            <group col="8" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                                <button name="case_cancel" string="Cancel"
-                                    states="draft,open,pending" type="object"
-                                    icon="gtk-cancel" />
-                                <button name="case_open" string="Open"
-                                    states="draft,pending" type="object"
-                                    icon="gtk-go-forward" />
-                                <button name="case_pending" string="Pending"
-                                    states="draft,open" type="object"
-                                    icon="gtk-media-pause" />
-                                <button name="case_escalate" string="Escalate"
-                                    states="open,draft,pending" type="object"
-                                    icon="gtk-go-up" />
-                                <button name="case_close" string="Done"
-                                    states="open,draft,pending" type="object"
-                                    icon="gtk-close" />
-                                <button name="case_reset"
-                                    string="Reset to Draft" states="done,cancel"
-                                    type="object" icon="gtk-convert" />
-                            </group>
                         </page>
                         <page string="Communication &amp; History">
                             <group colspan="4">
@@ -170,6 +160,7 @@
                             </group>
                         </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>

From 78f95b113a55d4d548743cf1696b88b0dc71f4d1 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 15:12:17 +0530
Subject: [PATCH 028/117] [IMP] survey: improved view

bzr revid: tpa@tinyerp.com-20120426094217-sxiquslhetn5kzy5
---
 addons/survey/survey_view.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 36a15948b5a..7ced238b9b2 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -18,7 +18,16 @@
             <field name="model">survey</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Survey">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="survey_open" string="Open" states="cancel,close" type="object" icon="gtk-go-forward"/>
+                    <button name="survey_close" string="Close" states="open" type="object" icon="gtk-close"/>
+                    <button name="survey_cancel" string="Cancel" states="open" type="object" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,close"/>
+                    </div>
+                </div>
+                <sheet string="Survey" layout="auto">
                     <field name="title" select="1"/>
                     <group col="6" colspan="6">
                         <field name="responsible_id"/>
@@ -180,16 +189,6 @@
                                     </field>
                                 </form>
                             </field>
-                            <group col="9" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="open,close"/>
-                                <button name="survey_cancel"
-                                    string="Cancel" states="open" type="object" icon="gtk-cancel"/>
-                                <button name="survey_open"
-                                    string="Open" states="cancel,close" type="object"
-                                    icon="gtk-go-forward"/>
-                                <button name="survey_close"
-                                    string="Close" states="open" type="object" icon="gtk-close"/>
-                            </group>
                         </page>
                         <page string="Other">
                             <group colspan="6" col='4'>
@@ -223,6 +222,7 @@
                                </field>
                            </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>

From 24d5c94bb9635feddab4d876835ae781a922762c Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 15:22:54 +0530
Subject: [PATCH 029/117] [IMP] improved view of registation

bzr revid: tpa@tinyerp.com-20120426095254-swrl3mlrgyrwyxhn
---
 addons/event/event_view.xml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index b8ccf0e720e..60a85a19582 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -160,9 +160,9 @@
                 </tree>
             </field>
         </record>
-        
+
         <!-- Event Kanban View -->
-	
+
 	<record model="ir.ui.view" id="view_event_kanban">
             <field name="name">event.event.kanban</field>
             <field name="model">event.event</field>
@@ -357,7 +357,17 @@
             <field name="model">event.registration</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Registration">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                    <button name="button_reg_close" string="Attended" states="open" type="object" icon="gtk-apply"/>
+                    <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
+                    </div>
+                </div>
+                <sheet string="Registration" layout="auto">
                     <group col="6" colspan="4">
                         <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
                         <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
@@ -380,15 +390,6 @@
                                 <field name="event_begin_date" />
                                 <field name="event_end_date" />
                             </group>
-
-                            <separator string="" colspan="4"/>
-                            <group col="8" colspan="4">
-                                <field name="state" select="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
-                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                                <button name="button_reg_close" string="Attended" states="open" type="object" icon="gtk-apply"/>
-                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                            </group>
                         </page>
                         <page string="Emails">
 <!--
@@ -410,6 +411,7 @@
                            </page>
 
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>

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 030/117] [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 f87fd6990b9cddd6c531bf65f2eda70f4d3e5cb9 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 26 Apr 2012 16:23:43 +0530
Subject: [PATCH 031/117] [IMP]stock: add state at topbar

bzr revid: kjo@tinyerp.com-20120426105343-8pslees62jtjx1oi
---
 addons/stock/stock_view.xml | 130 +++++++++++++++++++++---------------
 1 file changed, 75 insertions(+), 55 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 95d0acd853d..a25d10b2016 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -691,7 +691,20 @@
             <field name="type">form</field>
             <field eval="12" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Internal Picking List">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
+                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
+                    <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
+                    <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                    <button name="action_process" states="assigned" string="Process"  groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
+                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl" />
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Internal Picking List" layout="auto">
                     <group colspan="4" col="6">
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
@@ -795,16 +808,6 @@
                                     </group>
                                 </form>
                             </field>
-                            <group col="10" colspan="4">
-                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
-                                <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
-                                <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
-                                <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
-                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="action_process" states="assigned" string="Process"  groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
-                                <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl" />
-                            </group>
                         </page>
                         <page string="Additional info">
                             <field name="auto_picking"/>
@@ -817,6 +820,7 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>
@@ -881,7 +885,21 @@
             <field name="model">stock.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Delivery Orders">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
+                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
+                    <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
+                    <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                    <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
+                    <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
+                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl"/>
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Delivery Orders" layout="auto">
                     <group col="6" colspan="4">
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
@@ -984,17 +1002,6 @@
                                     </group>
                                 </form>
                             </field>
-                            <group col="12" colspan="4">
-                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
-                                <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
-                                <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
-                                <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
-                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
-                                <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
-                                <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl"/>
-                            </group>
                         </page>
                         <page string="Additional info">
                             <field name="auto_picking"/>
@@ -1007,7 +1014,10 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>
@@ -1100,7 +1110,21 @@
             <field name="model">stock.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Input Picking List">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
+                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
+                    <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
+                    <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                    <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
+                    <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
+                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" />
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Input Picking List" layout="auto">
                     <group colspan="4" col="6">
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
@@ -1201,17 +1225,6 @@
                                     </group>
                                 </form>
                             </field>
-                            <group col="10" colspan="4">
-                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
-                                <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
-                                <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
-                                <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
-                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
-                                <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
-                                <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" />
-                            </group>
                         </page>
                         <page string="Additional Info">
                             <field name="type"/>
@@ -1221,7 +1234,10 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>
@@ -1401,7 +1417,17 @@
             <field name="type">form</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Stock Moves">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                        <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
+                        <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
+                        <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
+                        <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Stock Moves" layout="auto">
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -1452,15 +1478,7 @@
                               states="draft,waiting,confirmed,assigned"
                               string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
                     </group>
-
-                    <separator colspan="4"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
-                    <group col="4" colspan="2">
-                        <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
-                        <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
-                        <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                        <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
-                    </group>
+                </sheet>
                 </form>
             </field>
         </record>
@@ -1587,7 +1605,17 @@
             <field name="type">form</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Receive Products">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
+                    <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
+                    <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" icon="gtk-go-forward"/>
+                    <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Receive Products" layout="auto">
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -1638,15 +1666,7 @@
                               states="draft,waiting,confirmed,assigned,done"
                               string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
                     </group>
-
-                    <separator colspan="4"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
-                    <group col="5" colspan="2">
-                        <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
-                        <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
-                        <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                        <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" icon="gtk-go-forward"/>
-                    </group>
+                </sheet>
                 </form>
             </field>
         </record>

From 1bedaf8b57bafabff55183ecf8bb6db3b9937336 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 16:37:55 +0530
Subject: [PATCH 032/117] [IMP] improved sequence of the button

bzr revid: tpa@tinyerp.com-20120426110755-ryx8eox3b8p12u6y
---
 addons/hr_recruitment/hr_recruitment_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 1adc30daa28..4041dc69698 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -76,11 +76,11 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                 <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
                 <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
+                <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
                 <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
+                <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                 <div class="oe_right">
                     <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </div>

From d6cd590ba82e4cd775ab8b74913083231056682f Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 26 Apr 2012 16:40:29 +0530
Subject: [PATCH 033/117] [IMP]sale: Improve button sequence

bzr revid: mma@tinyerp.com-20120426111029-tab0zmiwugbiru3r
---
 addons/sale/sale_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 278f21cafc2..4e4c4d7c27e 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -99,20 +99,20 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
+                    <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
+                    <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
+                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/>
                     <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
                     <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
                     <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
                     <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
-                    <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
                     <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
-                    <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
                     <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                    <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
                     <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
                     <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
-                    <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
-                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/>
+                    <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
+                    <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>

From ddfefd355eeefb261ce9ddf7c0a674e1ada6ff53 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 26 Apr 2012 17:16:30 +0530
Subject: [PATCH 034/117] [IMP]stock: rearrage the state button

bzr revid: kjo@tinyerp.com-20120426114630-h0jdyq86xhlppzwr
---
 addons/stock/stock_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a25d10b2016..680d15a55ee 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -693,8 +693,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
                     <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
+                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
                     <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                     <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                     <button name="action_process" states="assigned" string="Process"  groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
@@ -887,8 +887,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                     <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
+                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                     <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                     <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                     <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
@@ -1112,8 +1112,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                     <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
+                    <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                     <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                     <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                     <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
@@ -1419,9 +1419,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
+                        <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
                         <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
                         <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                        <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
                         <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>

From fa5ae7744e35d3198fbe9b3ad195934a5a05c377 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 17:51:11 +0530
Subject: [PATCH 035/117] [IMP] improved view of invoice and supplier invoice

bzr revid: tpa@tinyerp.com-20120426122111-7k31tnypw4rem64j
---
 addons/account/account_invoice_view.xml | 54 ++++++++++++++++---------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 462e7d56937..3a5c9c24466 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -144,8 +144,19 @@
             <field name="type">form</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-                <form string="Supplier Invoice">
-                    <group col="8" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
+                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Supplier Invoice" layout="auto">
+                    <group col="8" colspan="4" class="oe_form_header">
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
@@ -205,13 +216,6 @@
                                 <field name="amount_total"/>
                                 <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                 <field name="residual"/>
-                                <group col="6" colspan="4">
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
-                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
-                                </group>
                             </group>
                         </page>
                         <page string="Other Info">
@@ -243,7 +247,10 @@
                             </field>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>
@@ -253,8 +260,21 @@
             <field name="model">account.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invoice">
-                    <group colspan="4" col="8">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_proforma_invoices"/>
+                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
+                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
+                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
+                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Invoice" layout="auto">
+                    <group colspan="4" col="8" class="oe_form_header">
                     <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
                     <field name="number"/>
                     <field name="type" invisible="1"/>
@@ -299,15 +319,6 @@
                                 <field name="amount_total"/>
                                 <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                 <field name="residual"/>
-                                <group col="8" colspan="4" groups="base.group_user">
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
-                                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_proforma_invoices"/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
-                                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
-                                </group>
                             </group>
                         </page>
                         <page string="Other Info">
@@ -338,7 +349,10 @@
                             </field>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>

From acf348f6748d5d172e2257c60bb5a118734d9b2c Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 17:56:42 +0530
Subject: [PATCH 036/117] [IMP] improved view of bank statement

bzr revid: tpa@tinyerp.com-20120426122642-uq65dee10v41jhod
---
 addons/account/account_view.xml | 41 +++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 7829dc91e03..8f5212122f3 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -592,8 +592,17 @@
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bank Statement">
-                    <group col="7" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
+                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
+                    <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                    </div>
+                </div>
+                <sheet string="Bank Statement" layout="auto">
+                    <group col="7" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
                         <field name="date" select="1" on_change="onchange_date(date, company_id)"/>
                         <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" select="1" widget="selection"/>
@@ -637,13 +646,7 @@
                             <field colspan="4" name="move_line_ids" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
-                        <field name="balance_end"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
-                        <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
-                        <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
-                    </group>
+                </sheet>
                 </form>
             </field>
         </record>
@@ -2611,8 +2614,17 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Statement">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-dialog-close" type="object"/>
+                    <button name="button_open" states="draft" string="Open CashBox" icon="gtk-go-forward" type="object"/>
+                    <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                    </div>
+                </div>
+                <sheet string="Statement" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
                         <field name='company_id' widget="selection" groups="base.group_multi_company" />
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1" widget="selection"/>
@@ -2701,12 +2713,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             <field name="balance_end_cash"/>
                         </group>
                     </group>
-                    <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm" colspan="4"/>
-                        <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object"/>
-                        <button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-dialog-close" type="object"/>
-                        <button name="button_open" states="draft" string="Open CashBox" icon="gtk-go-forward" type="object"/>
-                    </group>
+                </sheet>
                 </form>
             </field>
         </record>

From e278002b6d9920074c95985f2d5e2c96150834c9 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 18:06:23 +0530
Subject: [PATCH 037/117] [FIX] account_cancel:improved view.

bzr revid: tpa@tinyerp.com-20120426123623-sffejafuv92d8boh
---
 addons/account_cancel/account_cancel_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_cancel/account_cancel_view.xml b/addons/account_cancel/account_cancel_view.xml
index 72517c9d090..65bca70565f 100644
--- a/addons/account_cancel/account_cancel_view.xml
+++ b/addons/account_cancel/account_cancel_view.xml
@@ -19,7 +19,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
+                <xpath expr="/form/div/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
                 </xpath>
             </field>
@@ -31,7 +31,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
+                <xpath expr="/form/div/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
                 </xpath>
             </field>

From 22ad2bd78a2d38e93f75da18e6d284f4b045779f Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 26 Apr 2012 18:12:22 +0530
Subject: [PATCH 038/117] [IMP]sale: Improvement is done

bzr revid: mma@tinyerp.com-20120426124222-4rdsjmk7nsjeci07
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4e4c4d7c27e..04da8fb2065 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -101,7 +101,6 @@
                 <div class="oe_form_topbar">
                     <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
                     <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
-                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/>
                     <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
                     <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
                     <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
@@ -111,6 +110,7 @@
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                     <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
                     <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
+                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/>
                     <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
                     <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
                     <div class="oe_right">

From ad0c747046f1bf96617fe25a93bcd8310bf0f328 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 26 Apr 2012 18:48:27 +0530
Subject: [PATCH 039/117] [IMP] improved code

bzr revid: tpa@tinyerp.com-20120426131827-xnfvmb2fmdes6xum
---
 addons/account_cancel/account_cancel_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_cancel/account_cancel_view.xml b/addons/account_cancel/account_cancel_view.xml
index 65bca70565f..ccb54634db3 100644
--- a/addons/account_cancel/account_cancel_view.xml
+++ b/addons/account_cancel/account_cancel_view.xml
@@ -19,7 +19,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/div/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
+                <xpath expr="/form/div/button[@name='invoice_cancel']" position="replace">
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
                 </xpath>
             </field>
@@ -31,7 +31,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/div/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
+                <xpath expr="/form/div/button[@name='invoice_cancel']" position="replace">
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
                 </xpath>
             </field>

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 040/117] [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 dc908ca7de2a1615df86942d700875af9ed14b12 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 11:00:42 +0530
Subject: [PATCH 041/117] [FIX] account_voucher: improved view.

bzr revid: tpa@tinyerp.com-20120427053042-4qh89baq4fbo50ej
---
 addons/account_voucher/account_voucher_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index e519d23b09e..5b1850f472c 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -218,7 +218,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
+                <xpath expr="/form/sheet/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
                     <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
             </field>
@@ -230,7 +230,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='sequence']" position="before">
+                <xpath expr="/form/sheet/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='sequence']" position="before">
                     <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
             </field>
@@ -241,7 +241,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='amount']" position="after">
+                <xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/tree/field[@name='amount']" position="after">
                     <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
             </field>
@@ -253,7 +253,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='line_ids']/form/field[@name='amount']" position="after">
+                <xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/form/field[@name='amount']" position="after">
                     <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
             </field>

From 944cde2aef70c70aea1d697d6f79e60b08abc716 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 11:11:24 +0530
Subject: [PATCH 042/117] [FIX] mrp_operation: improved view

bzr revid: tpa@tinyerp.com-20120427054124-dkr0zaa4tt3ddxjf
---
 addons/mrp_operations/mrp_operations_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index ec2ef72d40d..0fbcdbe6391 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -29,7 +29,7 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
-           <xpath expr="/form/notebook/page/field[@name='workcenter_lines']/tree/field[@name='hour']" position="after">
+           <xpath expr="/form/sheet/notebook/page/field[@name='workcenter_lines']/tree/field[@name='hour']" position="after">
                 <field name="state"/>
                 <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
                 <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>

From a615218123c8352c8e9f11b1bd1049224731c9c9 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 11:18:18 +0530
Subject: [PATCH 043/117] [FIX] analytic_journal_billing_rate: improved view.

bzr revid: tpa@tinyerp.com-20120427054818-l20avyc6laelqr5j
---
 .../analytic_journal_billing_rate_view.xml                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
index f2a366558ec..f275583826a 100644
--- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
+++ b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
@@ -47,7 +47,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
+                <xpath expr="/form/sheet/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
                     <field name="account_id"  domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount, journal_id)"/>
                 </xpath>
             </field>

From dabd5685ba457bafc549628e6bc54c11a5e6d247 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 11:48:34 +0530
Subject: [PATCH 044/117] [FIX] delivery: improved view

bzr revid: tpa@tinyerp.com-20120427061834-5fpkqyz5e5a11ba3
---
 addons/delivery/delivery_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index f39e8a59f39..8ec3c144eee 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -247,7 +247,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_in_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
+                <xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
                     <field name="weight"/>
                     <field name="weight_net"/>
                 </xpath>
@@ -260,7 +260,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
+                <xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
                     <field name="weight"/>
                     <field name="weight_net"/>
                 </xpath>

From fc1827cdd569c754de44e6148bfcc96894a41d25 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 11:50:03 +0530
Subject: [PATCH 045/117] [FIX]sale:improved code

bzr revid: tpa@tinyerp.com-20120427062003-whk674fro6st1vas
---
 addons/sale/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 578a6fb5802..a4198432ded 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -19,7 +19,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
-                 <xpath expr="/form/group/field[@name='tracking_id']"  position="before">
+                 <xpath expr="/form/sheet/group/field[@name='tracking_id']"  position="before">
                     <field name="sale_line_id" colspan="2"/>
                 </xpath>
             </field>

From 0960f9b10580faaea9bb3f84f41153aac5b5a7b3 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 12:13:50 +0530
Subject: [PATCH 046/117] [FIX] analytic_user_function: improved code

bzr revid: tpa@tinyerp.com-20120427064350-2uulr9e0b0jhekte
---
 addons/analytic_user_function/analytic_user_function_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 763b3115814..a3995d33808 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -50,7 +50,7 @@
             <field name="priority" eval="18"/>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
+                <xpath expr="/form/sheet/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
                     <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)"/>
                 </xpath>
             </field>
@@ -64,7 +64,7 @@
             <field name="priority" eval="19"/>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='timesheet_ids']/form/field[@name='account_id']" position="replace">
+                <xpath expr="/form/sheet/notebook/page/field[@name='timesheet_ids']/form/field[@name='account_id']" position="replace">
                     <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)"/>
                 </xpath>
             </field>

From f435b7b5aad9aed49b09292cb449dc651ed58613 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 12:21:44 +0530
Subject: [PATCH 047/117] [FIX] mrp_operation: improved code

bzr revid: tpa@tinyerp.com-20120427065144-1btngvw0swcge2et
---
 addons/mrp_operations/mrp_operations_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 0fbcdbe6391..843acd313bc 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -8,7 +8,7 @@
 	    <field name="type">form</field>
 	    <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
 	    <field name="arch" type="xml">
-	       <xpath expr="/form/notebook/page/field[@name='workcenter_lines']/form/field[@name='hour']" position="after">
+	       <xpath expr="/form/sheet/notebook/page/field[@name='workcenter_lines']/form/field[@name='hour']" position="after">
 	           <group colspan="8" col="8">
 	               <separator colspan="8"/>
                    <field name="state"/>

From 668a212dda4d7b102de2c280e36f554fa6cb07d8 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 12:39:21 +0530
Subject: [PATCH 048/117] [FIX] purchase: improved code

bzr revid: tpa@tinyerp.com-20120427070921-jwr0ruao8kuj3oz1
---
 addons/purchase/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index f29783c67ae..55204af6dde 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
-                 <xpath expr="/form/group/field[@name='tracking_id']" position="before">
+                 <xpath expr="/form/sheet/group/field[@name='tracking_id']" position="before">
                     <field name="purchase_line_id" colspan="2" />
                 </xpath>
             </field>

From 9f8b0715ab4158bcbdf878bec07a80caeaa5ef9a Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 13:04:43 +0530
Subject: [PATCH 049/117] [FIX] sale_mrp: improved code

bzr revid: tpa@tinyerp.com-20120427073443-m1k1h7uf1e1lro2m
---
 addons/sale_mrp/sale_mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_mrp/sale_mrp_view.xml b/addons/sale_mrp/sale_mrp_view.xml
index d4d2c153d76..18014c01ae9 100644
--- a/addons/sale_mrp/sale_mrp_view.xml
+++ b/addons/sale_mrp/sale_mrp_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='move_prod_id']" position="after">
+                <xpath expr="/form/sheet/notebook/page/field[@name='move_prod_id']" position="after">
                     <field name="sale_name"/>
                     <field name="sale_ref"/>
                 </xpath>

From 2b04f2f32051b8656f75abc14e898d98d4d7c997 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 14:45:00 +0530
Subject: [PATCH 050/117] [IMP]:crm:Buttons of records must match to the order
 of the status bar. from left to right.

bzr revid: apa@tinyerp.com-20120427091500-w02yddph6z1yhep5
---
 addons/crm/crm.py                               | 5 +++--
 addons/crm/crm_lead_view.xml                    | 6 +++---
 addons/crm/crm_phonecall.py                     | 4 ++--
 addons/crm/crm_phonecall_view.xml               | 2 +-
 addons/crm_claim/crm_claim_view.xml             | 2 +-
 addons/crm_fundraising/crm_fundraising_view.xml | 2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml       | 2 +-
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 467ea64e633..2b0dccd275a 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -31,9 +31,10 @@ MAX_LEVEL = 15
 AVAILABLE_STATES = [
     ('draft', 'New'),
     ('open', 'In Progress'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
     ('pending', 'Pending'),
+    ('done', 'Closed'),
+    ('cancel', 'Cancelled'),
+    
 ]
 
 AVAILABLE_PRIORITIES = [
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index d915c73ac09..d85b4b2e4b5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -53,11 +53,11 @@
         <field name="arch" type="xml">
             <form string="Leads Form" layout="manual">
                 <div class="oe_form_topbar">
+                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
                     <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause" />
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
-                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
                     <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
@@ -401,8 +401,8 @@
         <field name="arch" type="xml">
             <form string="Opportunities" layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
                     <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
                     <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
                     <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index e869c2a890a..2b8eb9d1435 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -51,9 +51,9 @@ class crm_phonecall(crm_base, osv.osv):
         'state': fields.selection([
                                     ('draft', 'Draft'),
                                     ('open', 'Todo'),
-                                    ('cancel', 'Cancelled'),
-                                    ('done', 'Held'),
                                     ('pending', 'Not Held'),
+                                    ('done', 'Held'),
+                                    ('cancel', 'Cancelled'),
                                 ], 'State', size=16, readonly=True,
                                   help='The state is set to \'Todo\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 9e4280f1e64..ef334522821 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -60,9 +60,9 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
+                <button name="case_close" string="Held" states="open,pending" type="object" icon="gtk-jump-to" />
                 <button name="case_open" string="Todo" states="pending" type="object" icon="gtk-go-forward" />
                 <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause" />
-                <button name="case_close" string="Held" states="open,pending" type="object" icon="gtk-jump-to" />
                 <button name="case_reset" string="Reset to Todo" states="cancel" type="object" icon="gtk-convert" />
                 <button name="case_cancel" string="Cancel" states="open,pending" type="object" icon="gtk-cancel" />
                 <div class="oe_right">
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 60d5379787f..d8a95a6315a 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -68,8 +68,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
                     <button name="case_close" string="Done" states="open,pending" type="object" icon="gtk-jump-to" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 1bef2520f91..f82485b0244 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -79,8 +79,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
+                    <button name="case_close" string="Done" states="open,pending" type="object" icon="gtk-close" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-close" />
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
                     <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index aa0500ad0ff..6a04fdb4f93 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -30,9 +30,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
+                    <button name="case_close" states="open,pending" string="Close" type="object" icon="gtk-jump-to" />
                     <button name="case_open" states="draft,pending" string="Open" type="object" icon="gtk-go-forward" />
                     <button name="case_pending" states="draft,open" string="Pending" type="object" icon="gtk-media-pause" />
-                    <button name="case_close" states="open,draft,pending" string="Close" type="object" icon="gtk-jump-to" />
                     <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
                     <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object" icon="gtk-go-up" />
                     <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" />

From 8d3365c1bab2a33fa8dcdc828deef832e947fc8e Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 15:21:37 +0530
Subject: [PATCH 051/117] [IMP]

bzr revid: apa@tinyerp.com-20120427095137-5v5dnze0jokg7u3f
---
 addons/crm/crm.py                             | 2 +-
 addons/crm/crm_phonecall.py                   | 2 +-
 addons/hr/hr.py                               | 2 +-
 addons/hr_evaluation/hr_evaluation.py         | 2 +-
 addons/hr_evaluation/hr_evaluation_view.xml   | 2 +-
 addons/hr_expense/hr_expense.py               | 5 +++--
 addons/hr_expense/hr_expense_view.xml         | 2 +-
 addons/hr_recruitment/hr_recruitment.py       | 4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 2b0dccd275a..2c2a53bd557 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -32,8 +32,8 @@ AVAILABLE_STATES = [
     ('draft', 'New'),
     ('open', 'In Progress'),
     ('pending', 'Pending'),
-    ('done', 'Closed'),
     ('cancel', 'Cancelled'),
+    ('done', 'Closed'),
     
 ]
 
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 2b8eb9d1435..c641aced9e8 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -52,8 +52,8 @@ class crm_phonecall(crm_base, osv.osv):
                                     ('draft', 'Draft'),
                                     ('open', 'Todo'),
                                     ('pending', 'Not Held'),
-                                    ('done', 'Held'),
                                     ('cancel', 'Cancelled'),
+                                    ('done', 'Held'),
                                 ], 'State', size=16, readonly=True,
                                   help='The state is set to \'Todo\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index bd0c730d92d..030cafcbb45 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -110,7 +110,7 @@ class hr_job(osv.osv):
         'requirements': fields.text('Requirements'),
         'department_id': fields.many2one('hr.department', 'Department'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'state': fields.selection([('open', 'In Position'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', readonly=True, required=True),
+        'state': fields.selection([('open', 'In Position'),('recruit', 'In Recruitement'),('old', 'Old')], 'State', readonly=True, required=True),
     }
     _defaults = {
         'expected_employees': 1,
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 6e1983d7a11..c409ad19496 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -163,8 +163,8 @@ class hr_evaluation(osv.osv):
             ('draft','New'),
             ('wait','Plan In Progress'),
             ('progress','Waiting Appreciation'),
-            ('done','Done'),
             ('cancel','Cancelled'),
+            ('done','Done'),
         ], 'State', required=True, readonly=True),
         'date_close': fields.date('Ending Date', select=True),
         'progress': fields.float("Progress"),
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 2c192513ed4..5b4d04923de 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -162,7 +162,7 @@
                     <button name="button_draft" string="Reset to Draft" states="cancel" type="object" icon="terp-stock_effects-object-colorize"/>
                     <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object" icon="gtk-cancel"/>
                     <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,wait,done" statusbar_colors='{"progress":"blue"}'/>
                     </div>
                 </div>
                 <sheet string="Appraisal" layout="auto">
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 6e7db83bbb7..71b8b2f0bef 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -80,10 +80,11 @@ class hr_expense_expense(osv.osv):
         'state': fields.selection([
             ('draft', 'New'),
             ('confirm', 'Waiting Approval'),
+            ('cancelled', 'Refused'),
             ('accepted', 'Approved'),
             ('invoiced', 'Invoiced'),
-            ('paid', 'Reimbursed'),
-            ('cancelled', 'Refused')],
+            ('paid', 'Reimbursed')
+            ],
             'State', readonly=True, help='When the expense request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Confirmation\'.\
             \nIf the admin accepts it, the state is \'Accepted\'.\n If an invoice is made for the expense request, the state is \'Invoiced\'.\n If the expense is paid to user, the state is \'Reimbursed\'.'),
     }
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index a8500bc7c35..1e1687025d1 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -73,7 +73,7 @@
                     <button name="invoice" states="accepted" string="Invoice" type="object" icon="gtk-go-forward" groups="base.group_hr_user"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
                     <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,accepted,invoiced" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                     </div>
                 </div>
                 <sheet string="Expenses Sheet" layout="auto">
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 17a2d11fd0e..69b25798864 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -36,9 +36,9 @@ wizard.mail_compose_message.SUPPORTED_MODELS.append('hr.applicant')
 AVAILABLE_STATES = [
     ('draft', 'New'),
     ('open', 'In Progress'),
+    ('pending', 'Pending'),
     ('cancel', 'Refused'),
-    ('done', 'Hired'),
-    ('pending', 'Pending')
+    ('done', 'Hired')
 ]
 
 AVAILABLE_PRIORITIES = [
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 4041dc69698..f089acac180 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -76,8 +76,8 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
                 <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
+                <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
                 <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
                 <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
                 <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>

From 43bbbb1fac3bc36ce6f31d7074bfc7feee0ac904 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 16:11:53 +0530
Subject: [PATCH 052/117] [IMP]

bzr revid: apa@tinyerp.com-20120427104153-6tfztt9atl6d618s
---
 addons/sale/sale.py         | 2 +-
 addons/stock/stock.py       | 2 +-
 addons/stock/stock_view.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 9caaa86878c..76980dd068f 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -209,8 +209,8 @@ class sale_order(osv.osv):
             ('progress', 'In Progress'),
             ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),
+            ('cancel', 'Cancelled'),
             ('done', 'Done'),
-            ('cancel', 'Cancelled')
             ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
         'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index dee8e2a6c25..087a9b4f166 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -632,8 +632,8 @@ class stock_picking(osv.osv):
             ('auto', 'Waiting Another Operation'),
             ('confirmed', 'Waiting Availability'),
             ('assigned', 'Ready to Process'),
-            ('done', 'Done'),
             ('cancel', 'Cancelled'),
+            ('done', 'Done'),
             ], 'State', readonly=True, select=True,
             help="* Draft: not confirmed yet and will not be scheduled until confirmed\n"\
                  "* Confirmed: still waiting for the availability of products\n"\
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2e68e5a9282..8d439a6ea40 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -701,7 +701,7 @@
                     <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl" />
                     <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                     <div class="oe_right">
-                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
+                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                     </div>
                 </div>
                 <sheet string="Internal Picking List" layout="auto">

From db1bc82390a4392d3cd111476b4840af9b629016 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 16:14:54 +0530
Subject: [PATCH 053/117] [IMP]

bzr revid: apa@tinyerp.com-20120427104454-m070c4w0ia6m4knx
---
 addons/sale/sale.py   | 2 +-
 addons/stock/stock.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 9caaa86878c..76980dd068f 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -209,8 +209,8 @@ class sale_order(osv.osv):
             ('progress', 'In Progress'),
             ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),
+            ('cancel', 'Cancelled'),
             ('done', 'Done'),
-            ('cancel', 'Cancelled')
             ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
         'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index dee8e2a6c25..087a9b4f166 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -632,8 +632,8 @@ class stock_picking(osv.osv):
             ('auto', 'Waiting Another Operation'),
             ('confirmed', 'Waiting Availability'),
             ('assigned', 'Ready to Process'),
-            ('done', 'Done'),
             ('cancel', 'Cancelled'),
+            ('done', 'Done'),
             ], 'State', readonly=True, select=True,
             help="* Draft: not confirmed yet and will not be scheduled until confirmed\n"\
                  "* Confirmed: still waiting for the availability of products\n"\

From e5c291267fee9a76da47bc12d2b9d000cbf87a22 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 16:21:08 +0530
Subject: [PATCH 054/117] [IMP]:set state buttons order in project

bzr revid: apa@tinyerp.com-20120427105108-hydokesdp8olv3df
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f0a123c4af6..bc4c4c5f725 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -20,10 +20,10 @@
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
+                    <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
                     <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
                     <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
-                    <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
+                    <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
                     <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" icon="gtk-new" context="{'parent_id':parent_id}"/>
                     <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>

From 24cdaa4360df2dad00359fdb27e0d88f7896a54b Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 16:30:53 +0530
Subject: [PATCH 055/117] [IMP]

bzr revid: apa@tinyerp.com-20120427110053-49i5uw7sfyyu4l1e
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8d439a6ea40..2e68e5a9282 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -701,7 +701,7 @@
                     <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl" />
                     <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                     <div class="oe_right">
-                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
+                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                     </div>
                 </div>
                 <sheet string="Internal Picking List" layout="auto">

From 58e27785a12464eead4e659b6191ccccb411cccf Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 16:34:10 +0530
Subject: [PATCH 056/117] set order in task form

bzr revid: apa@tinyerp.com-20120427110410-5fu5ux7auae0ao0p
---
 addons/project/project.py       | 2 +-
 addons/project/project_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 0335b7cb540..9d62a66b653 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -662,7 +662,7 @@ class task(osv.osv):
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
         'type_id': fields.many2one('project.task.type', 'Stage'),
-        'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'State', readonly=True, required=True,
+        'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'),('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
         'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State',
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index bc4c4c5f725..7cfdeffd2ec 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -224,12 +224,12 @@
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
                     <div class="oe_form_topbar">
-                        <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
+                        <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
                         <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/>
                         <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
                         <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
+                        <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
                         <button name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
-                        <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
                         <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                         <div class="oe_right">
                             <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>

From c94ded86597d4d4791c72dead2d437867809ed06 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 16:40:56 +0530
Subject: [PATCH 057/117] set order in stock and purchase

bzr revid: apa@tinyerp.com-20120427111056-w9miufobwy56ipq7
---
 addons/purchase/purchase.py | 5 +++--
 addons/stock/stock.py       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 687221f371b..002be4aa055 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -148,8 +148,9 @@ class purchase_order(osv.osv):
         ('approved', 'Approved'),
         ('except_picking', 'Shipping Exception'),
         ('except_invoice', 'Invoice Exception'),
-        ('done', 'Done'),
-        ('cancel', 'Cancelled')
+        ('cancel', 'Cancelled'),
+        ('done', 'Done')
+        
     ]
 
     _columns = {
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 087a9b4f166..a17bfd10b24 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1630,7 +1630,7 @@ class stock_move(osv.osv):
         'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History (parent moves)'),
         'picking_id': fields.many2one('stock.picking', 'Reference', select=True,states={'done': [('readonly', True)]}),
         'note': fields.text('Notes'),
-        'state': fields.selection([('draft', 'New'), ('waiting', 'Waiting Another Move'), ('confirmed', 'Waiting Availability'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
+        'state': fields.selection([('draft', 'New'), ('waiting', 'Waiting Another Move'), ('confirmed', 'Waiting Availability'), ('assigned', 'Available'),('cancel', 'Cancelled'),('done', 'Done')], 'State', readonly=True, select=True,
               help='When the stock move is created it is in the \'Draft\' state.\n After that, it is set to \'Not Available\' state if the scheduler did not find the products.\n When products are reserved it is set to \'Available\'.\n When the picking is done the state is \'Done\'.\
               \nThe state is \'Waiting\' if the move is waiting for another one.'),
         'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),

From f2f366a123d50788ffae58e69a830f93bf3f8b75 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 18:17:19 +0530
Subject: [PATCH 058/117] [IMP] Improved code.

bzr revid: tpa@tinyerp.com-20120427124719-l96vi2e11s7fpwmh
---
 addons/account/account_invoice_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 3a5c9c24466..a4f94c94520 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -214,7 +214,6 @@
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                 <field name="residual"/>
                             </group>
                         </page>
@@ -317,7 +316,6 @@
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                 <field name="residual"/>
                             </group>
                         </page>

From cd297a6d2b314895990a8a540f662005d971bbf0 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 18:27:45 +0530
Subject: [PATCH 059/117] [FIX] sale_analytic_plans: improved code.

bzr revid: tpa@tinyerp.com-20120427125745-5ldqocen20cu8gd7
---
 addons/sale_analytic_plans/sale_analytic_plans_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index 743bbcb48d9..2d4ff082288 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -18,7 +18,7 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-           <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='delay']" position="after">
+           <xpath expr="/form/sheet/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='delay']" position="after">
                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" groups="analytic.group_analytic_accounting"/>
            </xpath>
         </field>

From c8f02f8003145aff3c0e3fa3f6378ba65802962e Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 18:29:48 +0530
Subject: [PATCH 060/117] [IMP]

bzr revid: apa@tinyerp.com-20120427125948-mbunkhlgxqufh7up
---
 addons/stock/stock_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2e68e5a9282..7f84ced4e92 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -693,8 +693,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                     <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
+                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                     <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                     <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                     <button name="action_process" states="assigned" string="Process"  groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
@@ -887,8 +887,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
                     <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
+                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
                     <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                     <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                     <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
@@ -1112,8 +1112,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                     <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
+                    <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                     <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                     <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                     <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
@@ -1121,7 +1121,7 @@
                     <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                     <div class="oe_right">
-                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
+                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                     </div>
                 </div>
                 <sheet string="Input Picking List" layout="auto">
@@ -1419,8 +1419,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                        <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
                         <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
+                        <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
                         <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                         <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
                     <div class="oe_right">

From 2a6e0c0d8875f2f47e663cddf1f1e31d18a01d56 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 18:35:08 +0530
Subject: [PATCH 061/117] [FIX] account_analytic_plans: improved code

bzr revid: tpa@tinyerp.com-20120427130508-j3dqzyal0ghudgsa
---
 addons/account_analytic_plans/account_analytic_plans_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 8282461e512..ae4db10803e 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -303,10 +303,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='analytic_account_id']" position="replace">
+                <xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/tree/field[@name='analytic_account_id']" position="replace">
                     <field name="analytics_id" groups="analytic.group_analytic_accounting"/>
                 </xpath>
-                <xpath expr="/form/notebook/page/field[@name='line_ids']/form/field[@name='analytic_account_id']" position="replace">
+                <xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/form/field[@name='analytic_account_id']" position="replace">
                     <field name="analytics_id" groups="analytic.group_analytic_accounting"/>
                 </xpath>
             </field>

From 3a44d34d13f3054508fb493b5d3d1e78c632c7a6 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 18:39:46 +0530
Subject: [PATCH 062/117] [FIX] account_bank_statement_extensions: improved
 code.

bzr revid: tpa@tinyerp.com-20120427130946-iwjv1dxrenf247du
---
 .../account_bank_statement_view.xml                       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index ebf58d774d9..7988edf3ba3 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -42,17 +42,17 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <data>
-          <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='date']" position="after">
+          <xpath expr="/form/sheet/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='date']" position="after">
             <field name="val_date"/>
           </xpath>
-          <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
+          <xpath expr="/form/sheet/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
             <field name="globalisation_id" string="Glob. Id"/>
             <field name="state" invisible="1"/>
           </xpath>
-          <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='date']" position="after">
+          <xpath expr="/form/sheet/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='date']" position="after">
             <field name="val_date"/>
           </xpath>
-          <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='amount']" position="after">
+          <xpath expr="/form/sheet/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='amount']" position="after">
             <field name="globalisation_id"/>
             <field name="state" invisible="1"/>
           </xpath>

From 3dd970b49820f7c787674a8dc60bcc61deeba393 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 18:43:45 +0530
Subject: [PATCH 063/117] [FIX] account_invoice_layout: improved code

bzr revid: tpa@tinyerp.com-20120427131345-7q8fxia5irfrc112
---
 addons/account_invoice_layout/account_invoice_layout_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index f51120aa9da..2dd962b180d 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -47,7 +47,7 @@
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='invoice_line']" position="replace">
+                <xpath expr="/form/sheet/notebook/page/field[@name='invoice_line']" position="replace">
                     <!-- keep the original fields, because other views position on that, too -->
                     <field name="invoice_line" invisible="True"/>
                     <field name="abstract_line_ids" colspan="4" nolabel="1"/>

From 10804bea3e5294cb67f54a3c19689bb90fd3311d Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 30 Apr 2012 10:34:37 +0530
Subject: [PATCH 064/117] [FIX] event_moodle: improved code

bzr revid: tpa@tinyerp.com-20120430050437-c1sr7vy9t8o2tkl4
---
 addons/event_moodle/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event_moodle/event_view.xml b/addons/event_moodle/event_view.xml
index f19d29e7b77..6d7c615a45e 100644
--- a/addons/event_moodle/event_view.xml
+++ b/addons/event_moodle/event_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="event.view_event_registration_form" />
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Emails']" position="after">
+                <xpath expr="/form/sheet/notebook/page[@string='Emails']" position="after">
                     <page string="Moodle">
                         <field name="moodle_user_password" readonly='1' colspan="2"/>
                         <field name="moodle_uid" readonly="1"/>

From b4f4ce5d8c2d3262fb1e2a152e31bb4982bda508 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 30 Apr 2012 11:46:55 +0530
Subject: [PATCH 065/117] [FIX] project_issue_sheet: improved code

bzr revid: tpa@tinyerp.com-20120430061655-z1a7yphklav6oosn
---
 addons/project_issue_sheet/project_issue_sheet_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index ac2f2990717..4ad7285b1e0 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -10,7 +10,7 @@
                 <field name="project_id" position="attributes">
                     <attribute name="on_change">on_change_project(project_id)</attribute>
                 </field>
-                <xpath expr="/form/notebook" position="before">
+                <xpath expr="/form/sheet/notebook" position="before">
                     <field name="analytic_account_id"
                         domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
                         on_change='on_change_account_id(analytic_account_id)'/>

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 066/117] [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 067/117] [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>

From 250cafb5d0a9b2b4bb5af8ff452fa91bc40c0de7 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 30 Apr 2012 17:15:24 +0530
Subject: [PATCH 068/117] [IMP]analytic_user_function: improve xpath and button
 order

bzr revid: mma@tinyerp.com-20120430114524-221jqy196nwwf0fw
---
 addons/analytic_user_function/analytic_user_function_view.xml | 2 +-
 addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index a3995d33808..791e9deddf5 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -34,7 +34,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page" position="after">
+                <xpath expr="/form/sheet/notebook/page" position="after">
                     <page string="Users/Products Rel.">
                         <field name="user_product_ids" colspan="4" nolabel="1"/>
                     </page>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 12b782f239c..5565c730c30 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -24,9 +24,9 @@
                 </group>
                 <xpath expr="/form/sheet" position='before'>
                     <div class="oe_form_topbar">
+                        <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"/>
                         <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"

From 96c07f7f4d2f57c99e0b094c3ce7327fd3bf98be Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 30 Apr 2012 18:04:06 +0530
Subject: [PATCH 069/117] [IMP]

bzr revid: apa@tinyerp.com-20120430123406-urpsmdbnbe9mnuro
---
 addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 12b782f239c..5565c730c30 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -24,9 +24,9 @@
                 </group>
                 <xpath expr="/form/sheet" position='before'>
                     <div class="oe_form_topbar">
+                        <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"/>
                         <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"

From 57a769f38b51d507edf9a1a504e4d36c30668196 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 30 Apr 2012 18:44:04 +0530
Subject: [PATCH 070/117] [IMP]

bzr revid: apa@tinyerp.com-20120430131404-u9jp6pgt3o9tc2e9
---
 addons/event/event.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 6bf1ea24786..32106925e1d 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -186,8 +186,8 @@ class event_event(osv.osv):
         'state': fields.selection([
             ('draft', 'Unconfirmed'),
             ('confirm', 'Confirmed'),
-            ('done', 'Done'),
-            ('cancel', 'Cancelled')],
+            ('cancel', 'Cancelled'),
+            ('done', 'Done')],
             'State', readonly=True, required=True,
             help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'),
         'email_registration_id' : fields.many2one('email.template','Registration Confirmation Email', help='This field contains the template of the mail that will be automatically sent each time a registration for this event is confirmed.'),

From 1ea40241bf450eeb05270d8d30328ebcd44ad6da Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 30 Apr 2012 18:56:08 +0530
Subject: [PATCH 071/117] [IMP]

bzr revid: apa@tinyerp.com-20120430132608-eknktjtxgofd6lrl
---
 addons/project_issue/project_issue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index e61af235d42..a2f41404323 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -179,7 +179,7 @@ class project_issue(crm.crm_case, osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner', select=1),
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Description'),
-        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('cancel', 'Cancelled'), ('done', 'Done'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
+        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'),('pending', 'Pending'),('cancel', 'Cancelled'), ('done', 'Done') ], 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\

From 9704684ab00117cd7ad4f77f3a62a5450cadf14e Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 16:41:34 +0530
Subject: [PATCH 072/117] [IMP]

bzr revid: apa@tinyerp.com-20120501111134-y0t7kk8yqo8r0l3o
---
 addons/crm/crm.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 2c2a53bd557..16469bf6363 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -30,11 +30,10 @@ from tools.translate import _
 MAX_LEVEL = 15
 AVAILABLE_STATES = [
     ('draft', 'New'),
+    ('cancel', 'Cancelled'),
     ('open', 'In Progress'),
     ('pending', 'Pending'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
-    
+    ('done', 'Closed')
 ]
 
 AVAILABLE_PRIORITIES = [

From 23ddb7fa8d0b02519bdaec7eaba60f1179269955 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 17:26:37 +0530
Subject: [PATCH 073/117] [IMP]

bzr revid: apa@tinyerp.com-20120501115637-k00l6a8u2acrbkm8
---
 addons/account/account_invoice.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index d06ba70bf02..6aca3bb99c5 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -201,11 +201,11 @@ class account_invoice(osv.osv):
 
         'state': fields.selection([
             ('draft','Draft'),
+            ('cancel','Cancelled'),
             ('proforma','Pro-forma'),
             ('proforma2','Pro-forma'),
             ('open','Open'),
-            ('paid','Paid'),
-            ('cancel','Cancelled')
+            ('paid','Paid')
             ],'State', select=True, readonly=True,
             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Invoice. \
             \n* The \'Pro-forma\' when invoice is in Pro-forma state,invoice does not have an invoice number. \

From 18ed1b88a112280a7d059931bedb47939feb2236 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 17:29:57 +0530
Subject: [PATCH 074/117] [IMP]

bzr revid: apa@tinyerp.com-20120501115957-h5kecpnuierfk4ul
---
 addons/account/account_invoice_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index ea8c0c49d04..9be10ce5cd8 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -264,9 +264,9 @@
                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_proforma_invoices"/>
                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>

From 5e0f08319942f2f3a45e9effd7d50d8d31c3c943 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 17:34:18 +0530
Subject: [PATCH 075/117] [IMP]

bzr revid: apa@tinyerp.com-20120501120418-nj1fx1mliqnksm4e
---
 addons/account_voucher/account_voucher.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 0191f5866ba..7c4df846b80 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -275,9 +275,9 @@ class account_voucher(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state':fields.selection(
             [('draft','Draft'),
+             ('cancel','Cancelled'),
              ('proforma','Pro-forma'),
-             ('posted','Posted'),
-             ('cancel','Cancelled')
+             ('posted','Posted')
             ], 'State', readonly=True, size=32,
             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Voucher. \
                         \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \

From d1147c51e9365f4a231f77aaad71b1652c4317f8 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 18:04:46 +0530
Subject: [PATCH 076/117] [IMP]

bzr revid: apa@tinyerp.com-20120501123446-kykbs2zi3pj0kq9u
---
 addons/hr_evaluation/hr_evaluation.py           | 2 +-
 addons/hr_expense/hr_expense.py                 | 2 +-
 addons/hr_holidays/hr_holidays.py               | 4 ++--
 addons/marketing_campaign/marketing_campaign.py | 6 ++++--
 addons/mrp/mrp.py                               | 2 +-
 addons/project/project.py                       | 4 ++--
 addons/project_issue/project_issue.py           | 2 +-
 addons/project_long_term/project_long_term.py   | 2 +-
 addons/project_planning/project_planning.py     | 2 +-
 addons/project_scrum/project_scrum.py           | 2 +-
 addons/purchase/purchase.py                     | 2 +-
 addons/sale/sale.py                             | 2 +-
 addons/stock/stock.py                           | 4 ++--
 13 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index c409ad19496..3924aeaecbf 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -161,9 +161,9 @@ class hr_evaluation(osv.osv):
         'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', required=True),
         'state': fields.selection([
             ('draft','New'),
+            ('cancel','Cancelled'),
             ('wait','Plan In Progress'),
             ('progress','Waiting Appreciation'),
-            ('cancel','Cancelled'),
             ('done','Done'),
         ], 'State', required=True, readonly=True),
         'date_close': fields.date('Ending Date', select=True),
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 71b8b2f0bef..af688db0773 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -79,8 +79,8 @@ class hr_expense_expense(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'state': fields.selection([
             ('draft', 'New'),
-            ('confirm', 'Waiting Approval'),
             ('cancelled', 'Refused'),
+            ('confirm', 'Waiting Approval'),
             ('accepted', 'Approved'),
             ('invoiced', 'Invoiced'),
             ('paid', 'Reimbursed')
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 7331a6bded9..08f4904a2ce 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -112,8 +112,8 @@ class hr_holidays(osv.osv):
 
     _columns = {
         'name': fields.char('Description', required=True, size=64),
-        'state': fields.selection([('draft', 'New'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
-            ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')],
+        'state': fields.selection([('draft', 'New'), ('cancel', 'Cancelled'),('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
+            ('validate1', 'Waiting Second Approval'), ('validate', 'Approved')],
             'State', readonly=True, help='The state is set to \'Draft\', when a holiday request is created.\
             \nThe state is \'Waiting Approval\', when holiday request is confirmed by user.\
             \nThe state is \'Refused\', when holiday request is refused by manager.\
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index ae9b531eb62..38e7da645be 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -648,8 +648,10 @@ class marketing_campaign_workitem(osv.osv):
         'res_name': fields.function(_res_name_get, string='Resource Name', fnct_search=_resource_search, type="char", size=64),
         'date': fields.datetime('Execution Date', help='If date is not set, this workitem has to be run manually', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', select=1, readonly=True),
-        'state': fields.selection([('todo', 'To Do'),
-                                   ('exception', 'Exception'), ('cancelled', 'Cancelled'),('done', 'Done'),
+        'state': fields.selection([ ('todo', 'To Do'),
+                                    ('cancelled', 'Cancelled'),
+                                    ('exception', 'Exception'),
+                                    ('done', 'Done'),
                                    ], 'State', readonly=True),
 
         'error_msg' : fields.text('Error Message', readonly=True)
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 88908884b26..fbff180ee53 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -481,7 +481,7 @@ class mrp_production(osv.osv):
         'move_created_ids2': fields.one2many('stock.move', 'production_id', 'Produced Products', domain=[('state','in', ('done', 'cancel'))]),
         'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation'),
-        'state': fields.selection([('draft','New'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','Production Started'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
+        'state': fields.selection([('draft','New'),('cancel','Cancelled'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','Production Started'),('done','Done')],'State', readonly=True,
                                     help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Picking Exception\'.\
                                     \nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production gets started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'),
         'hour_total': fields.function(_production_calc, type='float', string='Total Hours', multi='workorder', store=True),
diff --git a/addons/project/project.py b/addons/project/project.py
index 9d62a66b653..476a62ca33a 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -662,7 +662,7 @@ class task(osv.osv):
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
         'type_id': fields.many2one('project.task.type', 'Stage'),
-        'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'),('done', 'Done')], 'State', readonly=True, required=True,
+        'state': fields.selection([('draft', 'New'),('cancelled', 'Cancelled'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
         'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State',
@@ -1291,7 +1291,7 @@ class project_task_history(osv.osv):
     _columns = {
         'task_id': fields.many2one('project.task', 'Task', ondelete='cascade', required=True, select=True),
         'type_id': fields.many2one('project.task.type', 'Stage'),
-        'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'State'),
+        'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done')], 'State'),
         'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State', required=False),
         'date': fields.date('Date', select=True),
         'end_date': fields.function(_get_date, string='End Date', type="date", store={
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index a2f41404323..628bf316739 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -179,7 +179,7 @@ class project_issue(crm.crm_case, osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner', select=1),
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Description'),
-        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'),('pending', 'Pending'),('cancel', 'Cancelled'), ('done', 'Done') ], 'State', size=16, readonly=True,
+        'state': fields.selection([('draft', 'New'), ('cancel', 'Cancelled'), ('open', 'In Progress'),('pending', 'Pending'),('done', 'Done') ], 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 612bd784bb0..9de76097c9c 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -115,7 +115,7 @@ class project_phase(osv.osv):
         'user_force_ids': fields.many2many('res.users', string='Force Assigned Users'),
         'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]},
             help="The ressources on the project can be computed automatically by the scheduler"),
-        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
+        'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'), ('pending', 'Pending'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
                                   \n If the phase is over, the states is set to \'Done\'.'),
         'progress': fields.function(_compute_progress, string='Progress', help="Computed based on related tasks"),
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index 4787aa2603b..bb587218c91 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -128,7 +128,7 @@ class report_account_analytic_planning(osv.osv):
         'date_to':fields.date('End Date', required=True, states={'done':[('readonly', True)]}),
         'line_ids': fields.one2many('report_account_analytic.planning.line', 'planning_id', 'Planning lines', states={'done':[('readonly', True)]}),
         'stat_ids': fields.one2many('report_account_analytic.planning.stat', 'planning_id', 'Planning analysis', readonly=True),
-        'state': fields.selection([('draft', 'Draft'), ('open', 'Open'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', required=True),
+        'state': fields.selection([('draft', 'Draft'), ('cancel', 'Cancelled'), ('open', 'Open'), ('done', 'Done')], 'Status', required=True),
         'business_days': fields.integer('Business Days', required=True, states={'done':[('readonly', True)]}, help='Set here the number of working days within this planning for one person full time'),
         'planning_user_ids': one2many_mod3('report_account_analytic.planning.user', 'planning_id', 'Planning By User'),
         'planning_account': fields.one2many('report_account_analytic.planning.account', 'planning_id', 'Planning By Account'),
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index 85eba636b90..93d2380edf4 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -109,7 +109,7 @@ class project_scrum_sprint(osv.osv):
         'progress': fields.function(_compute, group_operator="avg", type='float', multi="progress", string='Progress (0-100)', help="Computed as: Time Spent / Total Time."),
         'effective_hours': fields.function(_compute, multi="effective_hours", string='Effective hours', help="Computed using the sum of the task work done."),
         'expected_hours': fields.function(_compute, multi="expected_hours", string='Planned Hours', help='Estimated time to do the task.'),
-        'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('cancel','Cancelled'),('done','Done')], 'State', required=True),
+        'state': fields.selection([('draft','Draft'),('cancel','Cancelled'),('open','Open'),('pending','Pending'),('done','Done')], 'State', required=True),
     }
     _defaults = {
         'state': 'draft',
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 002be4aa055..6b2f515547c 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -143,12 +143,12 @@ class purchase_order(osv.osv):
 
     STATE_SELECTION = [
         ('draft', 'Request for Quotation'),
+        ('cancel', 'Cancelled'),
         ('wait', 'Waiting'),
         ('confirmed', 'Waiting Approval'),
         ('approved', 'Approved'),
         ('except_picking', 'Shipping Exception'),
         ('except_invoice', 'Invoice Exception'),
-        ('cancel', 'Cancelled'),
         ('done', 'Done')
         
     ]
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 1fc507538e1..fb6da4cf8e2 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -204,12 +204,12 @@ class sale_order(osv.osv):
         'client_order_ref': fields.char('Customer Reference', size=64),
         'state': fields.selection([
             ('draft', 'Quotation'),
+            ('cancel', 'Cancelled'),
             ('waiting_date', 'Waiting Schedule'),
             ('manual', 'To Invoice'),
             ('progress', 'In Progress'),
             ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),
-            ('cancel', 'Cancelled'),
             ('done', 'Done'),
             ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
         'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}),
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index a17bfd10b24..c62a512d92d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -629,10 +629,10 @@ class stock_picking(osv.osv):
         'move_type': fields.selection([('direct', 'Partial Delivery'), ('one', 'All at once')], 'Delivery Method', required=True, help="It specifies goods to be delivered all at once or by direct delivery"),
         'state': fields.selection([
             ('draft', 'New'),
+            ('cancel', 'Cancelled'),
             ('auto', 'Waiting Another Operation'),
             ('confirmed', 'Waiting Availability'),
             ('assigned', 'Ready to Process'),
-            ('cancel', 'Cancelled'),
             ('done', 'Done'),
             ], 'State', readonly=True, select=True,
             help="* Draft: not confirmed yet and will not be scheduled until confirmed\n"\
@@ -1630,7 +1630,7 @@ class stock_move(osv.osv):
         'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History (parent moves)'),
         'picking_id': fields.many2one('stock.picking', 'Reference', select=True,states={'done': [('readonly', True)]}),
         'note': fields.text('Notes'),
-        'state': fields.selection([('draft', 'New'), ('waiting', 'Waiting Another Move'), ('confirmed', 'Waiting Availability'), ('assigned', 'Available'),('cancel', 'Cancelled'),('done', 'Done')], 'State', readonly=True, select=True,
+        'state': fields.selection([('draft', 'New'),('cancel', 'Cancelled'), ('waiting', 'Waiting Another Move'), ('confirmed', 'Waiting Availability'), ('assigned', 'Available'),('done', 'Done')], 'State', readonly=True, select=True,
               help='When the stock move is created it is in the \'Draft\' state.\n After that, it is set to \'Not Available\' state if the scheduler did not find the products.\n When products are reserved it is set to \'Available\'.\n When the picking is done the state is \'Done\'.\
               \nThe state is \'Waiting\' if the move is waiting for another one.'),
         'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),

From 3ea68e75f4de62e61339cb39a4349a5a1d192fe9 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 18:05:47 +0530
Subject: [PATCH 077/117] [IMP]

bzr revid: apa@tinyerp.com-20120501123547-ev91ud3e5e5zkf6x
---
 addons/analytic/analytic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 6e800247cb5..b8f8382da59 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -169,7 +169,7 @@ class account_analytic_account(osv.osv):
         'date_start': fields.date('Date Start'),
         'date': fields.date('Date End', select=True),
         'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
-        'state': fields.selection([('template', 'Template'),('draft','New'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed')], 'State', required=True,
+        'state': fields.selection([('template', 'Template'),('draft','New'),('cancelled', 'Cancelled'),('open','Open'), ('pending','Pending'),('close','Closed')], 'State', required=True,
                                   help='* When an account is created its in \'Draft\' state.\
                                   \n* If any associated partner is there, it can be in \'Open\' state.\
                                   \n* If any pending balance is there it can be in \'Pending\'. \

From 5336d4058caf6c52266eae456cfc46614b083977 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 18:12:43 +0530
Subject: [PATCH 078/117] [IMP]

bzr revid: apa@tinyerp.com-20120501124243-lndw06pcxthmeo8u
---
 addons/analytic/analytic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index b8f8382da59..848bfa243d7 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -169,7 +169,7 @@ class account_analytic_account(osv.osv):
         'date_start': fields.date('Date Start'),
         'date': fields.date('Date End', select=True),
         'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
-        'state': fields.selection([('template', 'Template'),('draft','New'),('cancelled', 'Cancelled'),('open','Open'), ('pending','Pending'),('close','Closed')], 'State', required=True,
+        'state': fields.selection([('template', 'Template'),('draft','New'),('open','Open'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'State', required=True,
                                   help='* When an account is created its in \'Draft\' state.\
                                   \n* If any associated partner is there, it can be in \'Open\' state.\
                                   \n* If any pending balance is there it can be in \'Pending\'. \

From 3f6ea8e83ee6256a2884a1d4396f26f89c1bf636 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 18:26:41 +0530
Subject: [PATCH 079/117] [IMP]

bzr revid: apa@tinyerp.com-20120501125641-6i920a816xweb51k
---
 addons/hr_recruitment/hr_recruitment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 69b25798864..46ddd96fe86 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -35,9 +35,9 @@ wizard.mail_compose_message.SUPPORTED_MODELS.append('hr.applicant')
 
 AVAILABLE_STATES = [
     ('draft', 'New'),
+    ('cancel', 'Refused'),
     ('open', 'In Progress'),
     ('pending', 'Pending'),
-    ('cancel', 'Refused'),
     ('done', 'Hired')
 ]
 

From e08419164c3e9790f77606021bd1ff7c573792d0 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 18:48:22 +0530
Subject: [PATCH 080/117] improve event

bzr revid: apa@tinyerp.com-20120501131822-07yqsoq3zbo6t1ap
---
 addons/event/event.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 32106925e1d..34131cbe1b1 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -185,8 +185,8 @@ class event_event(osv.osv):
         'date_end': fields.datetime('End Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'state': fields.selection([
             ('draft', 'Unconfirmed'),
-            ('confirm', 'Confirmed'),
             ('cancel', 'Cancelled'),
+            ('confirm', 'Confirmed'),
             ('done', 'Done')],
             'State', readonly=True, required=True,
             help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'),
@@ -271,8 +271,8 @@ class event_registration(osv.osv):
         'user_id': fields.many2one('res.users', 'Attendee', states={'done': [('readonly', True)]}),
         'company_id': fields.related('event_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'Unconfirmed'),
-                                    ('open', 'Confirmed'),
                                     ('cancel', 'Cancelled'),
+                                    ('open', 'Confirmed'),
                                     ('done', 'Attended')], 'State',
                                     size=16, readonly=True),
     }

From 70c7252b2c69dc7c7aee57b02b55222a557c25bd Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 2 May 2012 11:20:06 +0530
Subject: [PATCH 081/117] [IMP]

bzr revid: apa@tinyerp.com-20120502055006-yhsd5qwpc0asfn7b
---
 addons/marketing_campaign/marketing_campaign.py | 2 +-
 addons/point_of_sale/point_of_sale_view.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 38e7da645be..c99ad22e714 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -269,8 +269,8 @@ class marketing_campaign_segment(osv.osv):
                                            'If the campaign has a "unique field" set, "no duplicates" will also prevent selecting records which have '\
                                            'the same value for the unique field as other records that already entered the campaign.'),
         'state': fields.selection([('draft', 'New'),
-                                   ('running', 'Running'),
                                    ('cancelled', 'Cancelled'),
+                                   ('running', 'Running'),
                                    ('done', 'Done')],
                                    'State',),
         'date_run': fields.datetime('Launch Date', help="Initial start date of this segment."),
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 3b938c6ad4e..bbde9998755 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -19,9 +19,9 @@
                 <form layout="manual">
                 <div class="oe_form_topbar">
                     <button name="%(action_pos_payment)d" string="Payment" icon="gtk-apply" type="action" states="draft"/>
+                    <button name="%(action_report_pos_receipt)d" string="Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
                     <button name="refund" string="Return Products" type="object" icon="gtk-ok"
                         attrs="{'invisible':[('state','=','draft')]}"/>
-                    <button name="%(action_report_pos_receipt)d" string="Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
                     </div>

From 9483a836a9dce15ddea620e58372a7e890fff115 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 3 May 2012 17:08:55 +0530
Subject: [PATCH 082/117] [IMP]mrp_repair : Added state and buttons on top bar

bzr revid: mma@tinyerp.com-20120503113855-pwk5plarj5iajvef
---
 addons/mrp_repair/mrp_repair.py       |  2 +-
 addons/mrp_repair/mrp_repair_view.xml | 37 +++++++++++++++------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 4a0085e3db9..619df6d540c 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -123,8 +123,8 @@ class mrp_repair(osv.osv):
         'state': fields.selection([
             ('draft','Quotation'),
             ('confirmed','Confirmed'),
-            ('ready','Ready to Repair'),
             ('under_repair','Under Repair'),
+            ('ready','Ready to Repair'),
             ('2binvoiced','To be Invoiced'),
             ('invoice_except','Invoice Exception'),
             ('done','Done'),
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 6af1dc702fa..5361b3544d9 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -27,8 +27,25 @@
         <field name="model">mrp.repair</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Repairs order">
-                <group col="6" colspan="4">
+            <form layout="manual">
+               <div class="oe_form_topbar">
+                     <button name="repair_confirm" states="draft" string="Confirm Repair" icon="terp-camera_test"/>
+                     <button name="repair_ready" states="confirmed" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
+                     <button name="action_repair_start" states="ready" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
+                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                     <button name="action_repair_end" states="under_repair" string="End Repair" icon="terp-dialog-close"/>
+                     <button name="action_invoice_create" states="2binvoiced" string="Make Invoice" icon="terp-dolar"/>
+                     <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="terp-dolar"/>
+                     <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="terp-emblem-important"/>
+                     <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action" icon="gtk-stop"/>
+                     <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action" icon="gtk-stop"/>
+                     <button name="cancel" states="draft" string="Cancel Repair" icon="gtk-stop"/>
+               <div class="oe_right">
+                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed,ready" />
+               </div>
+               </div>
+               <sheet string="Repairs order" layout="auto">
+                <group col="6" colspan="4" class="oe_form_header">
                     <field name="name"/>
                     <field name="product_id" select="1"  on_change="onchange_product_id(product_id)"/>
                     <field name="deliver_bool"/>
@@ -99,21 +116,6 @@
                             <field name="amount_total" sum="Total amount"/>
                             <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
                         </group>
-                        <separator string="" colspan="4"/>
-                        <group col="13" colspan="4">
-                            <field name="state"/>
-                            <button name="cancel" states="draft" string="Cancel Repair" icon="gtk-stop"/>
-                            <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action" icon="gtk-stop"/>
-                            <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action" icon="gtk-stop"/>
-                            <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                            <button name="repair_confirm" states="draft" string="Confirm Repair" icon="terp-camera_test"/>
-                            <button name="repair_ready" states="confirmed" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
-                            <button name="action_repair_start" states="ready" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
-                            <button name="action_repair_end" states="under_repair" string="End Repair" icon="terp-dialog-close"/>
-                            <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="terp-dolar"/>
-                            <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="terp-emblem-important"/>
-                            <button name="action_invoice_create" states="2binvoiced" string="Make Invoice" icon="terp-dolar"/>
-                        </group>
                     </page>
                     <page string="Invoicing">
                         <field name="invoice_method" colspan="4"/>
@@ -171,6 +173,7 @@
                         <field colspan="4" name="quotation_notes" nolabel="1"/>
                     </page>
                 </notebook>
+                </sheet>
             </form>
         </field>
     </record>

From a7bd8efb9fb2eecfeeff510a7584bb6dd6f2e278 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 3 May 2012 17:52:39 +0530
Subject: [PATCH 083/117] [IMP]project_scrum : Added state and buttons on top
 bar

bzr revid: mma@tinyerp.com-20120503122239-6feyr2lnsu4gythv
---
 addons/project_scrum/project_scrum.py       |  4 +-
 addons/project_scrum/project_scrum_view.xml | 52 ++++++++++++---------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index 93d2380edf4..e11345c3172 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -109,7 +109,7 @@ class project_scrum_sprint(osv.osv):
         'progress': fields.function(_compute, group_operator="avg", type='float', multi="progress", string='Progress (0-100)', help="Computed as: Time Spent / Total Time."),
         'effective_hours': fields.function(_compute, multi="effective_hours", string='Effective hours', help="Computed using the sum of the task work done."),
         'expected_hours': fields.function(_compute, multi="expected_hours", string='Planned Hours', help='Estimated time to do the task.'),
-        'state': fields.selection([('draft','Draft'),('cancel','Cancelled'),('open','Open'),('pending','Pending'),('done','Done')], 'State', required=True),
+        'state': fields.selection([('draft','Draft'),('pending','Pending'),('open','Open'),('done','Done'),('cancel','Cancelled')], 'State', required=True),
     }
     _defaults = {
         'state': 'draft',
@@ -229,7 +229,7 @@ class project_scrum_product_backlog(osv.osv):
         'sprint_id': fields.many2one('project.scrum.sprint', 'Sprint'),
         'sequence' : fields.integer('Sequence', help="Gives the sequence order when displaying a list of product backlog."),
         'tasks_id': fields.one2many('project.task', 'product_backlog_id', 'Tasks Details'),
-        'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('done','Done'),('cancel','Cancelled')], 'State', required=True),
+        'state': fields.selection([('draft','Draft'),('pending','Pending'),('open','Open'),('done','Done'),('cancel','Cancelled')], 'State', required=True),
         'progress': fields.function(_compute, multi="progress", group_operator="avg", type='float', string='Progress', help="Computed as: Time Spent / Total Time."),
         'effective_hours': fields.function(_compute, multi="effective_hours", string='Spent Hours', help="Computed using the sum of the time spent on every related tasks", store=True),
         'expected_hours': fields.float('Planned Hours', help='Estimated total time to do the Backlog'),
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 0f33ded8523..21bdedf3efe 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -56,8 +56,20 @@
             <field name="model">project.scrum.product.backlog</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Product backlog">
-                    <group colspan="4" col="8">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
+                    <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
+                    <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
+                    <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="gtk-execute"/>
+                    <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
+                    <button type="object" string="Cancel" name="button_cancel" states="draft,open,pending" icon="gtk-stop"/>
+                <div class="oe_right">
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+                </div>
+                </div>
+                <sheet string="Product backlog" layout="auto">
+                    <group colspan="4" col="8" class="oe_form_header">
                         <field name="name" select="1"/>
                         <field name="project_id" select="1"/>
                         <field domain="[('project_id','=',project_id), ('state','in', ['draft','open'])]" name="sprint_id" select="1"/>
@@ -109,15 +121,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="8" colspan="4">
-                        <field name="state" select="1" readonly="1"/>
-                        <button type="object" string="Cancel" name="button_cancel" states="draft,open,pending" icon="gtk-stop"/>
-                        <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
-                        <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="gtk-execute"/>
-                        <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
-                        <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
-                        <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -232,8 +236,20 @@
             <field name="model">project.scrum.sprint</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Scrum Sprint">
-                    <group colspan="4" col="6">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                     <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
+                     <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
+                     <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
+                     <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d"
+                                    string="Burndown Chart" type="action" icon="gtk-print"/>
+                     <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
+                <div class="oe_right">
+                    <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+                </div>
+                </div>
+                <sheet string="Scrum Sprint" layout="auto">
+                    <group colspan="4" col="6" class="oe_form_header">
                         <field name="name" select="1"/>
                         <field name="project_id" on_change="onchange_project_id(project_id)"/>
                     </group>
@@ -298,15 +314,7 @@
                             <field colspan="4" name="retrospective" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col="8" colspan="4">
-                        <field name="state" readonly="1"/>
-                        <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d"
-                                    string="Burndown Chart" type="action" icon="gtk-print"/>
-                        <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
-                        <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
-                        <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
-                        <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From 99c3d81f153f6ec6596a469253790cb3a04d5ad5 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 3 May 2012 18:14:08 +0530
Subject: [PATCH 084/117] [IMP]account_payment : Added state and buttons on top
 bar

bzr revid: mma@tinyerp.com-20120503124408-emij8pwmtqbky2k4
---
 .../account_payment/account_payment_view.xml  | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 71856dcf703..751b4027941 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -100,8 +100,18 @@
             <field name="model">payment.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payment order">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
+                    <button name="set_done" states="open" string="Make Payments" type="object" icon="gtk-execute"/>
+                    <button name="set_to_draft" states="cancel" string="Set to draft" type="object" icon="gtk-convert"/>
+                    <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
+                <div class="oe_right">
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+                </div>
+                </div>
+                <sheet string="Payment order" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                       <field name="reference"/>
                       <field name="mode" widget='selection'/>
                       <field name="user_id"/>
@@ -162,13 +172,7 @@
                     </field>
                     <field name="date_created"/>
                     <field name="date_done"/>
-                    <field name="state" readonly="1" select="1"/>
-                    <group col="4" colspan="2">
-                         <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
-                         <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
-                         <button name="set_done" states="open" string="Make Payments" type="object" icon="gtk-execute"/>
-                         <button name="set_to_draft" states="cancel" string="Set to draft" type="object" icon="gtk-convert"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From acfd8ab2555567df5b646f1a2a826306f71df37f Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 3 May 2012 18:50:18 +0530
Subject: [PATCH 085/117] [IMP]hr_payroll : Added state and buttons on top bar

bzr revid: mma@tinyerp.com-20120503132018-dohip75it2rwgqmm
---
 addons/hr_payroll/hr_payroll_view.xml | 45 ++++++++++++++++-----------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index b5ec2e679e3..21af96977e2 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -260,8 +260,19 @@
             <field name="model">hr.payslip</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payslip">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                     <button string="Confirm" icon="terp-camera_test" name="hr_verify_sheet" states="draft"/>
+                     <button string="Refund" icon="gtk-execute" name="refund_sheet" states="confirm,done" type='object'/>
+                     <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft" states="cancel"/>
+                     <button string="Compute Sheet" icon="terp-stock_format-scientific" name="compute_sheet" type="object" states="draft"/>
+                     <button string="Cancel" icon="terp-dialog-close" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                </div>
+                </div>
+                <sheet string="Payslip" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
                         <field name="number"/>
                         <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
@@ -362,16 +373,8 @@
                             <separator colspan="4" string="Notes"/>
                             <field name="note" colspan="4" nolabel="1"/>
                        </page>
-
                     </notebook>
-                    <group col="10" colspan="4">
-                        <field name="state"/>
-                        <button string="Cancel" icon="terp-dialog-close" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
-                        <button string="Compute Sheet" icon="terp-stock_format-scientific" name="compute_sheet" type="object" states="draft"/>
-                        <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft" states="cancel"/>
-                        <button string="Refund" icon="gtk-execute" name="refund_sheet" states="confirm,done" type='object'/>
-                        <button string="Confirm" icon="terp-camera_test" name="hr_verify_sheet" states="draft"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -720,8 +723,17 @@
             <field name="model">hr.payslip.run</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payslips Batches">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="close_payslip_run" type="object" icon="terp-camera_test" string="Close" states="draft"/>
+                    <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" icon="gtk-execute" string="Generate Payslips" />
+                    <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft_payslip_run" type="object" states="close"/>
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1"/>
+                </div>
+                </div>
+                <sheet string="Payslips Batches" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" colspan="4"/>
                         <field name="credit_note"/>
                         <field name="date_start"/>
@@ -732,12 +744,7 @@
                             <field name="slip_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col="6" colspan="4">
-                        <field name="state"/>
-                        <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" icon="gtk-execute" string="Generate Payslips" />
-                        <button name="close_payslip_run" type="object" icon="terp-camera_test" string="Close" states="draft"/>
-                        <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft_payslip_run" type="object" states="close"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From 974fc2c851a7a05870b9ead0901fa1c4bc8ed84a Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 11:16:32 +0530
Subject: [PATCH 086/117] [IMP]account : Added state and buttons on top bar in
 journal and period

bzr revid: mma@tinyerp.com-20120504054632-hlpiv8jdtl7uho3c
---
 addons/account/account_view.xml | 51 +++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index c6d2c06a87d..919c9e1a45f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -11,8 +11,16 @@
             <field name="model">account.fiscalyear</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Fiscalyear">
-                    <group>
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="create_period" states="draft" string="Create Monthly Periods" type="object" icon="terp-document-new"/>
+                    <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" icon="terp-document-new"/>
+                <div class="oe_right">
+                    <field name="state" select="1" widget="statusbar" nolabel="1" />
+                </div>
+                </div>
+                <sheet string="Fiscalyear" layout="auto">
+                    <group class="oe_form_header">
                     <field name="name"/>
                     <field name="code"/>
                     <field name="date_start"/>
@@ -31,11 +39,7 @@
                         </form>
                     </field>
                     <separator colspan="4" string="States"/>
-                    <group>
-                        <field name="state" select="1" readonly="1"/>
-                        <button name="create_period" states="draft" string="Create Monthly Periods" type="object" icon="terp-document-new"/>
-                        <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" icon="terp-document-new"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -92,7 +96,15 @@
             <field name="model">account.period</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Period">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" groups="account.group_account_manager"/>
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1"/>
+                </div>
+                </div>
+                <sheet string="Period" layout="auto">
+                <group class="oe_form_header">
                     <field name="name"/>
                     <field name="code"/>
                     <field name="date_start"/>
@@ -100,9 +112,8 @@
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <field name="fiscalyear_id" widget="selection"/>
                     <field name="special"/>
-                    <separator colspan="4" string="States"/>
-                    <field name="state"/>
-                    <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" groups="account.group_account_manager"/>
+                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -1345,8 +1356,16 @@
             <field name="model">account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Journal Entries">
-                    <group colspan="4" col="6">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                      <button name="button_validate" states="draft" string="Post" type="object" icon="terp-camera_test"/>
+                      <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
+                <div class="oe_right">
+                     <field name="state" select="1" widget="statusbar" nolabel="1" />
+                </div>
+                </div>
+                <sheet string="Journal Entries" layout="auto">
+                    <group colspan="4" col="6" class="oe_form_header">
                         <field name="name" readonly="True"/>
                         <field name="ref"/>
                         <field name="to_check"/>
@@ -1455,13 +1474,9 @@
                             </field>
                             <separator colspan="4" string="Internal Note"/>
                             <field name="narration" colspan="4" nolabel="1" height="50"/>
-                            <group col="4" colspan="4">
-                                <field name="state" select="1"/>
-                                <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
-                                <button name="button_validate" states="draft" string="Post" type="object" icon="terp-camera_test"/>
-                            </group>
                         </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>

From 22be12451adc332e13934b6953d4d0998a1e2cba Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 11:47:12 +0530
Subject: [PATCH 087/117] [IMP]mrp_operations : Added state and buttons on top
 bar

bzr revid: mma@tinyerp.com-20120504061712-k4k2opi9upwevq3s
---
 addons/mrp_operations/mrp_operations.py       |  2 +-
 addons/mrp_operations/mrp_operations_view.xml | 28 ++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 78deb68e5e7..0bec075869b 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -86,7 +86,7 @@ class mrp_production_workcenter_line(osv.osv):
     _order = "sequence, date_planned"
 
     _columns = {
-       'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pending'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True,
+       'state': fields.selection([('draft','Draft'),('pause','Pending'),('startworking', 'In Progress'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True,
                                  help="* When a work order is created it is set in 'Draft' state.\n" \
                                        "* When user sets work order in start mode that time it will be set in 'In Progress' state.\n" \
                                        "* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pending' state.\n" \
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 843acd313bc..0fed0e58671 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -71,8 +71,20 @@
         <field name="type">form</field>
         <field name="inherit_id" eval="False"/>
         <field name="arch" type="xml">
-            <form string="Work Orders">
-                <group col="6" colspan="4">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                  <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>
+                  <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
+                  <button name="button_done" string="Finished" states="startworking" icon="terp-check"/>
+                  <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause"/>
+                  <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
+                  <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
+            <div class="oe_right">
+                 <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,startworking"/>
+            </div>
+            </div>
+            <sheet string="Work Orders" layout="auto">
+                <group col="6" colspan="4" class="oe_form_header">
                     <field colspan="4" name="name" select="1"/>
                     <field name="workcenter_id" select="1" widget="selection"/>
                     <field name="production_id"/>
@@ -105,19 +117,9 @@
                         <field name="qty"/>
                         <field name="uom" widget="selection"/>
                     </group>
-
-                    <separator string="" colspan="4"/>
-                    <group colspan="8" col="8">
-                        <field name="state"/>
-                        <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
-                        <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
-                        <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>
-                        <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
-                        <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause"/>
-                        <button name="button_done" string="Finished" states="startworking" icon="terp-check"/>
-                    </group>
                 </page>
                 </notebook>
+                </sheet>
                 <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
             </form>
         </field>

From 341c2e708701e0dd4e129af5e37b505d5275d9ef Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 12:06:31 +0530
Subject: [PATCH 088/117] [IMP]stock : Added state and buttons on top bar in
 inventory

bzr revid: mma@tinyerp.com-20120504063631-x89r6ndlpljwy3h9
---
 addons/stock/stock.py       |  2 +-
 addons/stock/stock_view.xml | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index c62a512d92d..9fe8ee97bed 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2656,7 +2656,7 @@ class stock_inventory(osv.osv):
         'date_done': fields.datetime('Date done'),
         'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', states={'done': [('readonly', True)]}),
         'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'),
-        'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('confirm','Confirmed'),('cancel','Cancelled')), 'State', readonly=True, select=True),
+        'state': fields.selection( (('draft', 'Draft'), ('confirm','Confirmed'), ('done', 'Done'), ('cancel','Cancelled')), 'State', readonly=True, select=True),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
 
     }
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 7f84ced4e92..a0d6b6ed89b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -108,7 +108,18 @@
             <field name="model">stock.inventory</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Physical Inventory">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                      <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
+                      <button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to"/>
+                      <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                      <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
+                <div class="oe_right">
+                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                </div>
+                </div>
+                <sheet string="Physical Inventory" layout="auto">
+                <group class="oe_form_header">
                     <field name="name"/>
                     <field name="date"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -167,15 +178,8 @@
                              </field>
                     </page>
                     </notebook>
-                    <group col="2" colspan="2">
-                     <field name="state"/>
-                    </group>
-                    <group col="3" colspan="2">
-                        <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
-                        <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
-                        <button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to"/>
-                        <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From b749089fe7a581a21e54efb2e4e859752be3035c Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 12:23:47 +0530
Subject: [PATCH 089/117] [IMP]account_asset : Added state and buttons on top
 bar

bzr revid: mma@tinyerp.com-20120504065347-rijbugsd8h4qa9q0
---
 addons/account_asset/account_asset_view.xml | 22 +++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index f527498ae05..1ea667fddd2 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -78,8 +78,17 @@
         <field name="model">account.asset.asset</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-           <form string="Asset">
-              <group col="6" colspan="4">
+           <form layout="manual">
+           <div class="oe_form_topbar">
+                <button name="validate" states="draft" string="Confirm Asset" type="object" icon="terp-camera_test"/>
+                <button name="set_to_draft" states="open" string="Set to Draft" type="object" icon="gtk-convert"/> 
+                <button name="set_to_close" states="open" string="Set to Close" type="object" icon="gtk-close"/>
+           <div class="oe_right">
+                <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+           </div>
+           </div>
+           <sheet string="Asset" layout="auto">
+              <group col="6" colspan="4" class="oe_form_header">
                  <field name="name"/>
                  <field name="category_id" on_change="onchange_category_id(category_id)"/>
                  <field name="code"/>
@@ -111,14 +120,6 @@
                         <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
                         <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
                     </group>
-                    <newline/>
-                    <separator string="" colspan="4"/>
-                    <field name="state" readonly="1" colspan="2"/>
-                    <group colspan="2" col="4">
-                       <button name="validate" states="draft" string="Confirm Asset" type="object" icon="terp-camera_test"/>
-                       <button name="set_to_draft" states="open" string="Set to Draft" type="object" icon="gtk-convert"/> 
-                       <button name="set_to_close" states="open" string="Set to Close" type="object" icon="gtk-close"/>
-                    </group>
                  </page>
                  <page string="Depreciation Board">
                     <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph">
@@ -148,6 +149,7 @@
                     <field name="note" nolabel="1"/>
                  </page>
               </notebook>
+              </sheet>
            </form>
        </field>
     </record>

From 4f3869fe2d1c056596622120aa369aef823f7fed Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 12:45:03 +0530
Subject: [PATCH 090/117] [IMP]account : remove separator

bzr revid: mma@tinyerp.com-20120504071503-nzi4m03dia03hde3
---
 addons/account/account_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 919c9e1a45f..1c24a487676 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -38,7 +38,6 @@
                             <field name="special"/>
                         </form>
                     </field>
-                    <separator colspan="4" string="States"/>
                     </sheet>
                 </form>
             </field>

From 245dcd8cf2e577dd9c1fe8c707c401e2e3d11f66 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 14:05:07 +0530
Subject: [PATCH 091/117] [IMP]project_planning : Added state and buttons on
 top bar

bzr revid: mma@tinyerp.com-20120504083507-y6e8nxjz1kzayrci
---
 addons/project_planning/project_planning.py   |  2 +-
 .../project_planning_view.xml                 | 27 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index bb587218c91..4787aa2603b 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -128,7 +128,7 @@ class report_account_analytic_planning(osv.osv):
         'date_to':fields.date('End Date', required=True, states={'done':[('readonly', True)]}),
         'line_ids': fields.one2many('report_account_analytic.planning.line', 'planning_id', 'Planning lines', states={'done':[('readonly', True)]}),
         'stat_ids': fields.one2many('report_account_analytic.planning.stat', 'planning_id', 'Planning analysis', readonly=True),
-        'state': fields.selection([('draft', 'Draft'), ('cancel', 'Cancelled'), ('open', 'Open'), ('done', 'Done')], 'Status', required=True),
+        'state': fields.selection([('draft', 'Draft'), ('open', 'Open'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', required=True),
         'business_days': fields.integer('Business Days', required=True, states={'done':[('readonly', True)]}, help='Set here the number of working days within this planning for one person full time'),
         'planning_user_ids': one2many_mod3('report_account_analytic.planning.user', 'planning_id', 'Planning By User'),
         'planning_account': fields.one2many('report_account_analytic.planning.account', 'planning_id', 'Planning By Account'),
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 5e42c750634..4f10d270ac4 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -26,8 +26,18 @@
             <field name="model">report_account_analytic.planning</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Planning by Account">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                 <div class="oe_form_topbar">
+                    <button name="action_open" states="draft" string="Open" type="object" icon="gtk-yes" />
+                    <button name="action_done" states="open" string="Done" type="object" icon="gtk-jump-to" />
+                    <button name="action_draft" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
+                    <button name="action_cancel" states="draft,open" string="Cancel" type="object" icon="gtk-cancel" />
+                 <div class="oe_right">
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+                 </div>
+                 </div>
+                <sheet string="Planning by Account" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" select="1" />
                         <field name="code" select="1" />
                         <field name="user_id" select="1" />
@@ -134,18 +144,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="6" colspan="4">
-                        <field name="state" select="1"
-                            readonly="1" />
-                        <button name="action_cancel" states="draft,open"
-                            string="Cancel" type="object" icon="gtk-cancel" />
-                        <button name="action_open" states="draft"
-                            string="Open" type="object" icon="gtk-yes" />
-                        <button name="action_done" states="open"
-                            string="Done" type="object" icon="gtk-jump-to" />
-                        <button name="action_draft" states="done,cancel"
-                            string="Reset to Draft" type="object" icon="gtk-convert" />
-                    </group>
+                   </sheet>
                 </form>
             </field>
         </record>

From 73faf3e136382759ba725380b17325c3dedb82e1 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 15:32:31 +0530
Subject: [PATCH 092/117] [IMP]stock_planning : Added state and buttons on top
 bar in sale_forecast & stock_period

bzr revid: mma@tinyerp.com-20120504100231-5fjr3jf1u7j19nir
---
 addons/stock_planning/stock_planning_view.xml | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index b29eb7baace..d20c147e308 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -12,17 +12,23 @@
             <field name="model">stock.period</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock Periods">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="button_open" string="Open" icon="gtk-ok" states="draft" type="object"/>
+                    <button name="button_close" string="Close" icon="gtk-stop" states="open" type="object"/>
+                <div class="oe_right">
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+                </div>
+                </div>
+                <sheet string="Stock Periods" layout="auto">
+                <group class="oe_form_header">
                     <field name="name" colspan="2"/>
                     <newline/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
                     <separator string="State" colspan="4"/>
-                    <group col="4" colspan="4">
-                        <field name="state" select="1" readonly="1"/>
-                        <button name="button_open" string="Open" icon="gtk-ok" states="draft" type="object"/>
-                        <button name="button_close" string="Close" icon="gtk-stop" states="open" type="object"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -78,8 +84,15 @@
             <field name="model">stock.sale.forecast</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock and Sales Forecast">
-                    <group colspan = "4" col = "4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="action_validate" icon="gtk-apply" string="Approve" states="draft" type="object" />
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1"/>
+                </div>
+                </div>
+                <sheet string="Stock and Sales Forecast" layout="auto">
+                    <group colspan = "4" col = "4" class="oe_form_header">
                         <group colspan = "2" col="2" >
                             <field name="company_id" select="1"
                                         groups="base.group_multi_company"
@@ -99,10 +112,6 @@
                             <field name="user_id"/>
                             <field name="product_amt" on_change="product_amt_change(product_amt, product_uom, product_id)" />
                             <field name="product_qty"  />
-                            <field name="state"/>
-                            <label string = ""/>
-                            <button name="action_validate" icon="gtk-apply" string="Approve" states="draft" type="object" colspan = "1"/>
-
                         </group>
                     </group>
                     <separator colspan ="4" string="Sales history"/>
@@ -147,6 +156,7 @@
                         <button name="calculate_sales_history" icon="gtk-execute"
                                 string="Calculate Sales History" type="object" colspan = "1" states="draft" />
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From 1de84a98bcb693e5f13168fac82ab9161fa13b49 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 16:13:17 +0530
Subject: [PATCH 093/117] [IMP]procurement : Added state and buttons on top bar
 and sheet tag in inherited view

bzr revid: mma@tinyerp.com-20120504104317-xesuo9wje9eo6zoq
---
 addons/mrp/mrp_view.xml                       |  4 ++--
 addons/procurement/procurement_view.xml       | 22 +++++++++++--------
 addons/purchase/purchase_view.xml             |  2 +-
 .../purchase_requisition_view.xml             |  2 +-
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 86e8b655f95..59dc443f5fc 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -967,10 +967,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="/form/notebook/page/field[@name='move_id']" position="before">
+                <xpath expr="/form/sheet/notebook/page/field[@name='move_id']" position="before">
                     <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
                 </xpath>
-                <xpath expr="/form/notebook/page/field[@name='close_move']" position="after">
+                <xpath expr="/form/sheet/notebook/page/field[@name='close_move']" position="after">
                     <group colspan="4"  groups="product.group_mrp_properties">
                     <separator colspan="4" string="Properties" />
                     <field colspan="4" name="property_ids" nolabel="1"/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index b3e90ab4e6e..e859aeb98be 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -46,8 +46,18 @@
             <field name="model">procurement.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Procurement">
-                    <group col="2" colspan="2">
+                <form layout="manual">
+                    <div class="oe_form_topbar">
+                        <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
+                        <button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
+                        <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
+                        <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed" />
+                    </div>
+                    </div>
+                <sheet string="Procurement" layout="auto">
+                    <group col="2" colspan="2" class="oe_form_header">
                         <separator colspan="2" string="References"/>
                         <field name="name" string="Procurement Reason"/>
                         <field name="origin"/>
@@ -72,13 +82,6 @@
 
                         <separator colspan="4" string="Status"/>
                         <field colspan="4" name="message" readonly="1"/>
-                        <field name="state" readonly="1"/>
-                        <group col="7" colspan="2">
-                            <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
-                            <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
-                            <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
-                            <button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
-                        </group>
                     </page>
                     <page string="Extra Information">
                         <separator colspan="4" string="Details"/>
@@ -91,6 +94,7 @@
                         <field name="note" colspan="4" nolabel="1"/>
                     </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 483f090d4a7..83f5d52ec67 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -512,7 +512,7 @@
             <field name="inherit_id" ref="procurement.procurement_form_view"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='close_move']" position="before">
+                <xpath expr="/form/sheet/notebook/page/field[@name='close_move']" position="before">
                     <field name="purchase_id"/>
                 </xpath>
             </field>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 93fefe79c65..2855881cf36 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -200,7 +200,7 @@
         <field name="model">procurement.order</field>
         <field name="inherit_id" ref="procurement.procurement_form_view"/>
         <field name="arch" type="xml">
-             <xpath expr="/form/notebook/page/field[@name='close_move']" position="after">
+             <xpath expr="/form/sheet/notebook/page/field[@name='close_move']" position="after">
                 <field name="requisition_id"/>
             </xpath>
         </field>

From 16d26ec6479f0afce1ba5dddead7e1a988fffb00 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 16:46:29 +0530
Subject: [PATCH 094/117] [IMP]survey : Added state and buttons on top bar

bzr revid: mma@tinyerp.com-20120504111629-g1dasotn3a9fl712
---
 addons/survey/survey_view.xml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 7ced238b9b2..d74d7095424 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1058,18 +1058,24 @@
             <field name="model">survey.request</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Survey Request">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
+                    <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" icon="gtk-new"/>
+                    <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
+                    <button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,waiting_answer"/>
+                </div>
+                </div>
+                <sheet string="Survey Request" layout="auto">
+                    <group class="oe_form_header">
                     <field name="date_deadline"/>
                     <field name="survey_id"/>
                     <field name="user_id" on_change="on_change_user(user_id)"/>
                      <field name="response" readonly="1"/>
-                    <group colspan="4" col="6">
-                     <field name="state"/>
-                        <button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
-                        <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
-                        <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" icon="gtk-new"/>
-                        <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From c85d2ff65777b80ab38f991ec31bd4f99a18e60d Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 17:04:32 +0530
Subject: [PATCH 095/117] [IMP]subscription : Added state and buttons on top
 bar

bzr revid: mma@tinyerp.com-20120504113432-3cc9nsnhu9vpw2v7
---
 addons/subscription/subscription_view.xml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 5235e0410bf..d40ea4be243 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -13,8 +13,17 @@
             <field name="model">subscription.subscription</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Subscriptions">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="set_process" states="draft" string="Process" type="object" icon="gtk-go-forward"/>
+                    <button name="set_done" states="running" string="Stop" type="object" icon="gtk-stop"/>
+                    <button name="set_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,running"/>
+                </div>
+                </div>
+                <sheet string="Subscriptions" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
                         <field name="partner_id" select="1"/>
                         <field name="user_id" select="1"/>
@@ -32,12 +41,6 @@
                             <field colspan="4" name="notes" nolabel="1"/>
                             <separator colspan="4"/>
                             <field colspan="4" name="cron_id" readonly="1"/>
-                            <field name="state" readonly="1"/>
-                            <group col="3" colspan="2">
-                                <button name="set_process" states="draft" string="Process" type="object" icon="gtk-go-forward"/>
-                                <button name="set_done" states="running" string="Stop" type="object" icon="gtk-stop"/>
-                                <button name="set_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
-                            </group>
                         </page>
                         <page string="Documents created">
                             <field colspan="4" name="doc_lines" nolabel="1" widget="one2many_list"/>
@@ -47,6 +50,7 @@
                             <field name="note" colspan="4" nolabel="1"/>
                     </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>

From 8851661937661e788b8808022a1f0714ebf9d968 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 18:12:21 +0530
Subject: [PATCH 096/117] [IMP]account_budget : Added state and buttons on top
 bar

bzr revid: mma@tinyerp.com-20120504124221-1afcm5acl6p0q9e4
---
 addons/account_budget/account_budget_view.xml | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 43b936951e8..c35b21677f2 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -104,7 +104,19 @@
             <field name="model">crossovered.budget</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Budget">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                     <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-apply" />
+                     <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-ok"/>
+                     <button string="Done" name="done" states="validate" type="workflow"   icon="gtk-jump-to" />
+                     <button name="draft" states="cancel" string="Reset to Draft" type="workflow" icon="terp-stock_effects-object-colorize"/>
+                     <button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
+                <div class="oe_right">
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                </div>
+                </div>
+                <sheet string="Budget" layout="auto">
+                <group class="oe_form_header">
                             <field name="name" colspan="1" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
                             <field name="code" colspan="1" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
                             <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -134,15 +146,8 @@
                                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                 </form>
                             </field>
-                            <field name="state" select="1"/>
-                            <group col="4" colspan="2">
-                                <button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
-                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-apply" />
-                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-ok"/>
-                                <button string="Done" name="done" states="validate" type="workflow"   icon="gtk-jump-to" />
-                                <button name="draft" states="cancel" string="Reset to Draft" type="workflow" icon="terp-stock_effects-object-colorize"/>
                             </group>
-
+                    </sheet>
                 </form>
             </field>
         </record>

From 9cd9c20e8f3c6bd6c87c3479f08f50b4c81edcc8 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 4 May 2012 18:30:27 +0530
Subject: [PATCH 097/117] [IMP]auction : Added state and buttons on top bar

bzr revid: mma@tinyerp.com-20120504130027-r593yakft15pfk6y
---
 addons/auction/auction_view.xml | 40 ++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index a807b7c2ce1..9236ae3dfcd 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -107,7 +107,15 @@
         <field name="model">auction.dates</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Auctions">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                <button name="close" states="draft" string="Create Invoices" type="object" colspan="2" icon="terp-gtk-go-back-rtl"/>
+            <div class="oe_right">
+                <field name="state" widget="statusbar" nolabel="1"/>
+            </div>
+            </div>
+            <sheet string="Auctions" layout="auto">
+            <group class="oe_form_header">
                 <field name="name" colspan="2" select="1"/>
                 <notebook colspan="4">
                     <page string="Auction Dates">
@@ -123,9 +131,6 @@
                                 <field name="auction2" select="1"/>
                             </group>
                         </group>
-                        <separator string="" colspan="4"/>
-                        <field name="state"/>
-                        <button name="close" states="draft" string="Create Invoices" type="object" colspan="2" icon="terp-gtk-go-back-rtl"/>
                     </page>
                     <page string="Accounting" >
                         <group colspan="4" col="4">
@@ -193,6 +198,8 @@
                         </group>
                     </page>
                 </notebook>
+                </group>
+               </sheet>
             </form>
         </field>
     </record>
@@ -296,8 +303,18 @@
         <field name="type">form</field>
         <field name="priority" eval="8"/>
         <field name="arch" type="xml">
-            <form string="Objects">
-              <group colspan="4" col="8">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                 <button name="button_bought" string="Sold" states="draft" type="object" icon="gtk-jump-to"/>
+                 <button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
+                 <button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
+                 <button name="button_unpaid" string="Set to draft" states="sold,unsold,paid" type="object" icon="gtk-convert"/>
+            <div class="oe_right">
+                <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,sold" />
+            </div>
+            </div>
+            <sheet string="Objects" layout="auto">
+              <group colspan="4" col="8" class="oe_form_header">
                 <field name="name" colspan="4"/>
                 <field name="obj_num"/>
                 <newline/>
@@ -363,16 +380,6 @@
                             <field name="paid_vnd"/>
                         </group>
                     </group>
-                       <group colspan="4" col="4">
-                        <separator string="" colspan="4"/>
-                        <field name="state" colspan="1"/>
-                        <group col="8" colspan="2">
-                            <button name="button_bought" string="Sold" states="draft" type="object" icon="gtk-jump-to"/>
-                            <button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
-                            <button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
-                            <button name="button_unpaid" string="Set to draft" states="sold,unsold,paid" type="object" icon="gtk-convert"/>
-                        </group>
-                      </group>
                    </page>
                    <page string="Bids">
                        <field name="bid_lines" colspan="4" nolabel="1">
@@ -425,6 +432,7 @@
                         <field name="obj_desc" colspan="4" nolabel="1"/>
                     </page>
                 </notebook>
+                </sheet>
            </form>
         </field>
     </record>

From de059928314359e025bdbf2a109247f076c5320b Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 7 May 2012 11:25:20 +0530
Subject: [PATCH 098/117] [IMP]bank : Added state and buttons on top bar in
 statement reconciliation

bzr revid: mma@tinyerp.com-20120507055520-dakd4awcvn8j6qiz
---
 addons/account/account_view.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1c24a487676..4945da29a03 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -666,8 +666,17 @@
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bank Statement">
-                    <group col="7" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                        <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
+                        <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="state"  widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                    </div>
+                </div>
+                <sheet string="Bank Statement" layout="auto">
+                    <group col="7" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
                         <field name="date" select="1" on_change="onchange_date(date, company_id)"/>
                         <field name='company_id' widget="selection" groups="base.group_multi_company" />
@@ -697,12 +706,9 @@
                         </page>
                     </notebook>
                     <group col="8" colspan="4">
-                        <field name="state"/>
                         <field name="balance_end"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
-                        <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
-                        <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From 89997dcfce59219d44376d464864bbddb6fb4f20 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 7 May 2012 18:46:57 +0530
Subject: [PATCH 099/117] [IMP]delivery : fix the issue  inherited view of
 delivery

bzr revid: mma@tinyerp.com-20120507131657-gcew1671nugwxjjk
---
 addons/delivery/delivery_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index db46a4ba7e7..49678f2dc8d 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -234,7 +234,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/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
+                <xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
                     <field name="weight"/>
                     <field name="weight_net"/>
                 </xpath>
@@ -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/sheet/notebook/page[@string='Products']/group/button[@string='Create Invoice']" position="after">
+                <xpath expr="/form/div/button[@string='Create Invoice']" position="after">
                     <button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
                 </xpath>
             </field>

From 7af2e71817714f5221b85982b8c9e192c1f74404 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 21 May 2012 09:38:51 +0200
Subject: [PATCH 100/117] [FIX] fields: remove leftover print statement from
 r.4160

bzr revid: odo@openerp.com-20120521073851-0e9k8ujhexysg95v
---
 openerp/osv/fields.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 4fc5b911f4b..2a6d0d6e3eb 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1176,7 +1176,6 @@ class related(function):
                 # name_get as root, as seeing the name of a related
                 # object depends on access right of source document,
                 # not target, so user may not have access.
-                print self._obj, self.string
                 ng = dict(obj.pool.get(self._obj).name_get(cr, 1, ids, context=context))
                 for r in res:
                     if res[r]:

From dc293abcb531bdb7a9830c7eb4776ac19920e22a Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 21 May 2012 14:10:52 +0530
Subject: [PATCH 101/117] [IMP]:account_voucher:set statusbar at top and also
 improved code with indentation.

bzr revid: apa@tinyerp.com-20120521084052-aexwrj0zuxjkhrk3
---
 .../voucher_payment_receipt_view.xml          | 18 +++++-----
 .../voucher_sales_purchase_view.xml           | 35 ++++++++-----------
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index a20eb3b6bf1..f20ca4bdc32 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -144,14 +144,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                    <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">
+                    <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                </div>
+                    </div>
                 </div>
                 <sheet string="Bill Payment" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
@@ -298,13 +298,13 @@
             <field name="arch" type="xml">
                 <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">
+                    <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>
                 </div>
                 <sheet string="Customer Payment" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 75161eec3e4..0b83097fecb 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -82,17 +82,14 @@
             <field name="arch" type="xml">
                 <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">
+                    <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
+                    <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'),('state','!=','posted'), ('paid','=',True)]}"/>
+                    <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>
                 </div>
                 <sheet string="Sales Receipt" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
@@ -213,19 +210,17 @@
             <field name="arch" type="xml">
                 <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">
+                    <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
+                    <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)]}"/>
+                    <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>
                 </div>
                 <sheet string="Supplier Voucher" layout="auto">
+                    <field name="pay_now" invisible="1"/>
                     <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)"/>

From e95eee2bce720c24211c3f18e9dd796f0f25ad1f Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 21 May 2012 14:53:29 +0530
Subject: [PATCH 102/117] [IMP]:base_calendar:set statusbar at top

bzr revid: apa@tinyerp.com-20120521092329-usq1wbnmjlpkg5nf
---
 addons/base_calendar/base_calendar.py       |   9 +-
 addons/base_calendar/base_calendar_view.xml | 153 ++++++++++----------
 2 files changed, 85 insertions(+), 77 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 4dffd8bcbf8..f91ded74685 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -333,10 +333,10 @@ class calendar_attendee(osv.osv):
                     ('opt-participant', 'Optional Participation'), \
                     ('non-participant', 'For information Purpose')], 'Role', \
                     help='Participation role for the calendar user'),
-        'state': fields.selection([('tentative', 'Tentative'),
-                        ('needs-action', 'Needs Action'),
-                        ('accepted', 'Accepted'),
+        'state': fields.selection([('needs-action', 'Needs Action'),
+                        ('tentative', 'Tentative'),
                         ('declined', 'Declined'),
+                        ('accepted', 'Accepted'),
                         ('delegated', 'Delegated')], 'State', readonly=True, \
                         help="Status of the attendee's participation"),
         'rsvp':  fields.boolean('Required Reply?',
@@ -1036,8 +1036,9 @@ class calendar_event(osv.osv):
                                                 'Show as', states={'done': [('readonly', True)]}),
         'base_calendar_url': fields.char('Caldav URL', size=264),
         'state': fields.selection([('tentative', 'Tentative'),
+                        ('cancelled', 'Cancelled'),
                         ('confirmed', 'Confirmed'),
-                        ('cancelled', 'Cancelled')], 'State', readonly=True),
+                        ], 'State', readonly=True),
         'exdate': fields.text('Exception Date/Times', help="This property \
 defines the list of date/time exceptions for a recurring calendar component."),
         'exrule': fields.char('Exception Rule', size=352, help="Defines a \
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 8af1746b5e9..f24f206b107 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -8,59 +8,63 @@
             <field name="model">calendar.attendee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invitation details">
-                    <group col="6" colspan="4">
-                        <field name="email" string="Invitation To"/>
-                        <field name="cutype" string="Invitation Type" />
-                        <field name="rsvp" />
-                        <field name="role" string="Role" />
-                        <field name="sent_by_uid" string="Invitation From" />
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Invitation">
-                            <separator string="Invitation Detail" colspan="4" />
-                            <group colspan="4" col="4">
-                                <field name="user_id" string="Invited User"/>
-                                <newline/>
-                                <field name="partner_id"
-                                    string="Contact" />
-                            </group>
-                            <separator string="Event Detail" colspan="4" />
-                            <group colspan="4" col="4">
-                                <field name="event_date" />
-                                <field name="event_end_date" />
-                                <field name="language"/>
-                                <field name="ref" colspan="4" readonly="1"/>
-                            </group>
-                        </page>
-                        <page string="Delegation Info">
-                            <separator string="Delegated From" colspan="4" />
-                            <field name="parent_ids" nolabel="1"
-                                colspan="4" readonly="1" />
-                            <separator string="Delegated To" colspan="4" />
-                            <field name="child_ids" nolabel="1"
-                                colspan="4" readonly="1" />
-                        </page>
-                    </notebook>
-                    <group col="6" colspan="4">
-                            <field name="state" />
-                            <button name="do_tentative"
-                                states="needs-action,declined,accepted"
-                                string="Uncertain" type="object"
-                                icon="terp-crm" />
-                            <button name="do_accept" string="Accept"
-                                states="needs-action,tentative,declined"
-                                type="object" icon="gtk-apply" />
-                            <button name="do_decline" string="Decline"
-                                states="needs-action,tentative,accepted"
-                                type="object" icon="gtk-cancel" />
-                            <button
-                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                string="Delegate" type="action"
-                                icon="gtk-sort-descending"
-                                states="needs-action,tentative,declined,accepted"
-                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-                    </group>
+                <form layout="manual">
+                    <div class="oe_form_topbar">
+                        <button name="do_tentative"
+                            states="needs-action,declined,accepted"
+                            string="Uncertain" type="object"
+                            icon="terp-crm" />
+                        <button name="do_accept" string="Accept"
+                            states="needs-action,tentative,declined"
+                            type="object" icon="gtk-apply" />
+                        <button
+                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                            string="Delegate" type="action"
+                            icon="gtk-sort-descending"
+                            states="needs-action,tentative,declined,accepted"
+                            context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                        <button name="do_decline" string="Decline"
+                            states="needs-action,tentative,accepted"
+                            type="object" icon="gtk-cancel" />
+                        <div class="oe_right">
+                            <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
+                        </div>
+                    </div>
+                    <sheet string="Invitation details" layout="auto">
+                        <group col="6" colspan="4">
+                            <field name="email" string="Invitation To"/>
+                            <field name="cutype" string="Invitation Type" />
+                            <field name="rsvp" />
+                            <field name="role" string="Role" />
+                            <field name="sent_by_uid" string="Invitation From" />
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Invitation">
+                                <separator string="Invitation Detail" colspan="4" />
+                                <group colspan="4" col="4">
+                                    <field name="user_id" string="Invited User"/>
+                                    <newline/>
+                                    <field name="partner_id"
+                                        string="Contact" />
+                                </group>
+                                <separator string="Event Detail" colspan="4" />
+                                <group colspan="4" col="4">
+                                    <field name="event_date" />
+                                    <field name="event_end_date" />
+                                    <field name="language"/>
+                                    <field name="ref" colspan="4" readonly="1"/>
+                                </group>
+                            </page>
+                            <page string="Delegation Info">
+                                <separator string="Delegated From" colspan="4" />
+                                <field name="parent_ids" nolabel="1"
+                                    colspan="4" readonly="1" />
+                                <separator string="Delegated To" colspan="4" />
+                                <field name="child_ids" nolabel="1"
+                                    colspan="4" readonly="1" />
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -223,7 +227,28 @@
             <field name="model">calendar.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Events">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="do_confirm"
+                        string="Confirm"
+                        states="tentative,cancelled"
+                        type="object"
+                        icon="gtk-apply" />
+                    <button name="do_tentative"
+                        states="confirmed,cancelled"
+                        string="Uncertain"
+                        type="object"
+                        icon="terp-crm" />
+                    <button name="do_cancel"
+                        string="Cancel"
+                        states="tentative,confirmed"
+                        type="object"
+                        icon="gtk-cancel" />
+                    <div class="oe_right">
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
+                    </div>
+                </div>
+                <sheet string="Events" layout="auto">
                     <group col="6" colspan="4">
                         <field name="name" select="1" string="Summary"
                             colspan="4" required="1" />
@@ -254,25 +279,6 @@
                         </group>
                         <separator string="Description" colspan="4" />
                         <field name="description" nolabel="1" colspan="4" />
-                        <separator colspan="4" string="" />
-                           <group col="5" colspan="4">
-                               <field name="state" select="2" />
-                               <button name="do_cancel"
-                                   string="Cancel"
-                                   states="tentative,confirmed"
-                                   type="object"
-                                   icon="gtk-cancel" />
-                               <button name="do_tentative"
-                                   states="confirmed,cancelled"
-                                   string="Uncertain"
-                                   type="object"
-                                   icon="terp-crm" />
-                               <button name="do_confirm"
-                                   string="Confirm"
-                                   states="tentative,cancelled"
-                                   type="object"
-                                   icon="gtk-apply" />
-                           </group>
                         </page>
                         <page string="Invitation Detail">
                             <button string="Invite People"
@@ -397,6 +403,7 @@
 
                     </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>

From d117f3d4bddbbbffcaab7b096a65050880e9a68e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 21 May 2012 11:59:41 +0200
Subject: [PATCH 103/117] [imp] implemented quick_create_enabled an
 create_enabled

bzr revid: nicolas.vanhoren@openerp.com-20120521095941-qukymjtik97s5d1h
---
 addons/web_kanban/static/src/js/kanban.js      | 18 ++++++++++++++++--
 .../web_kanban/static/src/xml/web_kanban.xml   |  8 +++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 2a143934d2b..1b06fd91ce1 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -12,7 +12,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
     view_type: "kanban",
     init: function (parent, dataset, view_id, options) {
         this._super(parent, dataset, view_id, options);
-        _.defaults(this.options, {"quick_creatable": true});
+        _.defaults(this.options, {"quick_creatable": true, "creatable": true});
         this.fields_view = {};
         this.fields_keys = [];
         this.group_by = null;
@@ -35,6 +35,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         this.add_group_mutex = new $.Mutex();
     },
     on_loaded: function(data) {
+        this.fields_view = data;
         this.$buttons = $(QWeb.render("KanbanView.buttons", {'widget': this}));
         if (this.options.$buttons) {
             this.$buttons.appendTo(this.options.$buttons);
@@ -44,12 +45,25 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         this.$buttons
             .on('click','button.oe_kanban_button_new', this.do_add_record);
         this.$groups = this.$element.find('.oe_kanban_groups tr');
-        this.fields_view = data;
         this.fields_keys = _.keys(this.fields_view.fields);
         this.add_qweb_template();
         this.has_been_loaded.resolve();
         return $.when();
     },
+    _is_quick_create_enabled: function() {
+        if (! this.options.quick_creatable)
+            return false;
+        if (this.fields_view.arch.attrs.quick_create !== undefined)
+            return JSON.parse(this.fields_view.arch.attrs.quick_create);
+        return !! this.group_by;
+    },
+    _is_create_enabled: function() {
+        if (! this.options.creatable)
+            return false;
+        if (this.fields_view.arch.attrs.create !== undefined)
+            return JSON.parse(this.fields_view.arch.attrs.create);
+        return true;
+    },
     add_qweb_template: function() {
         for (var i=0, ii=this.fields_view.arch.children.length; i < ii; i++) {
             var child = this.fields_view.arch.children[i];
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 9ab08957d51..4a193323ce5 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -12,7 +12,9 @@
 </t>
 <div t-name="KanbanView.buttons" class="oe_kanban_buttons">
     <t t-if="widget.options.action_buttons !== false">
-        <button type="button" class="oe_button oe_kanban_button_new oe_form_button_hi">Create</button>
+        <t t-if="widget._is_create_enabled()">
+            <button type="button" class="oe_button oe_kanban_button_new oe_form_button_hi">Create</button>
+        </t>
     </t>
 </div>
 <t t-name="KanbanView.group_header">
@@ -20,7 +22,7 @@
         <t t-if="widget.view.group_by">
             <div class="oe_kanban_group_header">
                 <div class="oe_kanban_fold_icon"></div>
-                <t t-if="widget.view.options.quick_creatable">
+                <t t-if="widget.view._is_quick_create_enabled()">
                     <div class="oe_kanban_add"></div>
                 </t>
                 <div class="oe_fold_column">
@@ -37,7 +39,7 @@
                 <p t-if="widget.title" class="oe_kanban_group_title_vertical"><t t-esc="widget.title"/></p>
             </div>
         </t>
-        <t t-if="! widget.view.group_by &amp;&amp; widget.view.options.quick_creatable">
+        <t t-if="! widget.view.group_by &amp;&amp; widget.view._is_quick_create_enabled()">
             <span class="oe_kanban_no_group_qc_placeholder"/>
         </t>
     </td>

From c47dc13048bf049c4f6084e473067fd2f60afab7 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 21 May 2012 12:02:04 +0200
Subject: [PATCH 104/117] [imp] modified rng of kanban view to add
 quick_create/create flags

bzr revid: nicolas.vanhoren@openerp.com-20120521100204-maa76010h4ugz6oz
---
 openerp/addons/base/rng/view.rng | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index e96c83f44bf..5991b57e529 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -206,6 +206,8 @@
                      grouping is selected in the search view -->
                 <rng:attribute name="default_group_by" />
             </rng:optional>
+            <rng:optional><rng:attribute name="create" /></rng:optional>
+            <rng:optional><rng:attribute name="quick_create" /></rng:optional>
             <rng:zeroOrMore>
                 <rng:ref name="field"/>
             </rng:zeroOrMore>

From da0fbecf5338eb24007446f21f21d3ac95f8b3e7 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 21 May 2012 15:57:44 +0530
Subject: [PATCH 105/117] [IMP]:account_vouchar:improved domain for attrs.

bzr revid: apa@tinyerp.com-20120521102744-6ygc243zu22gy81y
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 0b83097fecb..f9317190b23 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -83,7 +83,7 @@
                 <form layout="manual">
                 <div class="oe_form_topbar">
                     <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                    <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'),('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'),'|',('state','=','draft'), ('paid','=',True)]}"/>
                     <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"/>
@@ -211,7 +211,7 @@
                 <form layout="manual">
                 <div class="oe_form_topbar">
                     <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                    <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)]}"/>
+                    <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','=','draft'), ('paid','=',True)]}"/>
                     <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"/>

From f2b5d602bcdb167393038bd7159d21e47e3c5144 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 21 May 2012 13:40:38 +0200
Subject: [PATCH 106/117] [ADD] QWeb2: added 'void' reserved keyword

bzr revid: fme@openerp.com-20120521114038-tz48ac3cgg8zjmti
---
 addons/web/static/lib/qweb/qweb2.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/lib/qweb/qweb2.js b/addons/web/static/lib/qweb/qweb2.js
index d4f7781e88b..c9b065ee69f 100644
--- a/addons/web/static/lib/qweb/qweb2.js
+++ b/addons/web/static/lib/qweb/qweb2.js
@@ -4,7 +4,7 @@
 // TODO: t-set + t-value + children node == scoped variable ?
 var QWeb2 = {
     expressions_cache: {},
-    RESERVED_WORDS: 'true,false,NaN,null,undefined,debugger,console,in,instanceof,new,function,return,this,typeof,eval,Math,RegExp,Array,Object,Date'.split(','),
+    RESERVED_WORDS: 'true,false,NaN,null,undefined,debugger,console,in,instanceof,new,function,return,this,typeof,eval,void,Math,RegExp,Array,Object,Date'.split(','),
     ACTIONS_PRECEDENCE: 'foreach,if,call,set,esc,escf,raw,rawf,js,debug,log'.split(','),
     WORD_REPLACEMENT: {
         'and': '&&',

From 791061b067c787cf00a3a3a24d2c756a80957e28 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 21 May 2012 13:47:27 +0200
Subject: [PATCH 107/117] [IMP] Merge previous fp's base.css changes in
 base.sass

bzr revid: fme@openerp.com-20120521114727-ou14pali2255am6w
---
 addons/web/static/src/css/base.css  |  5 +----
 addons/web/static/src/css/base.sass | 13 ++++---------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index a2fefddb32a..7682f92fcc6 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -517,6 +517,7 @@
   border-right: 1px solid #afafb6;
   text-shadow: 0 1px 1px white;
   padding-bottom: 16px;
+  line-height: 18px;
 }
 .openerp a.oe_logo {
   width: 220px;
@@ -729,10 +730,6 @@
 .openerp .oe_menu_more_container .oe_menu_more li a {
   white-space: nowrap;
 }
-.oe_leftbar {
-  line-height: 18px;
-}
-
 .openerp .oe_secondary_menu_section {
   font-weight: bold;
   margin-left: 8px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index d7e42639254..f10224522c5 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -105,7 +105,6 @@ $colour4: #8a89ba
                 border-right: none
     th, td
         padding: 0
-        line-height: 18px
         text-align: left
     th
         font-weight: bold
@@ -423,6 +422,7 @@ $colour4: #8a89ba
         border-right: 1px solid #afafb6
         text-shadow: 0 1px 1px white
         padding-bottom: 16px
+        line-height: 18px
     a.oe_logo
         width: 220px
         display: block
@@ -784,11 +784,6 @@ $colour4: #8a89ba
         .oe_view_manager_buttons
             white-space: nowrap
     // }}}
-    // ViewManager.body {{{
-    .oe_view_manager_body
-        h4
-            margin: 8px 0
-    // }}}
     // ViewManager.pager {{{
     .oe_view_manager_pager
         line-height: 26px
@@ -1112,11 +1107,12 @@ $colour4: #8a89ba
     .oe_view_nocontent
         > img
             float: left
-            margin-right: 1.5em
+            margin: 1.5em
         > div
             // don't encroach on my arrow
             overflow: hidden
-            padding: 6px
+            padding: 35px 0px 0px 0px
+            max-width: 700px
             font-size: 125%
     .oe_view_topbar
         border-bottom: 1px solid #cacaca
@@ -1308,7 +1304,6 @@ $colour4: #8a89ba
             padding-left: 8px
             @include box-shadow(none)
             @include radius(0px)
-            color: #666
         .oe_form_field_many2one input,
         .oe_form_field_binary input,
         .oe_form_field_binary input,

From cd9614cfdb7e6c29ea0d2fc4a76db221606c8b8f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 21 May 2012 13:50:59 +0200
Subject: [PATCH 108/117] [ADD] Added oe_form_bottom class

bzr revid: fme@openerp.com-20120521115059-ouw03odyc3bhpbls
---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 7682f92fcc6..4a426e13e39 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1495,7 +1495,7 @@
   padding: 8px 0;
   border-bottom: 1px solid #dddddd;
 }
-.openerp .oe_application .oe_form_sheet_width {
+.openerp .oe_application .oe_form_sheet_width, .openerp .oe_application .oe_form_bottom {
   min-width: 650px;
   max-width: 980px;
   margin: 0 auto;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index f10224522c5..f128d93c4c1 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1216,7 +1216,7 @@ $colour4: #8a89ba
             background: url(/web/static/src/img/form_sheetbg.png)
             padding: 8px 0
             border-bottom: 1px solid #ddd 
-        .oe_form_sheet_width
+        .oe_form_sheet_width, .oe_form_bottom
             min-width: 650px
             max-width: 980px
             margin: 0 auto

From 2a0d2178568f4bf623c24c747f44a92f5c4d9560 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 21 May 2012 13:53:56 +0200
Subject: [PATCH 109/117] [IMP] Improved some form views. Use oe_form_bottom
 class instead of oe_form_sheet_width

bzr revid: fme@openerp.com-20120521115356-c8a854lifxongy95
---
 addons/crm/crm_lead_view.xml                  | 4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 addons/mail/res_users_view.xml                | 2 +-
 addons/project/project_view.xml               | 4 ++--
 addons/sale/sale_view.xml                     | 2 +-
 addons/stock/stock_view.xml                   | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9c3bd07562c..5295695369d 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -155,7 +155,7 @@
                  </page>
                 </notebook>
                 </sheet>
-                <div class="oe_form_sheet_width">
+                <div class="oe_form_bottom">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                 </div>
             </form>
@@ -530,7 +530,7 @@
                 </page>
                 </notebook>
                 </sheet>
-                <div class="oe_form_sheet_width">
+                <div class="oe_form_bottom">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                 </div>
             </form>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 5d175bd16f5..00098a4a766 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -145,7 +145,7 @@
                  </page>
                 </notebook>
             </sheet>
-            <div class="oe_form_sheet_width">
+            <div class="oe_form_bottom">
                 <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
             </div>
             </form>
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 072f2fc3ba5..0411bd418dc 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -27,7 +27,7 @@
                     <field name="notification_email_pref"/>
                 </field>
                 <xpath expr="/form/sheet" position="after">
-                    <div class="oe_form_sheet_width">
+                    <div class="oe_form_bottom">
                         <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                     </div>
                 </xpath>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d1e58193aa8..6266258046c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -100,7 +100,7 @@
                     </notebook>
                     <newline/>
                 </sheet>
-                <div class="oe_form_sheet_width">
+                <div class="oe_form_bottom">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                 </div>
                 </form>
@@ -405,7 +405,7 @@
                         </page>
                     </notebook>
                     </sheet>
-                    <div class="oe_form_sheet_width">
+                    <div class="oe_form_bottom">
                         <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                     </div>
                 </form>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index eef3713fcb4..0d466dd21fc 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -265,7 +265,7 @@
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_form_sheet_width">
+                <div class="oe_form_bottom">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                 </div>
                 </form>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 907d8146a7c..35baed85186 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -942,7 +942,7 @@
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Customer"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
-                        <div class="oe_form_sheet_width">
+                        <div class="oe_form_bottom">
                             <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                         </div>
                     </xpath>
@@ -1058,7 +1058,7 @@
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
-                        <div class="oe_form_sheet_width">
+                        <div class="oe_form_bottom">
                             <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                         </div>
                     </xpath>

From 5feabe936f519760ad34884ee611e0b3e0cc9cca Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 21 May 2012 15:09:14 +0200
Subject: [PATCH 110/117] [IMP] Project Kanban: jslint and code indentation

bzr revid: fme@openerp.com-20120521130914-c2iijoifs763am83
---
 addons/project/static/src/css/project.css | 296 ++++++++++++----------
 addons/project/static/src/js/project.js   |  37 ++-
 2 files changed, 179 insertions(+), 154 deletions(-)

diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 93437c878ba..7a354d5a801 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -1,42 +1,50 @@
 .project_fields {
-  margin-top: 1px;
-  margin-bottom: 1px;
-  font-size: 11px;
-  padding-left: 0px;
-  }
+    margin-top: 1px;
+    margin-bottom: 1px;
+    font-size: 11px;
+    padding-left: 0px;
+}
 .project_fields td {
     border: none;
-    padding: 2px 0 2px 8px; }
+    padding: 2px 0 2px 8px;
+}
 .project_fields th {
     padding: 0;
     border-right: 1px solid #dddddd;
     vertical-align: top;
-    margin-right: 8px; }
+    margin-right: 8px;
+}
 .project_vignettes{
-  padding: 4px !important }
-  .project_vignettes li {
+    padding: 4px !important;
+}
+.project_vignettes li {
     float: left;
-    }
-  .project_vignettes .project_avatar {
+}
+.project_vignettes .project_avatar {
     width: 30px;
     height: 30px;
-    padding-left: 0px; }
-  .project_vignettes .project_fields {
-    width: 100%; }
-    .project_vignettes .project_fields th {
-      width: 120px;
-      font-weight: normal; }
-    .project_vignettes .project_fields td {
-      color: #888888; }
-  .project_vignettes h4 a {
-    color: #4c4c4c; }
-  .project_vignettes > li h4 {
+    padding-left: 0px;
+}
+.project_vignettes .project_fields {
+    width: 100%;
+}
+.project_vignettes .project_fields th {
+    width: 120px;
+    font-weight: normal;
+}
+.project_vignettes .project_fields td {
+    color: #888888;
+}
+.project_vignettes h4 a {
+    color: #4c4c4c;
+}
+.project_vignettes > li h4 {
     margin-bottom: 2px;
-    padding-left: 2px; }
-    
+    padding-left: 2px;
+}
 .oe_project_buttons {
     padding: 2px 2px !important;
-    background: none !important; 
+    background: none !important;
     background-color: transparent !important;
     border: hidden !important;
     color: #8A89BA !important;
@@ -51,8 +59,8 @@
   border-radius: 4px;
   -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); 
-  }
+  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}
 .click_button {
     background: none !important;
     background-color: transparent !important;
@@ -68,54 +76,60 @@
     -webkit-box-align:  baseline;
 }
 
-
 .click_button:hover {
     cursor: default !important;
 }
 .dropdown-menu {
-  display: none;
-  position: absolute; }
+    display: none;
+    position: absolute;
+}
 .dropdown {
-  position: relative; }
+    position: relative;
+}
 .dropdown-toggle:after {
-  width: 0;
-  height: 0;
-  display: inline-block;
-  content: "&darr";
-  text-indent: -99999px;
-  vertical-align: top;
-  margin-top: 8px;
-  margin-left: 4px;
-  border-left: 4px solid transparent;
-  border-right: 4px solid transparent;
-  border-top: 4px solid white;
-  filter: alpha(opacity=50);
-  -khtml-opacity: 0.5;
-  -moz-opacity: 0.5;
-  opacity: 0.5; }
- .oe_project_kanban_vignette .dropdown-menu .color-chooser {
-  padding: 0 3px; }
-  .oe_project_kanban_vignette .dropdown-menu .color-chooser li {
-    float: left; }
-    .oe_project_kanban_vignette .dropdown-menu .color-chooser li a {
-      padding: 2px; }
+    width: 0;
+    height: 0;
+    display: inline-block;
+    content: "&darr";
+    text-indent: -99999px;
+    vertical-align: top;
+    margin-top: 8px;
+    margin-left: 4px;
+    border-left: 4px solid transparent;
+    border-right: 4px solid transparent;
+    border-top: 4px solid white;
+    filter: alpha(opacity=50);
+    -khtml-opacity: 0.5;
+    -moz-opacity: 0.5;
+    opacity: 0.5;
+}
+.oe_project_kanban_vignette .dropdown-menu .color-chooser {
+    padding: 0 3px;
+}
+.oe_project_kanban_vignette .dropdown-menu .color-chooser li {
+    float: left;
+}
+.oe_project_kanban_vignette .dropdown-menu .color-chooser li a {
+    padding: 2px;
+}
 a.oe_project_kanban_action {
-  position: absolute;
-  right: 0;
-  display: none;
-   }
-  a.oe_project_kanban_action:hover {
-    text-decoration: none; }
-  a.oe_project_kanban_action .oe_i {
-    color: #4c4c4c; }
-    
-.square {
-  display: inline-block;
-  width: 18px;
-  height: 18px;
-  border:1px solid grey;
- }
+    position: absolute;
+    right: 0;
+    display: none;
+}
+a.oe_project_kanban_action:hover {
+    text-decoration: none;
+}
+a.oe_project_kanban_action .oe_i {
+    color: #4c4c4c;
+}
 
+.square {
+    display: inline-block;
+    width: 18px;
+    height: 18px;
+    border:1px solid grey;
+}
 .oe_kanban_color_0 {
     background: white;
 }
@@ -136,85 +150,97 @@ a.oe_project_kanban_action {
 }
 
 .open {
-  display: block;
-  }
-  .open .dropdown-menu {
-    display: block; }
+    display: block;
+}
+.open .dropdown-menu {
+    display: block;
+}
 
 a.oe_project_kanban_action {
-  position: absolute;
-  right: 0;
- }
-  a.oe_project_kanban_action:hover {
+    position: absolute;
+    right: 0;
+}
+a.oe_project_kanban_action:hover {
     text-decoration: none;
-    }
-  a.oe_project_kanban_action .eo_i {
-    color: #4c4c4c; }
+}
+a.oe_project_kanban_action .eo_i {
+    color: #4c4c4c;
+}
 
 .oe_project_kanban_vignette {
-  position: relative;
-  min-height: 50px;
-  /*background: white;*/
-  border: 1px solid #d8d8d8;
-  border-bottom-color: #b9b9b9;
-  padding: 6px;
-  margin: 6px 0;
-  display: inline-block;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px; 
-
+    position: relative;
+    min-height: 50px;
+    /*background: white;*/
+    border: 1px solid #d8d8d8;
+    border-bottom-color: #b9b9b9;
+    padding: 6px;
+    margin: 6px 0;
+    display: inline-block;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px; 
 }
-  .oe_project_kanban_vignette:last-child {
-    margin-bottom: 0; }
-  .oe_project_kanban_vignette:hover {
+.oe_project_kanban_vignette:last-child {
+    margin-bottom: 0;
+}
+.oe_project_kanban_vignette:hover {
     -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
     -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
-    -box-shadow: 0 0 3px rgba(0, 0, 0, 0.6); }
-  .oe_project_kanban_vignette h4 {
-    margin: 0 0 2px; }
+    -box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
+}
+.oe_project_kanban_vignette h4 {
+    margin: 0 0 2px;
+}
 
 .oe_project_kanban_vignette .dropdown-menu {
-  top: 30px;
-  right: -140px;
-  padding: 4px;
-  border: 1px solid #afafb6;
-  width: 160px;
-  overflow-x: hidden;
-  z-index: 900;
-  background: white;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-  -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); }
-  .oe_project_kanban_vignette .dropdown-menu p {
-    margin-left: 12px; }
-  .oe_project_kanban_vignette .dropdown-menu li {
+    top: 30px;
+    right: -140px;
+    padding: 4px;
+    border: 1px solid #afafb6;
+    width: 160px;
+    overflow-x: hidden;
+    z-index: 900;
+    background: white;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+    -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+}
+.oe_project_kanban_vignette .dropdown-menu p {
+    margin-left: 12px;
+}
+.oe_project_kanban_vignette .dropdown-menu li {
     float: none;
     display: block;
-    background-color: none; }
-    .oe_project_kanban_vignette .dropdown-menu li a {
-      display: block;
-      padding: 3px 6px;
-      clear: both;
-      font-weight: normal;
-      line-height: 14px;
-      color: #4c4c4c;
-      text-decoration: none; }
-      .oe_project_kanban_vignette .dropdown-menu li a:hover {
-        background: #f0f0fa;
-        background: -moz-linear-gradient(#f0f0fa, #eeeef6);
-        background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
-        background: -webkit-linear-gradient(#f0f0fa, #eeeef6);
-        -moz-box-shadow: none;
-        -webkit-box-shadow: none;
-        -box-shadow: none; }
+    background-color: none;
+}
+.oe_project_kanban_vignette .dropdown-menu li a {
+    display: block;
+    padding: 3px 6px;
+    clear: both;
+    font-weight: normal;
+    line-height: 14px;
+    color: #4c4c4c;
+    text-decoration: none;
+}
+.oe_project_kanban_vignette .dropdown-menu li a:hover {
+    background: #f0f0fa;
+    background: -moz-linear-gradient(#f0f0fa, #eeeef6);
+    background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
+    background: -webkit-linear-gradient(#f0f0fa, #eeeef6);
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    -box-shadow: none;
+}
 
 .oe_project_kanban_vignette .dropdown-menu .color-chooser {
-  padding: 0 3px; }
-  .oe_project_kanban_vignette .dropdown-menu .color-chooser li {
-    float: left; }
-    .oe_project_kanban_vignette .dropdown-menu .color-chooser li a {
-      padding: 2px; }
+    padding: 0 3px;
+}
+.oe_project_kanban_vignette .dropdown-menu .color-chooser li {
+    float: left;
+}
+.oe_project_kanban_vignette .dropdown-menu .color-chooser li a {
+    padding: 2px;
+}
diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index 09a7c9eb256..8d806fb0605 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -3,31 +3,30 @@ openerp.project = function(openerp) {
         bind_events: function() {
             var self = this;
             self._super();
-            if(this.view.dataset.model == 'project.project') {
-                                
+            if (this.view.dataset.model == 'project.project') {
                 /*set avatar title for members.
                 In many2many fields, returns only list of ids.
                 we can implement return value of m2m fields like [(1,"Adminstration"),...].
                 */
-                _.each($(this.$element).find('.project_avatar'),function(avatar){
+                _.each($(this.$element).find('.project_avatar'), function(avatar) {
                     var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.id]]);
-                    dataset.read_slice(['name']).then(function(result){
-                    avatar.setAttribute("title",result[0].name)
+                    dataset.read_slice(['name']).then(function(result) {
+                        avatar.setAttribute("title",result[0].name);
                     });
-                 });
-                
+                });
+
                 // set sequence like Tasks,Issues,Timesheets and Phases
-                var my_list = $("#list a")
+                var my_list = $("#list a");
                 my_list.sort(function (a, b) {
-                    var aValue = parseInt(a.id);
-                    var bValue = parseInt(b.id);
+                    var aValue = parseInt(a.id, 10);
+                    var bValue = parseInt(b.id, 10);
                     return aValue == bValue ? 0 : aValue < bValue ? -1 : 1;
-                  });
+                });
                 $('#list').replaceWith(my_list);
-                
+
                 // when vignette is clicked, it opens the first action in sequence
-                if (my_list.length != 0) {
-                    var click_button = $(this.$element).find('.click_button')
+                if (my_list.length !== 0) {
+                    var click_button = $(this.$element).find('.click_button');
                     click_button.attr('data-name', my_list[0].getAttribute('data-name'));
                     click_button.attr('data-type', "action");
                 }
@@ -36,13 +35,13 @@ openerp.project = function(openerp) {
                   we can do other way to implement new widget.
                   because we need to rpc call for that.
                 */
-                this.$element.find('.bgcolor').click(function(){
-                    var color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16))
-                    var color_class = $(this).find('span').attr('class').split(' ')[0]
+                this.$element.find('.bgcolor').click(function() {
+                    var color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16), 10);
+                    var color_class = $(this).find('span').attr('class').split(' ')[0];
                     $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(color_class + ' oe_project_kanban_vignette');
-                    self.view.dataset.write(parseInt(this.id), {color:color});
+                    self.view.dataset.write(parseInt(this.id, 10), {color:color});
                 });
             }
         }
     });
-}
+};

From 14c5ecc056c041c84128b76f84889a7091689d49 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 21 May 2012 15:55:56 +0200
Subject: [PATCH 111/117] [FIX] correct default values from yaml import

bzr revid: chs@openerp.com-20120521135556-xa1jifioz3boxhqt
---
 openerp/tools/yaml_import.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 082b6487baa..136d1bcee7b 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -323,12 +323,11 @@ class YamlInterpreter(object):
                 self.cr.commit()
 
     def _create_record(self, model, fields, view=False, parent={}, default=True):
-        allfields = model.fields_get(self.cr, 1, context=self.context)
         if view is not False:
-            defaults = default and model.default_get(self.cr, 1, allfields, context=self.context) or {}
+            defaults = default and model._add_missing_default_values(self.cr, 1, {}, context=self.context) or {}
             fg = model.fields_get(self.cr, 1, context=self.context)
         else:
-            default = {}
+            defaults = {}
             fg = {}
         record_dict = {}
         fields = fields or {}

From 70a1ed47d317a3e4193cd5a374e28860244d3f68 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 21 May 2012 15:58:56 +0200
Subject: [PATCH 112/117] [IMP] Removing context_XXX_id for default searches;
 replaced by save as default search in the new search widget

bzr revid: fp@tinyerp.com-20120521135856-hc0kzrpgrxozpq9r
---
 addons/crm/crm.py                         | 21 +-----------------
 addons/crm/crm_view.xml                   | 26 ----------------------
 addons/hr/hr_department.py                |  9 --------
 addons/hr/hr_department_view.xml          | 22 ------------------
 addons/import_sugarcrm/import_sugarcrm.py |  1 -
 addons/project/project.py                 |  7 ------
 addons/project/project_view.xml           | 27 +----------------------
 addons/project_issue/project_issue.py     |  7 ------
 8 files changed, 2 insertions(+), 118 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 467ea64e633..8ab1e6e4ef0 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -224,10 +224,7 @@ class crm_base(object):
         return uid
 
     def _get_section(self, cr, uid, context=None):
-        """Gives section id for current User
-        """
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        return user.context_section_id.id or False
+        return False
 
     def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
         """This function returns value of partner email based on Partner Address
@@ -605,20 +602,4 @@ def _links_get(self, cr, uid, context=None):
     res = obj.read(cr, uid, ids, ['object', 'name'], context)
     return [(r['object'], r['name']) for r in res]
 
-class users(osv.osv):
-    _inherit = 'res.users'
-    _description = "Users"
-    _columns = {
-        'context_section_id': fields.many2one('crm.case.section', 'Sales Team'),
-    }
-
-    def create(self, cr, uid, vals, context=None):
-        res = super(users, self).create(cr, uid, vals, context=context)
-        section_obj=self.pool.get('crm.case.section')
-        if vals.get('context_section_id'):
-            section_obj.write(cr, uid, [vals['context_section_id']], {'member_ids':[(4, res)]}, context)
-        return res
-
-users()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 22f999188e7..dd24ef38911 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -376,32 +376,6 @@
             groups="base.group_no_one" sequence="15"
             parent="base.menu_base_config" />
 
-        <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
-            <field name="name">view.users.form.crm.modif.inherited1</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form_simple_modif" />
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <group name="default_filters" position="inside">
-                    <field name="context_section_id" completion="1"
-                        readonly="0"/>
-                </group>
-            </field>
-        </record>
-
-        <record id="view_users_form_simple_modif_inherited2" model="ir.ui.view">
-                <field name="name">view.users.form.crm.modif.inherited2</field>
-                <field name="model">res.users</field>
-                <field name="type">form</field>
-                <field name="inherit_id" ref="base.view_users_form"/>
-                <field eval="18" name="priority"/>
-                <field name="arch" type="xml">
-                    <group name="default_filters" position="inside">
-                        <field name="context_section_id" completion="1"/>
-                    </group>
-                </field>
-        </record>
-
         <!-- menu for the working time -->
         <menuitem action="resource.action_resource_calendar_form" id="menu_action_resource_calendar_form" parent="resource.menu_resource_config" sequence="1"/>
 
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index 3332207cb17..e0ad03721d6 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -105,14 +105,5 @@ class ir_action_window(osv.osv):
 
 ir_action_window()
 
-class res_users(osv.osv):
-    _inherit = 'res.users'
-    _description = 'User'
-
-    _columns = {
-        'context_department_id': fields.many2one('hr.department', 'Departments'),
-    }
-
-res_users()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 0171b41e881..0a66fd478b9 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -57,27 +57,5 @@
 
        <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_configuration" sequence="5"/>
 
-       <record model="ir.ui.view" id="view_users_form_inherit">
-            <field name="name">res.users.form</field>
-            <field name="type">form</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <group name="default_filters" position="inside">
-                    <field name="context_department_id" completion="1" widget="selection" string="Department"/>
-                </group>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="view_department_form_simple_modif_inherited1">
-            <field name="name">view.department.form.hr.inherited1</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form_simple_modif" />
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <group name="default_filters" position="inside">
-                    <field name="context_department_id" widget="selection" readonly="0"/>
-                </group>
-            </field>
-        </record>
         </data>
 </openerp>
diff --git a/addons/import_sugarcrm/import_sugarcrm.py b/addons/import_sugarcrm/import_sugarcrm.py
index 3ff14bcf1c7..11d3c26a207 100644
--- a/addons/import_sugarcrm/import_sugarcrm.py
+++ b/addons/import_sugarcrm/import_sugarcrm.py
@@ -898,7 +898,6 @@ class sugar_import(import_framework):
                 'context_lang' : 'context_lang',
                 'password' : 'password',
                 '.id' : '.id',
-                'context_department_id/id': self.get_users_department,
                 'user_email' : 'email1',
             }
         }
diff --git a/addons/project/project.py b/addons/project/project.py
index 10ab7987774..7c8b3462668 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -504,13 +504,6 @@ def Project():
     
 project()
 
-class users(osv.osv):
-    _inherit = 'res.users'
-    _columns = {
-        'context_project_id': fields.many2one('project.project', 'Project')
-    }
-users()
-
 class task(osv.osv):
     _name = "project.task"
     _description = "Task"
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6266258046c..344942cb3d5 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -745,31 +745,6 @@
         </record>
 
       <!--     User Form-->
-      <record id="view_project_users_form_simple" model="ir.ui.view">
-          <field name="name">res.users.project.form1</field>
-          <field name="model">res.users</field>
-          <field name="type">form</field>
-          <field name="inherit_id" ref="base.view_users_form"/>
-          <field eval="18" name="priority"/>
-          <field name="arch" type="xml">
-              <group name="default_filters" position="inside">
-                   <field name="context_project_id"/>
-              </group>
-          </field>
-     </record>
-
-     <record model="ir.ui.view" id="view_users_form_project_modif_inherited1">
-         <field name="name">view.users.form.project.modif.inherited1</field>
-         <field name="model">res.users</field>
-         <field name="inherit_id" ref="base.view_users_form_simple_modif" />
-         <field name="type">form</field>
-         <field eval="18" name="priority"/>
-         <field name="arch" type="xml">
-            <group name="default_filters" position="inside">
-                <field name="context_project_id" context="{'user_preference':True}" widget="selection" readonly="0"/>
-            </group>
-       </field>
-    </record>
-    <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
+        <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
     </data>
 </openerp>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 5a792ac4d28..1b208bc3796 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -140,12 +140,6 @@ class project_issue(crm.crm_case, osv.osv):
             res[issue.id] = {'progress' : progress}
         return res
 
-    def _get_project(self, cr, uid, context=None):
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        if user.context_project_id:
-            return user.context_project_id.id
-        return False
-
     def on_change_project(self, cr, uid, ids, project_id, context=None):
         return {}
 
@@ -233,7 +227,6 @@ class project_issue(crm.crm_case, osv.osv):
         'section_id': crm.crm_case._get_section,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
-        'project_id':_get_project,
         'categ_id' : lambda *a: False,
          }
 

From 9e165e6dae78eda72e40f3d12f152a5c232e824c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 21 May 2012 16:25:13 +0200
Subject: [PATCH 113/117] [IMP] improvement in burndown chart computation for
 companies not using the planned/remaining hours

bzr revid: fp@tinyerp.com-20120521142513-8hnu35e2nbkh8f5d
---
 addons/project/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 7c8b3462668..7f4e104db81 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1335,7 +1335,7 @@ class project_task_history_cumulative(osv.osv):
                     id as history_id,
                     date+generate_series(0, CAST((coalesce(end_date,DATE 'tomorrow')::date - date)AS integer)-1) as date,
                     task_id, type_id, user_id, kanban_state, state,
-                    remaining_hours, planned_hours
+                    greatest(remaining_hours,1) as remaining_hours, greatest(planned_hours,1) as planned_hours
                 FROM
                     project_task_history
             ) as history

From 7bc2664663d637bcbb56b6fd0c9bc557290511aa Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 21 May 2012 16:38:13 +0200
Subject: [PATCH 114/117] [IMP] view.rng: allow @groups for <label> element

bzr revid: abo@openerp.com-20120521143813-2p9fflonbt38ftat
---
 openerp/addons/base/rng/view.rng | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index 5991b57e529..54d08edc596 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -293,6 +293,7 @@
     <rng:define name="label">
         <rng:element name="label">
             <rng:ref name="overload"/>
+            <rng:ref name="access_rights"/>
             <rng:optional><rng:attribute name="align"/></rng:optional>
             <rng:optional><rng:attribute name="nolabel"/></rng:optional>
             <rng:optional><rng:attribute name="colspan"/></rng:optional>

From ca6283de8efc7d790fe1d6d843ec264777b3ae47 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 21 May 2012 17:35:30 +0200
Subject: [PATCH 115/117] [IMP] Widget.$ shortcut

bzr revid: al@openerp.com-20120521153530-g3anzkkkhs75psk5
---
 addons/web/static/src/js/corelib.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index b30350a9502..93796ab4282 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -709,6 +709,12 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
             this.$element = elem;
         }
     },
+    /**
+     * Shortcut for $element.find() like backbone
+     */
+    "$": function() {
+        return this.$element.find.apply(this.$element,arguments);
+    },
     /**
      * Informs the action manager to do an action. This supposes that
      * the action manager can be found amongst the ancestors of the current widget.

From c31a54334cdf247c8381112689da18ed21233fd1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 21 May 2012 18:07:45 +0200
Subject: [PATCH 116/117] [FIX] fixing default_context

bzr revid: fp@tinyerp.com-20120521160745-4bir71koyn0vqgww
---
 addons/account/wizard/account_financial_report_view.xml | 2 +-
 addons/crm/crm_lead_menu.xml                            | 4 ++--
 addons/crm/crm_lead_view.xml                            | 4 ++--
 addons/crm/crm_phonecall_menu.xml                       | 6 +++---
 addons/crm/crm_phonecall_view.xml                       | 4 ++--
 addons/crm_claim/crm_claim_menu.xml                     | 2 +-
 addons/crm_fundraising/crm_fundraising_menu.xml         | 2 +-
 addons/crm_fundraising/crm_fundraising_view.xml         | 2 +-
 addons/crm_helpdesk/crm_helpdesk_menu.xml               | 2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml               | 2 +-
 addons/hr/hr_view.xml                                   | 6 ++----
 addons/hr_expense/hr_expense_view.xml                   | 3 ---
 addons/hr_holidays/hr_holidays_view.xml                 | 6 +++---
 addons/hr_recruitment/hr_recruitment_menu.xml           | 2 +-
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml   | 6 +-----
 addons/l10n_be/account_financial_report.xml             | 2 +-
 addons/project/project.py                               | 8 ++++----
 addons/project/project_view.xml                         | 2 +-
 addons/project_issue/project_issue_menu.xml             | 2 +-
 19 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/addons/account/wizard/account_financial_report_view.xml b/addons/account/wizard/account_financial_report_view.xml
index f587141da1e..39c4fac83fd 100644
--- a/addons/account/wizard/account_financial_report_view.xml
+++ b/addons/account/wizard/account_financial_report_view.xml
@@ -53,7 +53,7 @@
              <field name="view_mode">form</field>
              <field name="view_id" ref="accounting_report_view"/>
              <field name="target">new</field>
-             <field name="context"></field>
+             <field name="context">{}</field>
              <field name="context" eval="{'default_account_report_id':ref('account.account_financial_report_profitandloss0')}"/>
         </record>
         <menuitem icon="STOCK_PRINT" name="Profit And Loss" action="action_account_report_pl" id="menu_account_report_pl" parent="final_accounting_reports"/>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 3cd45fd5cd1..02fc3369041 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -9,7 +9,7 @@
         <field name="domain">['|', ('type','=','lead'), ('type','=',False)]</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
-        <field name="context">{'default_type': 'lead', 'search_default_section_id': section_id, 'stage_type': 'lead'}</field>
+        <field name="context">{'default_type':'lead', 'stage_type':'lead'}</field>
         <field name="help">
             &lt;img src="http://www.thaicrmsoftware.com/wp-content/uploads/2011/11/lead-conversion.jpg" align="right" style="padding: 6px" width="306" height="223"&gt;
             &lt;h2&gt;Create your first OpenERP Lead &lt;/h2&gt;
@@ -66,7 +66,7 @@
           <field name="res_model">crm.lead</field>
           <field name="view_mode">kanban,tree,form,graph,calendar</field>
           <field name="domain">[('type','=','opportunity')]</field>
-          <field name="context">{'search_default_new':1, 'search_default_open':1, 'search_default_section_id':section_id, 'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
+          <field name="context">{'search_default_new':1, 'search_default_open':1, 'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
           <field name="view_id" eval="False"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
           <field name="help">With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 5295695369d..6241b831b66 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -358,7 +358,7 @@
                     context="{'invisible_section': False}">
                     <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
-                        domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                         help="My Sales Team(s)"/>
                     <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
@@ -605,7 +605,7 @@
                     context="{'invisible_section': False}"
                     widget="selection">
                     <filter icon="terp-personal+"
-                        domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                         context="{'invisible_section': False}"
                         help="My Sales Team(s)" />
                     <filter icon="terp-personal+"
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 693ed981325..c6fc9b404a4 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -31,7 +31,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
+        <field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
 
@@ -67,7 +67,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_inbound_phone_tree_view"/>
         <field name="domain">[]</field>
-        <field name="context" eval="'{\'search_default_section_id\':section_id}'"/>
+        <field name="context">{}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
         <field name="help">This tool allows you to log your inbound calls on the fly. Each call you get will appear on the partner form to trace every contact you have with a partner. From the phone call form, you can trigger a request for another call, a meeting or an opportunity.</field>
 
@@ -105,7 +105,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain">[('state','!=','done')]</field>
-        <field name="context" eval="'{\'search_default_section_id\':section_id, \'default_state\':\'open\'}'"/>
+        <field name="context" eval="'{\'default_state\':\'open\'}'"/>
         <field name="search_view_id" ref="crm.view_crm_case_scheduled_phonecalls_filter"/>
         <field name="help">Scheduled calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team.</field>
     </record>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index af49956eda8..136af4cf51e 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -211,7 +211,7 @@
                <field name="section_id"
                    widget="selection" string="Sales Team">
                    <filter icon="terp-personal+"
-                       domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                       domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="My Sales Team(s)" />
                </field>
                <newline/>
@@ -261,7 +261,7 @@
                <field name="section_id"
                    widget="selection" string="Sales Team">
                    <filter icon="terp-personal+"
-                       domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                       domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="My Sales Team(s)" />
                </field>
                <newline/>
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 2f87da24b4c..734302fa7f9 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -20,7 +20,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,calendar,form</field>
             <field name="view_id" ref="crm_case_claims_tree_view"/>
-            <field name="context">{'search_default_section_id': section_id,"search_default_user_id":uid, "stage_type":'claim'}</field>
+            <field name="context">{"search_default_user_id":uid, "stage_type":'claim'}</field>
             <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
             <field name="help">Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module.</field>
         </record>
diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index ae758a58392..38187ed1d4d 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -13,7 +13,7 @@
         <field name="res_model">crm.fundraising</field>
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
-        <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
+        <field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="crm_fundraising.view_crm_case_fund_filter"/>
         <field name="help">If you need to collect money for your organization or a campaign, Fund Raising allows you to track all your fund raising activities. In the search list, filter by funds description, email, history and probability of success.</field>
     </record>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 48eb1aa3072..41a4a4ed4fc 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -234,7 +234,7 @@
                             </field>
                             <field name="section_id" widget="selection" string="Sales Team">
                                 <filter icon="terp-personal+"
-                                    domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                                    domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                     help="My Sales Team(s)" />
                             </field>
                         </group>
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index b2c7337b7d3..f5c36eb1ab1 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -17,7 +17,7 @@
             <field name="view_mode">tree,calendar,form</field>
             <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
             <field name="search_view_id" ref="view_crm_case_helpdesk_filter"/>
-            <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="help">Helpdesk and Support allow you to track your interventions. Select a customer, add notes and categorize interventions with partners if necessary. You can also assign a priority level. Use the OpenERP Issues system to manage your support activities. Issues can be connected to the email gateway: new emails may create issues, each of them automatically gets the history of the conversation with the customer.</field>
         </record>
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 48681357660..fb58c2dd058 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -232,7 +232,7 @@
                     <field name="user_id" widget="selection"/>
                     <field name="section_id" widget="selection" string="Sales Team">
                         <filter icon="terp-personal+"
-                            domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                             help="My Sales Team(s)" />
                     </field>
                     <newline/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 4147ebc30a9..a69be2e974a 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -106,7 +106,6 @@
                 <search string="Employees">
                     <field name="name"/>
                     <field name="department_id" widget="selection">
-                    <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]" string="My Departments Employee"/>
                     </field>
                     <field name="job_id" widget="selection"/>
                     <field name="category_ids" select="1"/>
@@ -182,7 +181,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
             <field name="domain">[]</field>
-            <field name="context">{"search_default_department_id": department_id}</field>
+            <field name="context">{}</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_employee_filter"/>
             <field name="help">Here you can manage your work force by creating employees and assigning them specific properties in the system. Maintain all employee related information and keep track of anything that needs to be recorded for them. The personal information tab will help you maintain their identity data. The Categories tab gives you the opportunity to assign them related employee categories depending on their position and activities within the company. A category can be a seniority level within the company or a department. The Timesheets tab allows to assign them a specific timesheet and analytic journal where they will be able to enter time through the system. In the note tab, you can enter text data that should be recorded for a specific employee.</field>
@@ -410,7 +409,6 @@
                     <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="department_id" widget="selection">
-                      <filter icon="terp-personal+" domain="[('department_id', '=', context.get('department_id', False))]" help="My Departments Jobs"/>
                     </field>
                     <newline />
                     <group expand="0" string="Group By...">
@@ -428,7 +426,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_job_filter"/>
-            <field name="context">{"search_default_Current":1,"search_default_department_id": department_id}</field>
+            <field name="context">{"search_default_Current":1}</field>
             <field name="help">Job Positions are used to define jobs and their requirements. You can keep track of the number of employees you have per job position and how many you expect in the future. You can also attach a survey to a job position that will be used in the recruitment process to evaluate the applicants for this job position.</field>
         </record>
 
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index a62a9026ecf..1d4a3162f42 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -148,12 +148,9 @@
                       <field name="employee_id"/>
                       <field name="date"/>
                       <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
-                   <filter icon="terp-personal+" context="{'invisible_department': False}" domain="[('department_id','=',context.get('department_id',False))]" help="My Department"/>
                     </field>
                       <field name="name"/>
                       <field name="user_id"  string="User">
-                      <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]"
-                            string="Expenses of My Department"/>
                       </field>
                 </group>
                 <newline />
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9f8f998cbd9..a00deb5bcd4 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -262,7 +262,7 @@
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
-            <field name="context">{"search_default_department_id": department_id}</field>
+            <field name="context">{}</field>
             <field name="domain">[('type','=','remove')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help">Leave requests can be recorded by employees and validated by their managers. Once a leave request is validated, it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc.) and manage allowances per type.</field>
@@ -295,7 +295,7 @@
             <field name="name">Requests Approve</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
-            <field name="context">{'default_type': 'add', 'search_default_approve':1,"search_default_department_id": department_id}</field>
+            <field name="context">{'default_type': 'add', 'search_default_approve':1}</field>
             <field name="domain">[('type','=','remove')]</field>
             <field name="view_id" ref="edit_holiday_new"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
@@ -321,7 +321,7 @@
             <field name="name">Allocation Requests</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
-            <field name="context">{'default_type':'add',"search_default_department_id": department_id}</field>
+            <field name="context">{'default_type':'add'}</field>
             <field name="domain">[('type','=','add')]</field>
             <field name="view_id" ref="allocation_leave_new"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 04d73dcd2a8..426185abf86 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -8,7 +8,7 @@
             <field name="res_model">hr.applicant</field>
             <field name="view_mode">kanban,tree,form,graph,calendar</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{'search_default_filter_inprogress':1,'search_default_filter_new':1,"search_default_department_id": department_id}</field>            
+            <field name="context">{'search_default_filter_inprogress':1,'search_default_filter_new':1}</field>            
             <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
             <field name="help">From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content.</field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index d822f10d944..f6323ffbc29 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -165,11 +165,7 @@
                         <separator orientation="vertical"/>
                         <field name="employee_id"/>
                         <field name="date_from"/>
-                        <field name="department_id" widget="selection">
-                            <filter icon="terp-personal+"
-                                domain="[('department_id','=',context.get('department_id',False))]"
-                                help="My Departments Timesheet"/>
-                        </field>
+                        <field name="department_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/l10n_be/account_financial_report.xml b/addons/l10n_be/account_financial_report.xml
index 6f386b89184..ccc118d30ae 100644
--- a/addons/l10n_be/account_financial_report.xml
+++ b/addons/l10n_be/account_financial_report.xml
@@ -738,7 +738,7 @@
              <field name="view_mode">form</field>
              <field name="view_id" ref="account.accounting_report_view"/>
              <field name="target">new</field>
-             <field name="context"></field>
+             <field name="context">{}</field>
              <field name="context" eval="{'default_account_report_id':ref('account_financial_report_belgiumpl0')}"/>
         </record>
         <menuitem icon="STOCK_PRINT" name="Profit And Loss" action="action_account_report_be_pl" id="menu_account_report_be_pl" parent="menu_finance_belgian_statement" sequence="2"/>
diff --git a/addons/project/project.py b/addons/project/project.py
index 7f4e104db81..ef58c0c5466 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -517,11 +517,11 @@ class task(osv.osv):
            context key, or None if it cannot be resolved to a single project.
         """
         if context is None: context = {}
-        if type(context.get('project_id')) in (int, long):
-            project_id = context['project_id']
+        if type(context.get('default_project_id')) in (int, long):
+            project_id = context['default_project_id']
             return project_id
-        if isinstance(context.get('project_id'), basestring):
-            project_name = context['project_id']
+        if isinstance(context.get('default_project_id'), basestring):
+            project_name = context['default_project_id']
             project_ids = self.pool.get('project.project').name_search(cr, uid, name=project_name)
             if len(project_ids) == 1:
                 return project_ids[0][0]
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 344942cb3d5..61a445d4c59 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -624,7 +624,7 @@
             <field name="view_mode">kanban,tree,form,calendar,gantt,graph</field>
             <field eval="False" name="filter"/>
             <field name="view_id" eval="False"/>
-            <field name="context">{"search_default_project_id": project_id}</field>
+            <field name="context">{}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
             <field name="help">A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.</field>
         </record>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 1c4cecfe439..4c3be9e1327 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -12,7 +12,7 @@
         <field name="view_mode">kanban,tree,calendar</field>
         <field name="view_id" eval="False"/>
         <field name="domain" eval=""/>
-        <field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1,"search_default_project_id":project_id}</field>
+        <field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1}</field>
         <field name="search_view_id" ref="view_project_issue_filter"/>
         <field name="help">Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)</field>
     </record>

From b3fa4ccf5cd03f1cfcac069ef7092affb362fc8b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 22 May 2012 11:14:45 +0200
Subject: [PATCH 117/117] [IMP] removed icons from topbar

bzr revid: fp@tinyerp.com-20120522091445-mpiknieg2v8sd31f
---
 addons/account/account_invoice_view.xml       | 24 ++++-----
 addons/account/account_view.xml               | 28 +++++-----
 addons/account_asset/account_asset_view.xml   |  6 +--
 addons/account_budget/account_budget_view.xml | 10 ++--
 .../account_payment/account_payment_view.xml  |  8 +--
 .../account_voucher/account_voucher_view.xml  |  8 +--
 .../voucher_payment_receipt_view.xml          | 16 +++---
 .../voucher_sales_purchase_view.xml           | 20 +++----
 addons/base_calendar/base_calendar_view.xml   | 14 ++---
 addons/crm/crm_lead_view.xml                  | 26 ++++-----
 addons/crm/crm_phonecall_view.xml             | 10 ++--
 addons/crm_claim/crm_claim_view.xml           | 10 ++--
 .../crm_fundraising/crm_fundraising_view.xml  | 12 ++---
 addons/crm_helpdesk/crm_helpdesk_view.xml     | 12 ++---
 addons/event/event_view.xml                   | 16 +++---
 addons/hr/hr_view.xml                         |  6 +--
 addons/hr_evaluation/hr_evaluation_view.xml   | 10 ++--
 addons/hr_expense/hr_expense_view.xml         | 10 ++--
 addons/hr_holidays/hr_holidays_view.xml       | 20 +++----
 addons/hr_payroll/hr_payroll_view.xml         | 16 +++---
 addons/hr_recruitment/hr_recruitment_view.xml | 10 ++--
 .../hr_timesheet_invoice_view.xml             |  8 +--
 .../hr_timesheet_sheet_view.xml               |  8 +--
 addons/idea/idea_view.xml                     |  6 +--
 addons/lunch/lunch_view.xml                   |  4 +-
 .../marketing_campaign_view.xml               | 22 ++++----
 addons/mrp/mrp_view.xml                       | 14 ++---
 addons/mrp_operations/mrp_operations_view.xml | 12 ++---
 addons/mrp_repair/mrp_repair_view.xml         | 22 ++++----
 addons/point_of_sale/point_of_sale_view.xml   |  6 +--
 addons/procurement/procurement_view.xml       |  8 +--
 addons/project/project_view.xml               | 28 +++++-----
 addons/project_issue/project_issue_view.xml   | 12 ++---
 .../project_long_term_view.xml                | 10 ++--
 .../project_planning_view.xml                 |  8 +--
 addons/project_scrum/project_scrum_view.xml   | 22 ++++----
 addons/purchase/purchase_view.xml             | 18 +++----
 .../purchase_requisition_view.xml             |  8 +--
 addons/sale/sale_view.xml                     | 28 +++++-----
 addons/stock/stock_view.xml                   | 54 +++++++++----------
 addons/stock_planning/stock_planning_view.xml |  6 +--
 addons/subscription/subscription_view.xml     |  6 +--
 addons/survey/survey_view.xml                 | 14 ++---
 43 files changed, 308 insertions(+), 308 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 8fe6624525c..1306f75a717 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -146,11 +146,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
-                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
-                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+                    <button name="invoice_open" states="draft,proforma2" string="Approve"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid'/>
+                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                     </div>
@@ -262,13 +262,13 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_proforma_invoices"/>
-                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
-                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
-                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
+                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
+                    <button name="invoice_open" states="draft,proforma2" string="Validate"/>
+                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+                    <button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid'/>
+                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                     </div>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 4801d785e0a..b7bd4e55ce5 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -13,8 +13,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="create_period" states="draft" string="Create Monthly Periods" type="object" icon="terp-document-new"/>
-                    <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" icon="terp-document-new"/>
+                    <button name="create_period" states="draft" string="Create Monthly Periods" type="object"/>
+                    <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" />
                     </div>
@@ -98,7 +98,7 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" groups="account.group_account_manager"/>
+                    <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1"/>
                     </div>
@@ -606,9 +606,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
-                    <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
-                    <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
+                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
+                    <button name="button_dummy" states="draft" string="Compute" type="object"/>
+                    <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
@@ -671,9 +671,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
-                    <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
-                    <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
+                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
+                    <button name="button_dummy" states="draft" string="Compute" type="object"/>
+                    <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
                     <div class="oe_right">
                         <field name="state"  widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
@@ -1367,8 +1367,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_validate" states="draft" string="Post" type="object" icon="terp-camera_test"/>
-                    <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
+                    <button name="button_validate" states="draft" string="Post" type="object"/>
+                    <button name="button_cancel" states="posted" string="Cancel" type="object"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" />
                     </div>
@@ -2641,9 +2641,9 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-dialog-close" type="object"/>
-                    <button name="button_open" states="draft" string="Open CashBox" icon="gtk-go-forward" type="object"/>
-                    <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
+                    <button name="button_confirm_cash" states="open" string="Close CashBox" type="object"/>
+                    <button name="button_open" states="draft" string="Open CashBox" type="object"/>
+                    <button name="button_cancel" states="confirm,open" string="Cancel" type="object" groups="base.group_extended"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 19df7653d86..1affcf7a85c 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -80,9 +80,9 @@
         <field name="arch" type="xml">
            <form layout="manual">
            <div class="oe_form_topbar">
-               <button name="validate" states="draft" string="Confirm Asset" type="object" icon="terp-camera_test"/>
-               <button name="set_to_close" states="open" string="Set to Close" type="object" icon="gtk-close"/>
-               <button name="set_to_draft" states="open" string="Set to Draft" type="object" icon="gtk-convert"/> 
+               <button name="validate" states="draft" string="Confirm Asset" type="object"/>
+               <button name="set_to_close" states="open" string="Set to Close" type="object"/>
+               <button name="set_to_draft" states="open" string="Set to Draft" type="object"/> 
                <div class="oe_right">
                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                </div>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index a4239054567..13c97ca32d6 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -106,11 +106,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-apply" />
-                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-ok"/>
-                    <button string="Done" name="done" states="validate" type="workflow"   icon="gtk-jump-to" />
-                    <button name="draft" states="cancel" string="Reset to Draft" type="workflow" icon="terp-stock_effects-object-colorize"/>
-                    <button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow" />
+                    <button string="Approve" name="validate" states="confirm" type="workflow"/>
+                    <button string="Done" name="done" states="validate" type="workflow"   />
+                    <button name="draft" states="cancel" string="Reset to Draft" type="workflow"/>
+                    <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 33c94ba1412..285b5983b1a 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -102,10 +102,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
-                    <button name="set_done" states="open" string="Make Payments" type="object" icon="gtk-execute"/>
-                    <button name="set_to_draft" states="cancel" string="Set to draft" type="object" icon="gtk-convert"/>
-                    <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
+                    <button name="open" states="draft" string="Confirm Payments" />
+                    <button name="set_done" states="open" string="Make Payments" type="object"/>
+                    <button name="set_to_draft" states="cancel" string="Set to draft" type="object"/>
+                    <button name="cancel" states="draft,open" string="Cancel"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                     </div>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 58319743a99..9b5f9ad901c 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -42,10 +42,10 @@
             <field name="arch" type="xml">
                 <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"/>
+                      <button name="proforma_voucher" string="Post" states="draft"/>
+                      <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record ?"/>
+                      <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
+                      <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                       <div class="oe_right">
                           <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                       </div>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 56a156ac68e..864ed8df941 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -145,10 +145,10 @@
             <field name="arch" type="xml">
                 <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)"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" 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" 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>
@@ -299,10 +299,10 @@
             <field name="arch" type="xml">
                 <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)"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" 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" 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>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 24a20b34dcb..d3bb60230c6 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -82,11 +82,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                    <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'),'|',('state','=','draft'), ('paid','=',True)]}"/>
-                    <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"/>
+                    <button name="proforma_voucher" string="Validate" states="draft"/>
+                    <button 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'),'|',('state','=','draft'), ('paid','=',True)]}"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
+                    <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                     </div>
@@ -211,11 +211,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                    <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','=','draft'), ('paid','=',True)]}"/>
-                    <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"/>
+                    <button name="proforma_voucher" string="Validate" states="draft"/>
+                    <button 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','=','draft'), ('paid','=',True)]}"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
+                    <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                     </div>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 055b2237a34..76304c7da8a 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -13,19 +13,19 @@
                         <button name="do_tentative"
                             states="needs-action,declined,accepted"
                             string="Uncertain" type="object"
-                            icon="terp-crm" />
+                            />
                         <button name="do_accept" string="Accept"
                             states="needs-action,tentative,declined"
-                            type="object" icon="gtk-apply" />
+                            type="object" />
                         <button
                             name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
                             string="Delegate" type="action"
-                            icon="gtk-sort-descending"
+                           
                             states="needs-action,tentative,declined,accepted"
                             context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                         <button name="do_decline" string="Decline"
                             states="needs-action,tentative,accepted"
-                            type="object" icon="gtk-cancel" />
+                            type="object" />
                         <div class="oe_right">
                             <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
                         </div>
@@ -234,17 +234,17 @@
                         string="Confirm"
                         states="tentative,cancelled"
                         type="object"
-                        icon="gtk-apply" />
+                        />
                     <button name="do_tentative"
                         states="confirmed,cancelled"
                         string="Uncertain"
                         type="object"
-                        icon="terp-crm" />
+                        />
                     <button name="do_cancel"
                         string="Cancel"
                         states="tentative,confirmed"
                         type="object"
-                        icon="gtk-cancel" />
+                        />
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
                     </div>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 17fd154e8a3..e609c8808ef 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -53,12 +53,12 @@
         <field name="arch" type="xml">
             <form string="Leads Form" layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
-                    <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause" />
-                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" />
+                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" />
+                    <button name="case_pending" string="Pending" states="open" type="object" />
+                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
@@ -402,13 +402,13 @@
         <field name="arch" type="xml">
             <form string="Opportunities" layout="manual">
                 <div class="oe_form_topbar oe_form_topbar_hifirst">
-                    <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
-                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
-                    <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
-                    <button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />
+                    <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" />
+                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" />
+                    <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
+                    <button name="case_cancel" string="Cancel" states="draft" type="object" />
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index fb41c0b22c3..55d8d8c9a64 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -60,11 +60,11 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="case_close" string="Held" states="open,pending" type="object" icon="gtk-jump-to" />
-                <button name="case_open" string="Todo" states="pending" type="object" icon="gtk-go-forward" />
-                <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause" />
-                <button name="case_reset" string="Reset to Todo" states="cancel" type="object" icon="gtk-convert" />
-                <button name="case_cancel" string="Cancel" states="open,pending" type="object" icon="gtk-cancel" />
+                <button name="case_close" string="Held" states="open,pending" type="object" />
+                <button name="case_open" string="Todo" states="pending" type="object" />
+                <button name="case_pending" string="Not Held" states="open" type="object" />
+                <button name="case_reset" string="Reset to Todo" states="cancel" type="object" />
+                <button name="case_cancel" string="Cancel" states="open,pending" type="object" />
                 <div class="oe_right">
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done" statusbar_colors='{"pending":"red"}' select="1"/>
                 </div>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 6e26416f2ff..2ed988df02a 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -68,11 +68,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_close" string="Done" states="open,pending" type="object" icon="gtk-jump-to" />
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
+                    <button name="case_close" string="Done" states="open,pending" type="object" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
                     <div class="oe_right">
                         <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index d622355aa73..f46b24171de 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -79,12 +79,12 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_close" string="Done" states="open,pending" type="object" icon="gtk-close" />
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
-                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
+                    <button name="case_close" string="Done" states="open,pending" type="object" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" />
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" groups="base.group_extended" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index b5b6f0dd0d0..d36ea8db8c5 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -30,12 +30,12 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_close" states="open,pending" string="Close" type="object" icon="gtk-jump-to" />
-                    <button name="case_open" states="draft,pending" string="Open" type="object" icon="gtk-go-forward" />
-                    <button name="case_pending" states="draft,open" string="Pending" type="object" icon="gtk-media-pause" />
-                    <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
-                    <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object" icon="gtk-go-up" />
-                    <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" />
+                    <button name="case_close" states="open,pending" string="Close" type="object" />
+                    <button name="case_open" states="draft,pending" string="Open" type="object" />
+                    <button name="case_pending" states="draft,open" string="Pending" type="object" />
+                    <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" />
+                    <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object" />
+                    <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object" />
                     <div class="oe_right">
                         <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ea286aafaec..ecad0182982 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -52,10 +52,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object"/>
+                    <button string="Mark Done" name="button_done" states="confirm" type="object"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object"/>
+                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
                     <div class="oe_right">
                         <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                     </div>
@@ -360,10 +360,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                    <button name="button_reg_close" string="Attended" states="open" type="object" icon="gtk-apply"/>
-                    <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                    <button name="registration_open" string="Confirm" states="draft" type="object"/>
+                    <button name="button_reg_close" string="Attended" states="open" type="object"/>
+                    <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object"/>
+                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
                     <div class="oe_right">
                         <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                     </div>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 14745f72419..1e07a4c81c6 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -347,9 +347,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="job_recruitement" string="In Recruitement" states="open" type="object" icon="gtk-go-forward"/>
-                    <button name="job_open" string="In Position" states="old,recruit" type="object" icon="terp-camera_test"/>
-                    <button name="job_old" string="Mark as Old" states="open,recruit" type="object" icon="gtk-cancel"/>
+                    <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
+                    <button name="job_open" string="In Position" states="old,recruit" type="object"/>
+                    <button name="job_old" string="Mark as Old" states="open,recruit" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="recruit,open"/>
                     </div>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 2e8c23082fd..d87b44aa2be 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -156,11 +156,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object" icon="gtk-execute"/>
-                    <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object" icon="gtk-go-forward"/>
-                    <button name="button_done" string="Done" states="progress" type="object" icon="gtk-jump-to"/>
-                    <button name="button_draft" string="Reset to Draft" states="cancel" type="object" icon="terp-stock_effects-object-colorize"/>
-                    <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object" icon="gtk-cancel"/>
+                    <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object"/>
+                    <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object"/>
+                    <button name="button_done" string="Done" states="progress" type="object"/>
+                    <button name="button_draft" string="Reset to Draft" states="cancel" type="object"/>
+                    <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,wait,done" statusbar_colors='{"progress":"blue"}'/>
                     </div>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index cdfa5485158..d82f89930ef 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -67,11 +67,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="confirm" states="draft" string="Submit to Manager" type="workflow" icon="gtk-apply"/>
-                    <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_user"/>
-                    <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_user"/>
-                    <button name="invoice" states="accepted" string="Invoice" type="object" icon="gtk-go-forward" groups="base.group_hr_user"/>
-                    <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
+                    <button name="confirm" states="draft" string="Submit to Manager" type="workflow"/>
+                    <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
+                    <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user"/>
+                    <button name="invoice" states="accepted" string="Invoice" type="object" groups="base.group_hr_user"/>
+                    <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                     </div>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9cfd2706cef..57756c5cb35 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -65,11 +65,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
-                    <button string="Set to Draft" name="set_to_draft" states="refuse,validate" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Approved" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager"/>
+                    <button string="Set to Draft" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                     </div>
@@ -117,11 +117,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
-                    <button string="Set to Draft" name="set_to_draft" states="cancel,validate,refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Approved" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Set to Draft" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                     </div>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 0e59dd393ca..93e875b61be 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -262,11 +262,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Confirm" icon="terp-camera_test" name="hr_verify_sheet" states="draft"/>
-                    <button string="Refund" icon="gtk-execute" name="refund_sheet" states="confirm,done" type='object'/>
-                    <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft" states="cancel"/>
-                    <button string="Compute Sheet" icon="terp-stock_format-scientific" name="compute_sheet" type="object" states="draft"/>
-                    <button string="Cancel" icon="terp-dialog-close" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
+                    <button string="Confirm" name="hr_verify_sheet" states="draft"/>
+                    <button string="Refund" name="refund_sheet" states="confirm,done" type='object'/>
+                    <button string="Set to Draft" name="draft" states="cancel"/>
+                    <button string="Compute Sheet" name="compute_sheet" type="object" states="draft"/>
+                    <button string="Cancel" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
@@ -726,9 +726,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="close_payslip_run" type="object" icon="terp-camera_test" string="Close" states="draft"/>
-                    <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" icon="gtk-execute" string="Generate Payslips" />
-                    <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft_payslip_run" type="object" states="close"/>
+                    <button name="close_payslip_run" type="object" string="Close" states="draft"/>
+                    <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" />
+                    <button string="Set to Draft" name="draft_payslip_run" type="object" states="close"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1"/>
                     </div>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index b11bc9af3cd..ab58a167f06 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -76,11 +76,11 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
-                <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
-                <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
-                <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action"/>
+                <button name="case_open" string="In Progress" states="draft,pending" type="object"/>
+                <button name="case_pending" string="Pending" states="open" type="object"/>
+                <button name="case_reset" string="Reset to New" states="done,cancel" type="object"/>
+                <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object"/>
                 <div class="oe_right">
                     <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </div>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 1444f8191f3..43ca7a4004e 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -24,10 +24,10 @@
                 </group>
                 <xpath expr="/form/sheet" position='before'>
                     <div class="oe_form_topbar">
-                        <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"/>
-                        <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
-                        <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
+                        <button name="set_pending" string="Pending" type="object" states="open"/>
+                        <button name="set_close" string="Close" type="object" states="open,pending"/>
+                        <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft"/>
+                        <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                         <div class="oe_right">
                             <field name="state" readonly="1" widget="statusbar" nolabel="1"
                             statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index bcd13aaa296..aa815df5337 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -62,10 +62,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_confirm" states="draft" string="Submited to Manager" type="object" icon="terp-check"/>
-                    <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_user"/>
-                    <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                    <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_user"/>
+                    <button name="button_confirm" states="draft" string="Submited to Manager" type="object"/>
+                    <button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
+                    <button name="action_set_to_draft" states="done" string="Set to Draft" type="object"/>
+                    <button name="cancel" states="confirm" string="Refuse" type="workflow" groups="base.group_hr_user"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="new,confirm,done"/>
                     </div>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index a1adbd19f4a..a3a1f2937ec 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -184,9 +184,9 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="idea_open" string="Open" states="draft" icon="gtk-go-forward"/>
-                <button name="idea_close" string="Accept" states="open" icon="gtk-jump-to"/>
-                <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/>
+                <button name="idea_open" string="Open" states="draft"/>
+                <button name="idea_close" string="Accept" states="open"/>
+                <button name="idea_cancel" string="Refuse" states="open" />
                 <div class="oe_right">
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,close"/>
                 </div>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 8201d93da5a..adfccfc2041 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -25,8 +25,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" icon="gtk-ok" attrs="{'invisible':[('state','=','confirmed')]}"/>
-                    <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" icon="gtk-cancel"/>
+                    <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" attrs="{'invisible':[('state','=','confirmed')]}"/>
+                    <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed"/>
                     </div>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index b6146ebcd66..fbc36701cd0 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -17,10 +17,10 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
-                <button name="state_done_set" string="Done" states="running" icon="terp-dialog-close"/>
-                <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
-                <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
+                <button name="state_running_set" string="Run" states="draft"/>
+                <button name="state_done_set" string="Done" states="running"/>
+                <button name="state_draft_set" string="Set to Draft" states="done,cancelled"/>
+                <button name="state_cancel_set" string="Cancel" states="running"/>
                 <div class="oe_right">
                     <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,running,done"/>
                 </div>
@@ -141,10 +141,10 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
-                <button name="state_done_set" string="Close" states="running" icon="terp-dialog-close"/>
-                <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
-                <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
+                <button name="state_running_set" string="Run" states="draft"/>
+                <button name="state_done_set" string="Close" states="running"/>
+                <button name="state_draft_set" string="Set to Draft" states="done,cancelled"/>
+                <button name="state_cancel_set" string="Cancel" states="running"/>
                 <div class="oe_right">
                     <field name="state" readonly="1" nolabel="1" widget="statusbar" statusbar_visible="draft,running,done"/>
                 </div>
@@ -366,9 +366,9 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
-                <button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-undo"/>
-                <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="terp-gtk-stop"/>
+                <button string="Process" states="todo" name="process" type="object"/>
+                <button string="Reset" states="exception,cancelled" name="button_draft" type="object"/>
+                <button string="Cancel" states="todo,exception" name="button_cancel" type="object"/>
                 <div class="oe_right">
                     <field name="state" readonly="True" nolabel="1" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
                 </div>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 18915dac2e9..ebfd5b31bdd 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -633,13 +633,13 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
-                    <button name="button_produce" states="ready" string="Start Production" icon="terp-gtk-jump-to-ltr"/>
-                    <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
-                    <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
-                    <button name="button_recreate" states="picking_except" string="Recreate Picking" icon="terp-document-new"/>
-                    <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
-                    <button name="action_cancel" type="object" states="confirmed" string="Cancel" icon="gtk-stop"/>
+                    <button name="button_confirm" states="draft" string="Confirm Production"/>
+                    <button name="button_produce" states="ready" string="Start Production"/>
+                    <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" type="action"/>
+                    <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object"/>
+                    <button name="button_recreate" states="picking_except" string="Recreate Picking"/>
+                    <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel"/>
+                    <button name="action_cancel" type="object" states="confirmed" string="Cancel"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
                     </div>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index c206ee7f165..aedac905be5 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -73,12 +73,12 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>
-                <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
-                <button name="button_done" string="Finished" states="startworking" icon="terp-check"/>
-                <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause"/>
-                <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
-                <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
+                <button name="button_start_working" string="Start" states="draft"/>
+                <button name="button_resume" string="Resume" states="pause"/>
+                <button name="button_done" string="Finished" states="startworking"/>
+                <button name="button_pause" string="Pending" states="startworking"/>
+                <button name="button_draft" string="Set Draft" states="cancel"/>
+                <button name="button_cancel" string="Cancel" states="draft,startworking"/>
                 <div class="oe_right">
                      <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,startworking"/>
                 </div>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 01f9d3d84b6..c089b4d9fa2 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -29,17 +29,17 @@
         <field name="arch" type="xml">
             <form layout="manual">
                <div class="oe_form_topbar">
-                   <button name="repair_confirm" states="draft" string="Confirm Repair" icon="terp-camera_test"/>
-                   <button name="repair_ready" states="confirmed" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
-                   <button name="action_repair_start" states="ready" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
-                   <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                   <button name="action_repair_end" states="under_repair" string="End Repair" icon="terp-dialog-close"/>
-                   <button name="action_invoice_create" states="2binvoiced" string="Make Invoice" icon="terp-dolar"/>
-                   <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="terp-dolar"/>
-                   <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="terp-emblem-important"/>
-                   <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action" icon="gtk-stop"/>
-                   <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action" icon="gtk-stop"/>
-                   <button name="cancel" states="draft" string="Cancel Repair" icon="gtk-stop"/>
+                   <button name="repair_confirm" states="draft" string="Confirm Repair"/>
+                   <button name="repair_ready" states="confirmed" string="Start Repair"/>
+                   <button name="action_repair_start" states="ready" string="Start Repair"/>
+                   <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                   <button name="action_repair_end" states="under_repair" string="End Repair"/>
+                   <button name="action_invoice_create" states="2binvoiced" string="Make Invoice"/>
+                   <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
+                   <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
+                   <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action"/>
+                   <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action"/>
+                   <button name="cancel" states="draft" string="Cancel Repair"/>
                    <div class="oe_right">
                          <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed,ready" />
                    </div>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 5d81bbb708d..785c8d7d664 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -18,9 +18,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="%(action_pos_payment)d" string="Payment" icon="gtk-apply" type="action" states="draft"/>
-                    <button name="%(action_report_pos_receipt)d" string="Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
-                    <button name="refund" string="Return Products" type="object" icon="gtk-ok"
+                    <button name="%(action_pos_payment)d" string="Payment" type="action" states="draft"/>
+                    <button name="%(action_report_pos_receipt)d" string="Reprint" type="action" states="paid,done,invoiced"/>
+                    <button name="refund" string="Return Products" type="object"
                         attrs="{'invisible':[('state','=','draft')]}"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index f543235633b..141d1509944 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -48,10 +48,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                     <div class="oe_form_topbar">
-                        <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
-                        <button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
-                        <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
-                        <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
+                        <button name="button_confirm" states="draft" string="Confirm"/>
+                        <button name="button_check" states="confirmed" string="Run Procurement"/>
+                        <button name="button_restart" states="exception" string="Retry"/>
+                        <button name="button_cancel" states="draft,exception,waiting" string="Cancel"/>
                         <div class="oe_right">
                             <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed" />
                         </div>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index aee5982f49e..278bd50f45a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -20,13 +20,13 @@
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
-                    <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
-                    <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
-                    <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
-                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" icon="gtk-new" context="{'parent_id':parent_id}"/>
-                    <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
-                    <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
+                    <button name="set_done" string="Done" type="object" states="open,pending"/>
+                    <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close"/>
+                    <button name="set_pending" string="Pending" type="object" states="open"/>
+                    <button name="set_template" string="Set as Template" type="object" states="open"/>
+                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}"/>
+                    <button name="reset_project" string="Reset as Project" type="object" states="template"/>
+                    <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
                     </div>
@@ -321,13 +321,13 @@
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
                     <div class="oe_form_topbar">
-                        <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
-                        <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/>
-                        <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
-                        <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
-                        <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
-                        <button name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
-                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
+                        <button name="action_close" states="pending,open" string="Done" type="object"/>
+                        <button name="do_open" states="pending,draft" string="Start Task" type="object"/>
+                        <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" context="{'button_reactivate':True}" />
+                        <button name="do_pending" states="open" string="Pending" type="object"/>
+                        <button name="do_draft" states="open" string="Draft" type="object"/>
+                        <button name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action"/>
+                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object"/>
                         <div class="oe_right">
                             <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
                         </div>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index c4cb9cf73d4..cf8c4040613 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -52,12 +52,12 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                    <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
-                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                    <button name="case_open" string="Open" states="draft,pending" type="object"/>
+                    <button name="case_close" string="Done" states="open,draft,pending" type="object"/>
+                    <button name="case_pending" string="Pending" states="draft,open" type="object"/>
+                    <button name="case_reset" string="Reset to New" states="done,cancel" type="object"/>
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 9cbbfaf75f3..02412a20a1f 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -143,11 +143,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
-                    <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/>
-                    <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
-                    <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
-                    <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
+                    <button string="Start Phase" name="set_open" states="pending,draft"/>
+                    <button string="Done" name="set_done" states="pending,open"/>
+                    <button string="Pending" name="set_pending" states="open"/>
+                    <button string="Draft" name="set_draft" states="open"/>
+                    <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
                     </div>
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 419bdc2b0ad..11e9b057c06 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -28,10 +28,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_open" states="draft" string="Open" type="object" icon="gtk-yes" />
-                    <button name="action_done" states="open" string="Done" type="object" icon="gtk-jump-to" />
-                    <button name="action_draft" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
-                    <button name="action_cancel" states="draft,open" string="Cancel" type="object" icon="gtk-cancel" />
+                    <button name="action_open" states="draft" string="Open" type="object" />
+                    <button name="action_done" states="open" string="Done" type="object" />
+                    <button name="action_draft" states="done,cancel" string="Reset to Draft" type="object" />
+                    <button name="action_cancel" states="draft,open" string="Cancel" type="object" />
                     <div class="oe_right">
                        <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                     </div>
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 54d71533ef8..4b8defc9a2b 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -58,12 +58,12 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
-                    <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
-                    <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
-                    <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="gtk-execute"/>
-                    <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
-                    <button type="object" string="Cancel" name="button_cancel" states="draft,open,pending" icon="gtk-stop"/>
+                    <button type="object" string="Open" name="button_open" states="draft,pending"/>
+                    <button type="object" string="Close" name="button_close" states="open,pending"/>
+                    <button type="object" string="Pending" name="button_pending" states="open"/>
+                    <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending"/>
+                    <button type="object" string="Set to Draft" name="button_draft" states="cancel,done"/>
+                    <button type="object" string="Cancel" name="button_cancel" states="draft,open,pending"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                     </div>
@@ -239,12 +239,12 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
-                    <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
-                    <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
+                    <button type="object" string="Open" name="button_open" states="draft,pending"/>
+                    <button type="object" string="Close" name="button_close" states="open,pending"/>
+                    <button type="object" string="Pending" name="button_pending" states="open"/>
                     <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d"
-                                   string="Burndown Chart" type="action" icon="gtk-print"/>
-                    <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
+                                   string="Burndown Chart" type="action"/>
+                    <button type="object" string="Set to Draft" name="button_draft" states="cancel,done"/>
                     <div class="oe_right">
                         <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                     </div>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 9a024138beb..fe6c9b1d3f3 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -132,15 +132,15 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                    <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
-                    <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
-                    <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
-                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
-                    <button name="purchase_approve" states="confirmed" string="Approved" icon="gtk-go-forward"/>
-                    <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
-                    <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
-                    <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                    <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
+                    <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
+                    <button name="purchase_confirm" states="draft" string="Confirm Purchase"/>
+                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase"/>
+                    <button name="purchase_approve" states="confirmed" string="Approved"/>
+                    <button name="%(report_purchase_order)d" string="Print" states="approved" type="action"/>
+                    <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel" type="object"/>
+                    <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
                     </div>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index b7740c99202..d09564f221e 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -48,10 +48,10 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="tender_in_progress" states="draft" string="Start" type="object" icon="gtk-apply" />
-                <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
-                <button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
-                <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
+                <button name="tender_in_progress" states="draft" string="Start" type="object" />
+                <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" />
+                <button name="tender_done" states="in_progress" string="Done" type="object" />
+                <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" />
                 <div class="oe_right">
                     <field name="state" nolabel="1" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
                 </div>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 91b3abde65e..f19a6a58fec 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -96,20 +96,20 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
-                    <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
-                    <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
-                    <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
-                    <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
-                    <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
-                    <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
-                    <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
-                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                    <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
-                    <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
-                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/>
-                    <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
-                    <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
+                    <button name="order_confirm" states="draft" string="Confirm Order"/>
+                    <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object"/>
+                    <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
+                    <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
+                    <button name="ship_recreate" states="shipping_except" string="Recreate Packing"/>
+                    <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
+                    <button name="%(report_sale_order)d" string="Print Order" type="action" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
+                    <button name="ship_cancel" states="shipping_except" string="Cancel Order"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                    <button name="invoice_cancel" states="invoice_except" string="Cancel Order"/>
+                    <button name="%(report_sale_order)d" string="Print Quotation" type="action" states="draft"/>
+                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" states="draft,manual"/>
+                    <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object"/>
+                    <button name="cancel" states="draft" string="Cancel Order"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9365040aa0a..feff7d38e5d 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -110,10 +110,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
-                    <button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to"/>
-                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                    <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
+                    <button name="action_confirm" states="draft" string="Confirm Inventory" type="object"/>
+                    <button name="action_done" states="confirm" string="Validate Inventory" type="object"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                    <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object"/>
                     <div class="oe_right">
                          <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
@@ -710,14 +710,14 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="draft_force_assign" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-                    <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object" icon="gtk-media-play"/>
-                    <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/> -->
-                    <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                    <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
-                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl" />
-                    <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" icon="terp-gtk-go-back-rtl" />
-                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
+                    <button name="draft_force_assign" states="draft" string="Confirm" type="object"/>
+                    <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object"/>
+                    <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> -->
+                    <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                    <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object"/>
+                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" />
+                    <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" />
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>
@@ -930,12 +930,12 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='%(act_stock_return_picking)d']" position="replace">
-                        <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" icon="gtk-print" states="done"/>
-                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="terp-gtk-go-back-rtl" />
+                        <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" states="done"/>
+                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" />
                     </xpath>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='draft_validate']" position="replace">
-                        <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object" icon="gtk-media-play"/>
-                        <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
+                        <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object"/>
+                        <button name="action_assign" states="confirmed" string="Check Availability" type="object"/>
                     </xpath>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='action_process']" position="replace">
                         <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward"/>
@@ -1051,13 +1051,13 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='%(act_stock_return_picking)d']" position="replace">
-                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="terp-gtk-go-back-rtl" />
+                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" />
                     </xpath>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='draft_validate']" position="replace">
-                        <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object" icon="gtk-media-play"/>
+                        <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object"/>
                     </xpath>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='action_process']" position="replace">
-                        <button name="action_process" states="assigned" string="Receive" type="object" icon="gtk-go-forward"/>
+                        <button name="action_process" states="assigned" string="Receive" type="object"/>
                     </xpath>
                     <xpath expr="/form/sheet/group/group/field[@name='partner_id']" position="replace">
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
@@ -1199,10 +1199,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
-                    <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
-                    <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                    <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
+                    <button name="action_confirm" states="draft" string="Process Later" type="object"/>
+                    <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object"/>
+                    <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
+                    <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                     </div>
@@ -1388,10 +1388,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
-                    <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                    <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" icon="gtk-go-forward"/>
-                    <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
+                    <button name="action_confirm" states="draft" string="Process Later" type="object"/>
+                    <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
+                    <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned"/>
+                    <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                     </div>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 969537a0005..e3e65d9fa0d 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -14,8 +14,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_open" string="Open" icon="gtk-ok" states="draft" type="object"/>
-                    <button name="button_close" string="Close" icon="gtk-stop" states="open" type="object"/>
+                    <button name="button_open" string="Open" states="draft" type="object"/>
+                    <button name="button_close" string="Close" states="open" type="object"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                     </div>
@@ -87,7 +87,7 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_validate" icon="gtk-apply" string="Approve" states="draft" type="object" />
+                    <button name="action_validate" string="Approve" states="draft" type="object" />
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1"/>
                     </div>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index f3bca1e6f0a..abc06c829bd 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -15,9 +15,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="set_process" states="draft" string="Process" type="object" icon="gtk-go-forward"/>
-                    <button name="set_done" states="running" string="Stop" type="object" icon="gtk-stop"/>
-                    <button name="set_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
+                    <button name="set_process" states="draft" string="Process" type="object"/>
+                    <button name="set_done" states="running" string="Stop" type="object"/>
+                    <button name="set_draft" states="done" string="Set to Draft" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,running"/>
                     </div>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 63d2fe6c8c0..644f5c76a2a 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -20,9 +20,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="survey_open" string="Open" states="cancel,close" type="object" icon="gtk-go-forward"/>
-                    <button name="survey_close" string="Close" states="open" type="object" icon="gtk-close"/>
-                    <button name="survey_cancel" string="Cancel" states="open" type="object" icon="gtk-cancel"/>
+                    <button name="survey_open" string="Open" states="cancel,close" type="object"/>
+                    <button name="survey_close" string="Close" states="open" type="object"/>
+                    <button name="survey_cancel" string="Cancel" states="open" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,close"/>
                     </div>
@@ -1061,10 +1061,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
-                    <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" icon="gtk-new"/>
-                    <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
-                    <button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object" icon="gtk-cancel"/>
+                    <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object"/>
+                    <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object"/>
+                    <button name="survey_req_done" string="Done" states="waiting_answer" type="object"/>
+                    <button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,waiting_answer"/>
                     </div>