[IMP] crm_lead_view: re-idented code, deleted stage_next/previous buttons, re-added...

bzr revid: tde@openerp.com-20120524080944-zrei5rcsc6tln7mq

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index b130b5f..86cd5cd 100644 (file)
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -2,6 +2,10 @@
 <openerp>
     <data>
 
+        <!--
+            CRM CASE STAGE
+            -->
+
         <!-- Stage Search view -->
         <record id="crm_lead_stage_search" model="ir.ui.view">
             <field name="name">Stage - Search</field>
@@ -14,7 +18,7 @@
             </field>
         </record>
 
-        <!--Lead Stage Form view -->
+        <!-- Stage Form view -->
         <record id="crm_lead_stage_act" model="ir.actions.act_window">
             <field name="name">Stages</field>
             <field name="res_model">crm.case.stage</field>
@@ -25,9 +29,11 @@
 
         <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" name="Stages" sequence="0" parent="base.menu_crm_config_lead" />
 
+        <!--
+            LEADS/OPPORTUNITIES CATEGORIES
+            -->
 
-        <!-- Lead/Opportunity Categories Action -->
-
+        <!-- Categories Form View -->
         <record id="crm_lead_categ_action" model="ir.actions.act_window">
             <field name="name">Categories</field>
             <field name="res_model">crm.case.categ</field>
@@ -42,6 +48,9 @@
             id="menu_crm_lead_categ" name="Categories"
             parent="base.menu_crm_config_lead" sequence="1" groups="base.group_no_one"/>
 
+        <!--
+            LEADS
+            -->
 
         <!-- CRM Lead Form View  -->
         <record model="ir.ui.view" id="crm_case_form_view_leads">
@@ -55,6 +64,10 @@
                             string="Convert to Opportunity" help="Convert to Opportunity" icon="gtk-go-forward"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending" icon="gtk-cancel"/>
+                    <div class="oe_right">
+                        <field name="stage_id" nolabel="1" widget="statusbar"
+                            on_change="onchange_stage_id(stage_id)"/>
+                    </div>
                     <div class="oe_clear"/>
                 </div>
                 <sheet layout="auto">
@@ -142,69 +155,60 @@
         </field>
         </record>
 
