From 4efd1a346cbdddd9fa5306c8577a5f0a0703aac8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 12 Sep 2012 19:55:27 +0200
Subject: [PATCH] [IMP] usability improvements

bzr revid: fp@tinyerp.com-20120912175527-lru5i9rltp1qnnrg
---
 addons/crm/wizard/crm_lead_to_opportunity.py  |  8 ++---
 .../wizard/crm_lead_to_opportunity_view.xml   | 31 ++++++++++---------
 addons/crm/wizard/crm_lead_to_partner.py      |  6 ++--
 .../crm/wizard/crm_partner_to_opportunity.py  |  2 +-
 .../crm_phonecall_to_opportunity_view.xml     | 11 ++++---
 5 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index e90303dda66..44ce73c23fe 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -30,10 +30,10 @@ class crm_lead2opportunity_partner(osv.osv_memory):
     _inherit = 'crm.lead2partner'
 
     _columns = {
-        'action': fields.selection([('exist', 'Link to an existing partner'), \
-                                    ('create', 'Create a new partner'), \
-                                    ('nothing', 'Do not link to a partner')], \
-                                    'Related Partner', required=True),
+        'action': fields.selection([('exist', 'Link to an existing customer'), \
+                                    ('create', 'Create a new customer'), \
+                                    ('nothing', 'Do not link to a customer')], \
+                                    'Related Customer', required=True),
         'name': fields.selection([('convert', 'Convert to Opportunities'), ('merge', 'Merge with existing Opportunities')], 'Conversion Action', required=True),
         'opportunity_ids': fields.many2many('crm.lead', string='Opportunities', domain=[('type', '=', 'opportunity')]),
     }
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 6a826f7bc0e..ef8acf95b58 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -7,22 +7,23 @@
             <field name="model">crm.lead2opportunity.partner</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
-                    <field name="action"/>
-                    <group attrs="{'invisible':[('action','!=','exist')]}">
-                        <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
+                    <group>
+                        <field name="action" class="oe_inline"/>
+                        <field name="partner_id" 
+                            attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"
+                            class="oe_inline"/>
                     </group>
-                    <group string="Convert to Opportunity">
-                        <field name="name" colspan="4"/>
+                    <group>
+                        <field name="name" class="oe_inline"/>
+                        <field name="opportunity_ids" attrs="{'invisible': [('name', '=', 'convert')]}">
+                            <tree>
+                                <field name="name"/>
+                                <field name="partner_id"/>
+                                <field name="user_id"/>
+                                <field name="section_id"/>
+                            </tree>
+                        </field>
                     </group>
-                    <separator string="Select Opportunities" attrs="{'invisible': [('name', '=', 'convert')]}"/>
-                    <field name="opportunity_ids" attrs="{'invisible': [('name', '=', 'convert')]}">
-                        <tree>
-                            <field name="name"/>
-                            <field name="partner_id"/>
-                            <field name="user_id"/>
-                            <field name="section_id"/>
-                        </tree>
-                    </field>
                     <footer>
                         <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
                         or
@@ -72,7 +73,7 @@
         </record>
 
         <record id="action_crm_lead2opportunity_partner" model="ir.actions.act_window">
-            <field name="name">Create a Partner</field>
+            <field name="name">Convert to opportunity</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">crm.lead2opportunity.partner</field>
             <field name="view_type">form</field>
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 9b239bab7b9..a9e74f306e5 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -28,10 +28,10 @@ class crm_lead2partner(osv.osv_memory):
     _description = 'Lead to Partner'
 
     _columns = {
-        'action': fields.selection([('exist', 'Link to an existing partner'), \
-                                    ('create', 'Create a new partner')], \
+        'action': fields.selection([('exist', 'Link to an existing customer'), \
+                                    ('create', 'Create a new customer')], \
                                     'Action', required=True),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'partner_id': fields.many2one('res.partner', 'Customer'),
     }
     def view_init(self, cr, uid, fields, context=None):
         """
diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py
index a1e1f0f2914..aa8f4a2a036 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity.py
+++ b/addons/crm/wizard/crm_partner_to_opportunity.py
@@ -32,7 +32,7 @@ class crm_partner2opportunity(osv.osv_memory):
         'name' : fields.char('Opportunity Name', size=64, required=True),
         'planned_revenue': fields.float('Expected Revenue', digits=(16,2)),
         'probability': fields.float('Success Probability', digits=(16,2)),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'partner_id': fields.many2one('res.partner', 'Customer'),
     }
 
     def action_cancel(self, cr, uid, ids, context=None):
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
index 8ec4846733c..4b2ec725759 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
@@ -9,11 +9,14 @@
             <field name="model">crm.phonecall2opportunity</field>
             <field name="arch" type="xml">
                 <form string="Convert To Opportunity " version="7.0">
-                    <group col="4">
+                    <group>
                         <field name="name"/>
                         <field name="partner_id" />
-                        <field name="planned_revenue"/>
-                        <field name="probability"/>
+                        <label for="planned_revenue"/>
+                        <div>
+                            <field name="planned_revenue" class="oe_inline"/> at 
+                            <field name="probability" class="oe_inline"/> %%
+                        </div>
                     </group>
                     <footer>
                         <button name="make_opportunity" type="object" string="_Convert" class="oe_highlight"/>
@@ -27,7 +30,7 @@
 <!-- Phonecall to Opportunity action -->
 
         <record model="ir.actions.act_window" id="phonecall2opportunity_act">
-            <field name="name">Convert To Opportunity</field>
+            <field name="name">Convert to opportunity</field>
             <field name="res_model">crm.phonecall2opportunity</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>