From c8bbcfdc57813e43230ff6ea513bd8e3926284ea Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 11 Oct 2010 18:55:25 +0530
Subject: [PATCH] [MOD/IMP] Account_* : Cancel Button Set on left side

bzr revid: dbr@tinyerp.com-20101011132525-hc2nmdmjaz6p7mju
---
 addons/account/account_invoice_view.xml              |  2 +-
 addons/account/account_view.xml                      | 10 +++++-----
 addons/account/wizard/account_invoice_state_view.xml |  2 +-
 addons/account_budget/account_budget_view.xml        |  2 +-
 addons/base_calendar/base_calendar_view.xml          | 12 ++++++------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index e72bd584f9d..0825aad8831 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -209,8 +209,8 @@
                                 <field name="state"/>
                                 <field name="residual"/>
                                 <group col="6" colspan="4">
-                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+                                    <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' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 36ee5255523..f2beba72a12 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -471,8 +471,8 @@
                     <field name="balance_end_real"/>
                     <field name="balance_end" invisible="1"/>
                     <field name="state"/>
-                    <button type="object" string="Confirm" name="button_confirm_bank" states="draft" icon="terp-camera_test"/>
                     <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
+                    <button type="object" string="Confirm" name="button_confirm_bank" states="draft" icon="terp-camera_test"/>
                 </tree>
             </field>
         </record>
@@ -553,9 +553,9 @@
                     <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"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -585,9 +585,9 @@
                     <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"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -1470,9 +1470,9 @@
                     <group col="7" 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" icon="terp-stock_format-scientific"/>
                         <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -2455,9 +2455,9 @@
                     <field name="balance_end_real"/>
                     <field name="balance_end"/>
                     <field name="state"/>
+                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
                     <button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
                     <button type="object" string="Confirm" name="button_confirm_bank" states="open" icon="terp-gtk-go-back-rtl"/>
-                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 6f6dca22e46..8e9c04b788d 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -33,8 +33,8 @@
             <form string="Cancel Selected Invoices">
                 <separator string="Cancel Selected Invoices" colspan="4"/>
                     <group colspan="4" col="6">
-                        <button icon="terp-dialog-close" special="cancel" string="Close"/>
                         <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
+                        <button icon="terp-dialog-close" special="cancel" string="Close"/>
                    </group>
             </form>
             </field>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index d6c4b82e960..a1aeb93252c 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -147,10 +147,10 @@
                             </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 string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
                                 <button name="draft" states="cancel" string="Reset to Draft" type="workflow" icon="terp-stock_effects-object-colorize"/>
                             </group>
 
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index ba91c4b75dd..bc581955571 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -313,6 +313,11 @@
                         <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"
@@ -323,11 +328,6 @@
                                    states="tentative,cancelled"
                                    type="object"
                                    icon="gtk-apply" />
-                               <button name="do_cancel"
-                                   string="Cancel"
-                                   states="tentative,confirmed"
-                                   type="object"
-                                   icon="gtk-cancel" />
                            </group>
                         </page>
                         <page string="Invitation Detail">
@@ -475,7 +475,7 @@
                             <separator orientation="vertical" />
                             <filter string="Date" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'date'}" />
-                            
+
                         </group>
                 </search>
             </field>