[IMP] merge with lp:~openerp-dev/openobject-addons/trunk-red-button

bzr revid: tpa@tinyerp.com-20120613120352-lxaxx96620egyrpx

3 files changed, 18 insertions, 18 deletions

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 01b41833a65..f567860781f 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -54,9 +54,9 @@
             <field name="arch" type="xml">
             <form string="Events" version="7.0">
                 <header>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object"/>
-                    <button string="Event Ended" name="button_done" states="confirm" type="object"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_form_button_active_flow"/>
+                    <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_form_button_active_flow"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" class="oe_form_button_return_flow"/>
                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                 </header>
@@ -355,9 +355,9 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="registration_open" string="Confirm" states="draft" type="object"/>
-                    <button name="button_reg_close" string="Attended" states="open" type="object"/>
-                    <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object"/>
+                    <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_form_button_active_flow"/>
+                    <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_form_button_active_flow"/>
+                    <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" class="oe_form_button_return_flow"/>
                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
                     <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index fffcbc7101b..d2c8ff82b9f 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -128,17 +128,17 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order" version="7.0">
                 <header>
-                    <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_form_button_hi"/>
+                    <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"/>
-                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" class="oe_form_button_hi"/>
-                    <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_form_button_hi"/>
-                    <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}"/>
-                    <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}"/>
-                    <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object"/>
+                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" class="oe_form_button_active_flow"/>
+                    <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" 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>
@@ -397,7 +397,7 @@
                 <form string="Purchase Order Line" version="7.0">
                     <label for="order_id" class="oe_form_readonly_hidden"/>
                     <h1>
-                        <field name="order_id" class="oe_form_inline"/>, 
+                        <field name="order_id" class="oe_form_inline"/>,
                         <field name="date_order" class="oe_form_inline"/>
                     </h1>
                     <label for="partner_id" class="oe_form_readonly_hidden"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index dc13be5b1ec..c0a36c59a61 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -34,16 +34,16 @@
         <field name="arch" type="xml">
             <form string="Purchase Requisition" version="7.0">
             <header>
-                <button name="tender_in_progress" states="draft" string="Start" type="object" />
-                <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" />
-                <button name="tender_done" states="in_progress" string="Done" type="object" />
+                <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" 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"}'/>
             </header>
             <sheet>
                 <label for="name" class="oe_form_readonly_hidden"/>
                 <h1>
-                    <field name="name" class="oe_form_inline"/>, 
+                    <field name="name" class="oe_form_inline"/>,
                     <field name="origin" class="oe_form_inline"/>
                 </h1>
                 <group>