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

bzr revid: jam@tinyerp.com-20120628110033-occ44wpudc237apx
This commit is contained in:
Jigar Amin - OpenERP
2012-06-28 16:30:33 +05:30
4 changed files with 3 additions and 5 deletions
@@ -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" />
@@ -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" />
@@ -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">
+3 -1
View File
@@ -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>