-    <!-- CRM Lead Tree View -->
-    <record model="ir.ui.view" id="crm_case_tree_view_leads">
-        <field name="name">Leads</field>
-        <field name="model">crm.lead</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Leads" fonts="bold:needaction_pending==True" colors="blue:state=='pending';grey:state in ('cancel', 'done')">
-                <field name="needaction_pending" invisible="1"/>
-                <field name="date_deadline" invisible="1"/>
-                <field name="create_date" groups="base.group_no_one"/>
-                <field name="name" string="Subject"/>
-                <field name="contact_name"/>
-                <field name="country_id" invisible="context.get('invisible_country', True)" />
-                <field name="email_from"/>
-                <field name="phone"/>
-
-                <field name="categ_id" invisible="1"/>
-                <field name="type_id" invisible="1"/>
-                <field name="referred" invisible="1"/>
-                <field name="channel_id" invisible="1"/>
-                <field name="subjects" invisible="1"/>
-
-                <field name="stage_id"/>
-                <button name="stage_previous" string="Previous Stage"
-                    states="open,pending" type="object" icon="gtk-go-back" />
-                <button name="stage_next" string="Next Stage"
-                    states="open,pending" type="object"
-                    icon="gtk-go-forward" />
-                <field name="section_id" invisible="context.get('invisible_section', True)" />
-                <field name="user_id" />
-                <field name="state" groups="base.group_no_one"/>
-                <button name="case_open" string="Open"
-                    states="draft,pending" type="object"
-                    icon="gtk-go-forward" groups="base.group_no_one"/>
-                <button name="case_close" string="Close"
-                    states="open,draft,pending" type="object"
-                    icon="gtk-close" groups="base.group_no_one"/>
-                <button name="%(crm.action_crm_lead2opportunity_partner)d"
-                    string="Convert to Opportunity"
-                    states="draft,open,pending" icon="gtk-index"
-                    type="action" />
-                <button name="case_escalate" string="Escalate"
-                    states="open,draft,pending" type="object"
-                    icon="gtk-go-up" />
-            </tree>
-        </field>
-    </record>
-
-    <!-- CRM Lead Calendar View -->
+        <!-- CRM Lead Tree View -->
+        <record model="ir.ui.view" id="crm_case_tree_view_leads">
+            <field name="name">Leads</field>
+            <field name="model">crm.lead</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Leads" fonts="bold:needaction_pending==True" colors="blue:state=='pending';grey:state in ('cancel', 'done')">
+                    <field name="needaction_pending" invisible="1"/>
+                    <field name="date_deadline" invisible="1"/>
+                    <field name="create_date" groups="base.group_no_one"/>
+                    <field name="name" string="Subject"/>
+                    <field name="contact_name"/>
+                    <field name="country_id" invisible="context.get('invisible_country', True)" />
+                    <field name="email_from"/>
+                    <field name="phone"/>
+                    <field name="stage_id"/>
+                    <field name="categ_id" invisible="1"/>
+                    <field name="section_id" invisible="context.get('invisible_section', True)" />
+                    <field name="state" groups="base.group_no_one"/>
+                    <field name="type_id" invisible="1"/>
+                    <field name="referred" invisible="1"/>
+                    <field name="channel_id" invisible="1"/>
+                    <field name="subjects" invisible="1"/>
+                    <button name="case_open" string="Open"
+                        states="draft,pending" type="object"
+                        icon="gtk-go-forward" groups="base.group_no_one"/>
+                    <button name="case_close" string="Close"
+                        states="open,draft,pending" type="object"
+                        icon="gtk-close" groups="base.group_no_one"/>
+                    <button name="%(crm.action_crm_lead2opportunity_partner)d"
+                        string="Convert to Opportunity"
+                        states="draft,open,pending" icon="gtk-index"
+                        type="action" />
+                    <button name="case_escalate" string="Escalate"
+                        states="open,draft,pending" type="object"
+                        icon="gtk-go-up" />
+                </tree>
+            </field>
+        </record>
 
-    <record model="ir.ui.view" id="crm_case_calendar_view_leads">
-        <field name="name">CRM - Leads Calendar</field>
-        <field name="model">crm.lead</field>
-        <field name="type">calendar</field>
-        <field name="priority" eval="2"/>
-        <field name="arch" type="xml">
-            <calendar string="Leads Generation"
-                date_start="date_action" color="user_id">
-                <field name="name" />
-                <field name="partner_name" />
-            </calendar>
-        </field>
-    </record>
+        <!-- CRM Lead Calendar View -->
+        <record model="ir.ui.view" id="crm_case_calendar_view_leads">
+            <field name="name">CRM - Leads Calendar</field>
+            <field name="model">crm.lead</field>
+            <field name="type">calendar</field>
+            <field name="priority" eval="2"/>
+            <field name="arch" type="xml">
+                <calendar string="Leads Generation"
+                    date_start="date_action" color="user_id">
+                    <field name="name" />
+                    <field name="partner_name" />
+                </calendar>
+            </field>
+        </record>
 
     <!-- CRM Lead Kanban View  -->
     <record model="ir.ui.view" id="crm_case_kanban_view_leads">
@@ -294,7 +298,6 @@
     </record>
 
     <!-- CRM Lead Search View -->
-
     <record id="view_crm_case_leads_filter" model="ir.ui.view">
         <field name="name">CRM - Leads Search</field>
         <field name="model">crm.lead</field>
@@ -398,10 +401,6 @@
                     <div class="oe_right">
                         <field name="stage_id" nolabel="1" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
-<!--
-                                statusbar_visible="New,Qualification,Proposition,Won"
-                                statusbar_colors='{"Negotiation":"blue"}'/>
--->
                     </div>
                     <div class="oe_clear"/>
                 </div>