Randhir Mayatra (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-red-button-addcancelbutton-rma
into lp:~openerp-dev/openobject-addons/trunk-red-button.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-red-button-addcancelbutton-rma/+merge/112538
hello,
add cancel buttons in some files and remove extra "or" from the files
Thank you....
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-red-button-addcancelbutton-rma/+merge/112538
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-red-button.
=== modified file 'hr_attendance/wizard/hr_attendance_sign_in_out_view.xml'
--- hr_attendance/wizard/hr_attendance_sign_in_out_view.xml 2012-06-27 12:30:17 +0000
+++ hr_attendance/wizard/hr_attendance_sign_in_out_view.xml 2012-06-28 10:54:24 +0000
@@ -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" />
=== modified file 'hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml'
--- hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml 2012-06-27 12:30:17 +0000
+++ hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml 2012-06-28 10:54:24 +0000
@@ -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" />
=== modified file 'product/wizard/product_price_view.xml'
--- product/wizard/product_price_view.xml 2012-06-27 14:19:17 +0000
+++ product/wizard/product_price_view.xml 2012-06-28 10:54:24 +0000
@@ -36,4 +36,4 @@
view_mode="form" target="new" view_type="form" />
</data>
-</openerp>
+</openerp<name />
=== modified file 'sale/wizard/sale_make_invoice_advance.xml'
--- sale/wizard/sale_make_invoice_advance.xml 2012-06-27 13:45:30 +0000
+++ sale/wizard/sale_make_invoice_advance.xml 2012-06-28 10:54:24 +0000
@@ -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">
=== modified file 'stock/wizard/stock_move_view.xml'
--- stock/wizard/stock_move_view.xml 2012-06-27 13:36:35 +0000
+++ stock/wizard/stock_move_view.xml 2012-06-28 10:54:24 +0000
@@ -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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
