From 2c71b755dd2c32af026fdf0622c725afd89dd525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 8 Jun 2012 11:05:40 +0200
Subject: [PATCH 1/2] [FIX] crm_lead: fixed header that has been reverted in
 previous merge (be carefull when merging your branches please); re-added an
 invisible type field, because it is used indirectly by the statusbar widget
 that build a domain, based on the stage_id field, to fetch stages to display
 on top-right.

bzr revid: tde@openerp.com-20120608090540-y8h2gspid9t5xr3j
---
 addons/crm/crm_lead_view.xml | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 4536e31621c..8d8ffcead2b 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -372,14 +372,22 @@
         <field name="arch" type="xml">
             <form string="Opportunities" validate="0">
                 <header>
-                    <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" />
-                    <button name="case_open" string="Open" states="draft,pending" type="object" />
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" />
-                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" />
-                    <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" />
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
-                    <button name="case_cancel" string="Cancel" states="draft" type="object" />
-                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    <button name="case_open" string="Open" type="object"
+                            states="draft"/>
+                    <button name="case_mark_won" string="Mark Won" type="object"
+                            states="draft,open"/>
+                    <button name="case_mark_lost" string="Mark Lost" type="object"
+                            states="draft,open"/>
+                    <button name="case_reset" string="Reset to Draft" type="object"
+                            states="cancel"/>
+                    <button name="case_escalate" string="Escalate" type="object"
+                            states="open"/>
+                    <button name="stage_previous" string="Previous" type="object"
+                            states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
+                    <button name="stage_next" string="Next" type="object"  
+                            states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
+                    <field name="stage_id" nolabel="1" widget="statusbar"
+                            on_change="onchange_stage_id(stage_id)"/>
                 </header>
                 <sheet>
                     <div class="oe_right oe_form_button_box">
@@ -480,6 +488,8 @@
                                 <field name="day_open" groups="base.group_no_one"/>
                                 <field name="day_close" groups="base.group_no_one"/>
                                 <field name="referred"/>
+                                <field name="state" groups="base.group_no_one"/>
+                                <field name="type" invisible="1"/>
                             </group>
                             <group string="References">
                                 <field name="ref"/>

From 753fd3a41496c6e879516a44cdb5491dbd17cbd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 8 Jun 2012 11:09:12 +0200
Subject: [PATCH 2/2] [IMP] crm_lead_view: rearranged buttons order.

bzr revid: tde@openerp.com-20120608090912-bpav3e3xv8tg30z8
---
 addons/crm/crm_lead_view.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 8d8ffcead2b..c60a30d6d69 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -372,16 +372,18 @@
         <field name="arch" type="xml">
             <form string="Opportunities" validate="0">
                 <header>
-                    <button name="case_open" string="Open" type="object"
-                            states="draft"/>
                     <button name="case_mark_won" string="Mark Won" type="object"
-                            states="draft,open"/>
+                            states="draft,open,pending"/>
+                    <button name="case_open" string="Open" type="object"
+                            states="draft,pending"/>
+                    <button name="case_escalate" string="Escalate" type="object"
+                            states="open"/>
                     <button name="case_mark_lost" string="Mark Lost" type="object"
                             states="draft,open"/>
                     <button name="case_reset" string="Reset to Draft" type="object"
-                            states="cancel"/>
-                    <button name="case_escalate" string="Escalate" type="object"
-                            states="open"/>
+                            states="done,cancel"/>
+                    <button name="case_cancel" string="Cancel" type="object"
+                            states="draft"/>
                     <button name="stage_previous" string="Previous" type="object"
                             states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
                     <button name="stage_next" string="Next" type="object"