From 932d5c8f5ac40e17be9d70edfcb12b8d7b3a0d85 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Thu, 28 Jun 2012 16:18:32 +0530
Subject: [PATCH] [USA] add cancel button

bzr revid: rma@tinyerp.com-20120628104832-g38nlyv3yhrr8hhz
---
 .../hr_attendance/wizard/hr_attendance_sign_in_out_view.xml   | 1 -
 addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml  | 1 -
 addons/product/wizard/product_price_view.xml                  | 2 +-
 addons/sale/wizard/sale_make_invoice_advance.xml              | 2 --
 addons/stock/wizard/stock_move_view.xml                       | 4 +++-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index 1a2913fbb60..466188fc1f6 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -9,7 +9,6 @@
                 <form string="Sign in / Sign out" version="7.0">
                     <header>
                         <button string="Sign in" name="si_check" type="object" class="oe_highlight_on_dirty"/>
-                        or
                         <button string="Sign out" name="so_check" type="object" class="oe_highlight_on_dirty"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index 2c2ca55cc86..33c772daee7 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -62,7 +62,6 @@
                 <form string="Sign In/Out by Project" version="7.0">
                     <header>
                         <button string="Change Work" name="sign_out_result" type="object" class="oe_highlight_on_dirty"/>
-                        or
                         <button string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight_on_dirty"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index dded6dbfb94..37237383b86 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -36,4 +36,4 @@
             view_mode="form" target="new" view_type="form" />
 
 </data>
-</openerp>
+</openerp<name />
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 7918c1d1b28..981c100822b 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -9,10 +9,8 @@
                 <form string="Advance Invoice" version="7.0">
                     <header>
                         <button name="create_invoices" string="Create Invoice" type="object" context="{'open_invoices': False}" class="oe_highlight_on_dirty"  />
-                        or
                         <button name="create_invoices" string="Create and view Invoice" type="object" context="{'open_invoices': True}" class="oe_highlight_on_dirty"  />
                         or
-                        or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4">
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index c58efea403b..11c0cab4b13 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -46,7 +46,9 @@
             <field name="arch" type="xml">
                 <form string="Scrap Move" version="7.0">
                     <header>
-                        <button name="move_scrap" string="Ok" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="move_scrap" string="Ok" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <separator string="Scrap Products"/>
                     <group>