[MERGE] lp:~openerp-dev/openobject-addons/trunk-red-button-project-tch

bzr revid: jam@tinyerp.com-20120614103129-2dh5k9v4bc5csgmt

diff --cc addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 44c97c1,d9fb034..debb84e
--- 1/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
--- 2/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@@ -25,10 -25,8 +25,9 @@@
                  <xpath expr="/form/sheet" position='before'>
                      <header>
                          <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_active_flow"/>
-                         <button name="set_close" string="Close" type="object" states="open" class="oe_form_button_active_flow"/>
-                         <button name="set_close" string="Close" type="object" states="pending" class="oe_form_button_return_flow"/>
+                         <button name="set_close" string="Close" type="object" states="open,pending" class="oe_form_button_active_flow"/>
 -                        <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" class="oe_form_button_return_flow"/>
 +                        <button name="set_open" string="Re-open project" type="object" states="pending,close" class="oe_form_button_return_flow"/>
 +                        <button name="set_open" string="Re-open project" type="object" states="cancelled,draft"/>
                          <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                          <field name="state" readonly="1" widget="statusbar"
                              statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>

diff --cc addons/project_issue/project_issue_view.xml
index b7089ca,4ec93e1..121433e
--- 1/addons/project_issue/project_issue_view.xml
--- 2/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@@ -55,15 -55,15 +55,15 @@@
                  <form version="7.0">
                  <header>
                      <button name="case_open" string="Open" type="object"
-                             states="draft,pending"/>
+                             states="draft,pending" class="oe_form_button_active_flow"/>
                      <button name="case_close" string="Done" type="object"
-                             states="draft,open,pending"/>
+                             states="draft,open,pending" class="oe_form_button_active_flow"/>
                      <button name="case_pending" string="Pending" type="object"
--                            states="draft,open"/>
++                            states="draft,open" class="oe_form_button_return_flow"/>
                      <button name="case_escalate" string="Escalate" type="object"
-                             states="draft,open,pending"/>
+                             states="draft,open,pending" class="oe_form_button_return_flow"/>
                      <button name="case_reset" string="Reset to New" type="object"
-                             states="cancelled,done"/>
+                             states="cancelled,done" class="oe_form_button_return_flow"/>
                      <button name="stage_previous" string="Previous Stage" type="object"
                              states="open,pending" icon="gtk-go-back"
                              attrs="{'invisible': [('stage_id','=', False)]}"/>