[MERGE] lp:~openerp-commiter/openobject-addons/trunk-red-button-addcancelbutton-rma

bzr revid: jam@tinyerp.com-20120627142931-vfas27ijl6tn4jmd

diff --cc addons/point_of_sale/wizard/pos_close_statement.xml
index b7c6d10,2bdb633..eba2fe0
--- 1/addons/point_of_sale/wizard/pos_close_statement.xml
--- 2/addons/point_of_sale/wizard/pos_close_statement.xml
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@@ -11,9 -11,12 +11,11 @@@
                  <form string="Close Cash Registers" version="7.0">
                      <header>
                          <button name="close_statement" string="Yes"
-                              type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
-                         <button icon='gtk-stop' type="object" name="cancel_wizard"
+                              type="object" class="oe_highlight_on_dirty"  />
 -                        or
+                         <button type="object" name="cancel_wizard"
                              string="No" invisible="not context.get('cancel_action')" class="oe_highlight_on_dirty"  />
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel" />    
                      </header>
                      <separator string="Do you want to close your cash registers?"/>
                      <label string="OpenERP will close all cash registers he can close automatically without validation. He will also open all cash registers for which you have to control the ending balance before closing manually."/>