diff options
| author | Jigar Amin - OpenERP <jam@tinyerp.com> | 2012-06-14 17:08:19 +0530 |
|---|---|---|
| committer | Jigar Amin - OpenERP <jam@tinyerp.com> | 2012-06-14 17:08:19 +0530 |
| commit | ccf3cf72bdae25d1f83d64988011a07ca4cbbc3f (patch) | |
| tree | 8a297ec0cc78b5d5e946535f9ca79d39d1f09dfd | |
| parent | 6049ec4e3d2e6c9fd887b39e7d84c4c0ff6ed737 (diff) | |
| parent | 415e7edb6ad5be7d6848bc3164e3ee20b920ab03 (diff) | |
[MERGE] lp:~openerp-dev/openobject-addons/trunk-red-button-stock-tpa
bzr revid: jam@tinyerp.com-20120614113819-gr3wa9sk25tzlzoi
| -rw-r--r-- | addons/procurement/procurement_view.xml | 6 | ||||
| -rw-r--r-- | addons/stock/stock_view.xml | 48 |
2 files changed, 27 insertions, 27 deletions
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index d94ac882cda..6ea883929a1 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -48,9 +48,9 @@ <field name="arch" type="xml"> <form string="Procurement" version="7.0"> <header> - <button name="button_confirm" states="draft" string="Confirm"/> - <button name="button_check" states="confirmed" string="Run Procurement"/> - <button name="button_restart" states="exception" string="Retry"/> + <button name="button_confirm" states="draft" string="Confirm" class="oe_form_button_active_flow"/> + <button name="button_check" states="confirmed" string="Run Procurement" class="oe_form_button_active_flow"/> + <button name="button_restart" states="exception" string="Retry" class="oe_form_button_active_flow"/> <button name="button_cancel" states="draft,exception,waiting" string="Cancel"/> <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" /> </header> diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 0154af26d95..889a19a0e3b 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -112,10 +112,10 @@ <field name="arch" type="xml"> <form string="Physical Inventory" version="7.0"> <header> - <button name="action_confirm" states="draft" string="Confirm Inventory" type="object"/> - <button name="action_done" states="confirm" string="Validate Inventory" type="object"/> - <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/> - <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object"/> + <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" class="oe_form_button_active_flow"/> + <button name="action_done" states="confirm" string="Validate Inventory" type="object" class="oe_form_button_active_flow"/> + <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" class="oe_form_button_return_flow"/> + <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object" class="oe_form_button_return_flow"/> <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/> </header> <sheet> @@ -712,13 +712,13 @@ <field name="arch" type="xml"> <form string="Internal Picking List" version="7.0"> <header> - <button name="draft_force_assign" states="draft" string="Confirm" type="object"/> - <button name="draft_validate" states="draft" string="Confirm & Transfer" type="object"/> + <button name="draft_force_assign" states="draft" string="Confirm" type="object" class="oe_form_button_active_flow"/> + <button name="draft_validate" states="draft" string="Confirm & Transfer" type="object" class="oe_form_button_active_flow"/> <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> --> - <button name="force_assign" states="confirmed" string="Force Availability" type="object"/> - <button name="action_process" states="assigned" string="Confirm & Transfer" groups="stock.group_stock_user" type="object"/> - <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','<>','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" /> - <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" /> + <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_form_button_active_flow"/> + <button name="action_process" states="assigned" string="Confirm & Transfer" groups="stock.group_stock_user" type="object" class="oe_form_button_active_flow"/> + <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','<>','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" class="oe_form_button_active_flow"/> + <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" class="oe_form_button_return_flow"/> <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/> <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/> </header> @@ -948,15 +948,15 @@ <field name="arch" type="xml"> <data> <xpath expr="/form/header/button[@name='%(act_stock_return_picking)d']" position="replace"> - <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" states="done"/> - <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" /> + <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" states="done" class="oe_form_button_active_flow"/> + <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" class="oe_form_button_return_flow"/> </xpath> <xpath expr="/form/header/button[@name='draft_validate']" position="replace"> - <button name="draft_validate" states="draft" string="Confirm & Deliver" type="object"/> - <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> + <button name="draft_validate" states="draft" string="Confirm & Deliver" type="object" class="oe_form_button_active_flow"/> + <button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_form_button_active_flow"/> </xpath> <xpath expr="/form/header/button[@name='action_process']" position="replace"> - <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward"/> + <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/> </xpath> <xpath expr="/form/header/field[@name='state']" position="replace"> <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/> @@ -1068,13 +1068,13 @@ <field name="arch" type="xml"> <data> <xpath expr="//button[@name='%(act_stock_return_picking)d']" position="replace"> - <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" /> + <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" class="oe_form_button_return_flow"/> </xpath> <xpath expr="//button[@name='draft_validate']" position="replace"> - <button name="draft_validate" states="draft" string="Confirm & Receive" type="object"/> + <button name="draft_validate" states="draft" string="Confirm & Receive" type="object" class="oe_form_button_active_flow"/> </xpath> <xpath expr="//button[@name='action_process']" position="replace"> - <button name="action_process" states="assigned" string="Receive" type="object"/> + <button name="action_process" states="assigned" string="Receive" type="object" class="oe_form_button_active_flow"/> </xpath> <xpath expr="//field[@name='partner_id']" position="replace"> <field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4" string="Supplier"/> @@ -1207,9 +1207,9 @@ <field name="arch" type="xml"> <form string="Stock Moves" version="7.0"> <header> - <button name="action_confirm" states="draft" string="Process Later" type="object"/> - <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object"/> - <button name="force_assign" states="confirmed" string="Set Available" type="object"/> + <button name="action_confirm" states="draft" string="Process Later" type="object" class="oe_form_button_active_flow"/> + <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" class="oe_form_button_active_flow"/> + <button name="force_assign" states="confirmed" string="Set Available" type="object" class="oe_form_button_active_flow"/> <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/> <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/> </header> @@ -1392,9 +1392,9 @@ <field name="arch" type="xml"> <form string="Receive Products" version="7.0"> <header> - <button name="action_confirm" states="draft" string="Process Later" type="object"/> - <button name="force_assign" states="confirmed" string="Set Available" type="object"/> - <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned"/> + <button name="action_confirm" states="draft" string="Process Later" type="object" class="oe_form_button_active_flow"/> + <button name="force_assign" states="confirmed" string="Set Available" type="object" class="oe_form_button_active_flow"/> + <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" class="oe_form_button_active_flow"/> <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/> <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/> </header> |
