ajay javiya (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-wiz-remove-btn-mrp-aja into
lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-wiz-remove-btn-mrp-aja/+merge/110753
Hello
Remove cancel button on wizard from mrp and add a css class color on button.
Thank You
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-wiz-remove-btn-mrp-aja/+merge/110753
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn.
=== modified file 'mrp/res_config_view.xml'
--- mrp/res_config_view.xml 2012-06-11 09:07:01 +0000
+++ mrp/res_config_view.xml 2012-06-18 09:12:04 +0000
@@ -8,8 +8,8 @@
<field name="arch" type="xml">
<form string="Configure Manufacturing" version="7.0">
<header>
- <button string="Apply" type="object" name="execute"/>
- <button string="Cancel" special="cancel"/>
+ <button string="Apply" type="object" name="execute" class=
+"oe_form_button_active_flow"/>
</header>
<sheet layout="auto">
<group col="4" string="Manufacturing Order">
=== modified file 'mrp/wizard/change_production_qty_view.xml'
--- mrp/wizard/change_production_qty_view.xml 2012-06-09 15:08:55 +0000
+++ mrp/wizard/change_production_qty_view.xml 2012-06-18 09:12:04 +0000
@@ -9,18 +9,16 @@
<field name="model">change.production.qty</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Change Product Qty">
- <separator string="Change Quantity" colspan="4"/>
- <newline/>
- <field name="product_qty"/>
- <newline/>
- <separator colspan="4"/>
- <group col="2" colspan="4">
- <button icon='gtk-stop' special="cancel"
- string="Cancel" />
+ <form string="Change Product Qty" version="7.0">
+ <header>
<button name="change_prod_qty" string="Approve"
- colspan="1" type="object" icon="gtk-ok" />
- </group>
+ colspan="1" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+ </header>
+ <sheet layout="auto">
+ <separator string="Change Quantity" colspan="4"/>
+ <newline/>
+ <field name="product_qty"/>
+ </sheet>
</form>
</field>
</record>
=== modified file 'mrp/wizard/mrp_price_view.xml'
--- mrp/wizard/mrp_price_view.xml 2012-06-09 15:08:55 +0000
+++ mrp/wizard/mrp_price_view.xml 2012-06-18 09:12:04 +0000
@@ -9,17 +9,15 @@
<field name="model">mrp.product_price</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Product Cost Structure">
- <separator colspan="4" string="Print Cost Structure of Product." />
- <field name="number"/>
- <newline/>
- <separator string="" colspan="4"/>
- <group col="2" colspan="4">
- <button icon='gtk-stop' special="cancel"
- string="Cancel" />
- <button name="print_report" string="Print"
- colspan="1" type="object" icon="gtk-print" />
- </group>
+ <form string="Product Cost Structure" version="7.0">
+ <header>
+ <button name="print_report" string="Print"
+ colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow" />
+ </header>
+ <sheet layout="auto">
+ <separator colspan="4" string="Print Cost Structure of Product." />
+ <field name="number"/>
+ </sheet>
</form>
</field>
</record>
=== modified file 'mrp/wizard/mrp_product_produce_view.xml'
--- mrp/wizard/mrp_product_produce_view.xml 2012-06-09 15:08:55 +0000
+++ mrp/wizard/mrp_product_produce_view.xml 2012-06-18 09:12:04 +0000
@@ -10,19 +10,16 @@
<field name="model">mrp.product.produce</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Produce">
- <separator string="Produce" colspan="4"/>
- <field name="mode" colspan="4"/>
- <field name="product_qty" colspan="2"/>
- <newline/>
- <separator string="" colspan="4" />
- <label string="" colspan="2" />
- <group col="2" colspan="1">
- <button icon='gtk-stop' special="cancel"
- string="Cancel" />
+ <form string="Produce" version="7.0">
+ <header>
<button name="do_produce" string="Confirm"
- colspan="1" type="object" icon="gtk-ok" />
- </group>
+ colspan="1" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+ </header>
+ <sheet layout="auto">
+ <separator string="Produce" colspan="4"/>
+ <field name="mode" colspan="4"/>
+ <field name="product_qty" colspan="2"/>
+ </sheet>
</form>
</field>
</record>
=== modified file 'mrp/wizard/mrp_workcenter_load_view.xml'
--- mrp/wizard/mrp_workcenter_load_view.xml 2012-06-09 15:08:55 +0000
+++ mrp/wizard/mrp_workcenter_load_view.xml 2012-06-18 09:12:04 +0000
@@ -9,17 +9,16 @@
<field name="model">mrp.workcenter.load</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Select time unit">
- <field name="time_unit"/>
- <newline/>
- <field name="measure_unit"/>
- <newline/>
- <group col="2" colspan="4">
- <button icon='gtk-stop' special="cancel"
- string="Cancel" />
+ <form string="Select time unit" version="7.0">
+ <header>
<button name="print_report" string="Print"
- colspan="1" type="object" icon="gtk-print" />
- </group>
+ colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+ </header>
+ <sheet layout="auto">
+ <field name="time_unit"/>
+ <newline/>
+ <field name="measure_unit"/>
+ </sheet>
</form>
</field>
</record>
=== modified file 'mrp_repair/wizard/cancel_repair.py'
--- mrp_repair/wizard/cancel_repair.py 2011-01-14 00:11:01 +0000
+++ mrp_repair/wizard/cancel_repair.py 2012-06-18 09:12:04 +0000
@@ -70,11 +70,11 @@
repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id, context=context)
if not repair_order.invoiced:
res['arch'] = """ <form string="Cancel Repair" colspan="4">
+ <header>
+ <button name="cancel_repair" string="_Yes" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+ </header>
<group col="2" colspan="2">
<label string="Do you want to continue?" colspan="4"/>
- <separator colspan="4"/>
- <button icon="gtk-stop" special="cancel" string="_No" readonly="0"/>
- <button name="cancel_repair" string="_Yes" type="object" icon="gtk-ok"/>
</group>
</form>
"""
=== modified file 'mrp_repair/wizard/mrp_repair_cancel_view.xml'
--- mrp_repair/wizard/mrp_repair_cancel_view.xml 2012-06-09 22:28:49 +0000
+++ mrp_repair/wizard/mrp_repair_cancel_view.xml 2012-06-18 09:12:04 +0000
@@ -11,8 +11,7 @@
<field name="arch" type="xml">
<form string="Cancel Repair Order" version="7.0">
<header>
- <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok" />
- <button icon="gtk-stop" special="cancel" string="No" />
+ <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok" class="oe_form_button_active_flow" />
</header>
<label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/>
</form>
=== modified file 'mrp_repair/wizard/mrp_repair_make_invoice_view.xml'
--- mrp_repair/wizard/mrp_repair_make_invoice_view.xml 2012-06-09 22:28:49 +0000
+++ mrp_repair/wizard/mrp_repair_make_invoice_view.xml 2012-06-18 09:12:04 +0000
@@ -11,8 +11,8 @@
<field name="arch" type="xml">
<form string="Create invoices" version="7.0">
<header>
- <button icon="gtk-stop" special="cancel" string="Cancel" />
- <button name="make_invoices" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl" />
+ <button name="make_invoices" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl" class=
+"oe_form_button_active_flow"/>
</header>
<group string="Do you really want to create the invoice(s)?">
<field name="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
