[MERGE] lp:~openerp-dev/openobject-addons/trunk-red-button-purchase-tpa

bzr revid: jam@tinyerp.com-20120613104253-heensgzj37swt3vk

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 414d927..d2c8ff8 100644 (file)
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -130,7 +130,7 @@
                 <header>
                     <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_form_button_active_flow"/>
                     <button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}"/>
-                    <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object"/>
+                    <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object" class="oe_form_button_active_flow"/>
                     <button name="action_cancel" states="except_picking,except_invoice,wait" string="Cancel" type="object" />
                     <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
                     <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
@@ -138,7 +138,7 @@
                     <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_form_button_active_flow"/>
                     <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_form_button_active_flow"/>
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_form_button_active_flow"/>
-                    <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object"/>
+                    <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
                     <button name="purchase_cancel" states="draft,confirmed,wait_auth,sent" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
                 </header>

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index c4bf93f..c0a36c5 100644 (file)
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -35,7 +35,7 @@
             <form string="Purchase Requisition" version="7.0">
             <header>
                 <button name="tender_in_progress" states="draft" string="Start" type="object" class="oe_form_button_active_flow"/>
-                <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" />
+                <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" class="oe_form_button_return_flow"/>
                 <button name="tender_done" states="in_progress" string="Done" type="object" class="oe_form_button_active_flow"/>
                 <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" />
                 <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>