From 1cc4bda393758e1cd503945ef40f5b98a5a5ca98 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 3 Feb 2010 18:57:10 +0530
Subject: [PATCH] [IMP] crm: improve view of lead and oopt.

bzr revid: hmo@tinyerp.com-20100203132710-bc2tzv3aqf0e1969
---
 addons/crm/crm_lead_view.xml        | 27 +++++++++------------------
 addons/crm/crm_opportunity_view.xml | 10 +++-------
 addons/sale_crm/sale_crm_view.xml   |  2 +-
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 41ad721336f..f54114ab885 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -36,32 +36,23 @@
                     </group>
                     <group colspan="1" col="1">
                     <button string="Create Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"/>                    
-                    <label string=""/>
+                    <button string="Convert to Partner"
+                                icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
+                                type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
+                            />
                     </group>
                     <group colspan="3" col="4">
                     <notebook>
                     <page string="Leads">
-                        <separator colspan="4" string="Communication"/>
+                        <separator colspan="4" string="Communication"/>                                                                        
+                        <field name="partner_id" string="Partner"/>
+                        <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
                         <field name="partner_phone"/>
                         <field name="partner_mobile"/>
-                        <label string="Partner:" align="1.0"/>
-                        <group colspan="1" col="2">
-                            <field name="partner_id" nolabel="1" colspan="1"/>
-                            <button string="Convert to Partner"
-                                icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
-                                type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
-                            />
-                        </group>
-                        <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
-
                         <separator colspan="4" string="Status and Categarization"/>
                         <group colspan="4" col="6">
-                            <field name="user_id" select="2"/>
-                            <label string="Status: " align="1.0"/>
-                            <group colspan="1" col="2">
-                                <field name="stage_id" select="1" nolabel="1" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
-                                <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
-                            </group>
+                            <field name="user_id" select="2"/>                                                        
+                            <field name="stage_id" select="1" string="Status" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>                                
                             <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
                        
                             <field name="type_id" string="Campaign" select="1"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 3185be1a457..2c1f6aa0550 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -64,12 +64,8 @@
 
                     <separator colspan="4" string="Status and Categarization"/>
                     <group colspan="4" col="6">
-                        <field name="user_id" select="2" string="Responsible"/>
-                        <label string="Sales Stage: " align="1.0"/>
-                        <group colspan="1" col="2">
-                        <field name="stage_id" select="1" nolabel="1" required="1" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
-                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
-                        </group>
+                        <field name="user_id" select="2" string="Responsible"/>                        
+                        <field name="stage_id" select="1" string="Sales Stage" required="1" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>                        
                         <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
                         <field name="type_id" select="1" string="Campaign"/>
                         <field name="section_id" colspan="1" widget="selection"/>
@@ -163,7 +159,7 @@
                 <field name="partner_id" string="Partner"/>
                 <field name="planned_revenue"/>
                 <field name="probability"/>
-                <field name="date_deadline"/>
+                <field name="date_deadline" string="Excepted Close Date"/>
                 <field name="user_id"/>
                 <field name="state"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 30700eb0487..fdd96186e34 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -9,7 +9,7 @@
         <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
         <field name="arch" type="xml">
             <xpath expr="/form[@string='Opportunities']/group/button[@string='Schedule Call']" position="after">
-                <button string="Convert to Quote" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/> 
+                <button string="Quotation" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/> 
             </xpath>           
         </field>
     </record>