From 92c356a2b9395a8de10a26dfafed62d5b0bd38b4 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Wed, 27 Apr 2011 14:52:02 +0530
Subject: [PATCH 1/2] [IMP] crm: Phone calls, usability improvements.

bzr revid: uco@tinyerp.com-20110427092202-2zhwtcyyyccbipk2
---
 addons/crm/crm_phonecall_menu.xml                      | 10 +++++-----
 addons/crm/crm_phonecall_view.xml                      |  2 +-
 addons/crm/wizard/crm_opportunity_to_phonecall.py      |  6 ++++--
 .../crm/wizard/crm_opportunity_to_phonecall_view.xml   |  2 +-
 addons/crm/wizard/crm_phonecall_to_phonecall.py        |  6 ++++--
 addons/crm/wizard/crm_phonecall_to_phonecall_view.xml  |  2 +-
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index c3d7e1d8df6..ed818839196 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -4,7 +4,7 @@
 
     <act_window
         id="crm_case_categ_phone_create_partner"
-        name="Schedule Phone Call"
+        name="Schedule a Call"
         res_model="crm.phonecall"
         src_model="res.partner"
         view_mode="calendar,tree,form"
@@ -61,7 +61,7 @@
         parent="base.menu_base_partner" sequence="4" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
-        <field name="name">Log a call</field>
+        <field name="name">Logged Calls</field>
         <field name="res_model">crm.phonecall</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
@@ -94,12 +94,12 @@
         <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
     </record>
 
-    <menuitem name="Log a call" id="menu_crm_case_phone_inbound"
+    <menuitem name="Logged Calls" id="menu_crm_case_phone_inbound"
         parent="crm.menu_crm_case_phone"
         action="crm_case_categ_phone_incoming0" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">
-        <field name="name">Schedule a call</field>
+        <field name="name">Scheduled Calls</field>
         <field name="res_model">crm.phonecall</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
@@ -131,7 +131,7 @@
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
     </record>
 
-    <menuitem name="Schedule a call" id="menu_crm_case_phone_outbound"
+    <menuitem name="Scheduled Calls" id="menu_crm_case_phone_outbound"
         parent="crm.menu_crm_case_phone"
         action="crm_case_categ_phone_outgoing0" />
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 9ef661e5eb9..ee732c62f9c 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -64,7 +64,7 @@
                     <field name="duration" widget="float_time"/>
                     <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
 
-                    <field name="date" required="1"/>
+                    <field name="date"/>
                     <field name="user_id"/>
                     <field name="section_id" colspan="1" widget="selection" />
                     <button string="Convert to Opportunity"
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index 7b1938deadf..b57c19eff60 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -22,6 +22,8 @@
 from osv import osv, fields
 from tools.translate import _
 
+import time
+
 class crm_opportunity2phonecall(osv.osv_memory):
     """Converts Opportunity to Phonecall"""
 
@@ -31,7 +33,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
     _columns = {
         'name' : fields.char('Call summary', size=64, required=True, select=1),
         'user_id' : fields.many2one('res.users', "Assign To"),
-        'date': fields.datetime('Date' , required=True),
+        'date': fields.datetime('Date'),
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'categ_id': fields.many2one('crm.case.categ', 'Category',  \
                         domain="['|',('section_id','=',False),('section_id','=',section_id),\
@@ -59,7 +61,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
 
         record_ids = context and context.get('active_ids', []) or []
         res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context)
-        res.update({'action': 'schedule'})
+        res.update({'action': 'schedule', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         for opp in opp_obj.browse(cr, uid, record_ids, context=context):
             if 'name' in fields:
                 res.update({'name': opp.name})
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 91ca297ecc1..0a0b64e43e7 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -14,7 +14,7 @@
                     <field name="action"/>
                     <separator string="Call Details" colspan="4"/>
                     <field name="name"/>
-                    <field name="date" string="Planned Date"/>
+                    <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
                     <newline/>
                     <field name="user_id" />
                     <field name="section_id" widget="selection" />
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
index b83e650d443..3064d934ff3 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall.py
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall.py
@@ -22,6 +22,8 @@
 from osv import osv, fields
 from tools.translate import _
 
+import time
+
 class crm_phonecall2phonecall(osv.osv_memory):
     """ Converts Phonecall to Phonecall"""
 
@@ -109,7 +111,7 @@ class crm_phonecall2phonecall(osv.osv_memory):
                 'categ_id': fields.many2one('crm.case.categ', 'Category', \
                         domain="['|',('section_id','=',False),('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.phonecall')]"), 
-                'date': fields.datetime('Date', required=True),
+                'date': fields.datetime('Date'),
                 'section_id':fields.many2one('crm.case.section','Sales Team'),
                 'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True),
                 }
@@ -127,7 +129,7 @@ class crm_phonecall2phonecall(osv.osv_memory):
         """
         res = super(crm_phonecall2phonecall, self).default_get(cr, uid, fields, context=context)
         record_id = context and context.get('active_id', False) or False
-        res.update({'action': 'schedule'})
+        res.update({'action': 'schedule', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         if record_id:
             phonecall = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
 
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index ea16d27a9cc..feda63ee1e2 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -14,7 +14,7 @@
                         <field name="action"/>
                         <separator string="Call Details" colspan="4"/>
                         <field name="name"/>
-                        <field name="date" string="Planned Date"/>
+                        <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
                         <field name="user_id" />
                         <field name="section_id"/>
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>

From b96c55c9cdaa9f09e32c1cb8d7ed31674c1b9ab2 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Wed, 27 Apr 2011 14:55:44 +0530
Subject: [PATCH 2/2] [IMP] crm: Minor usability improvement.

bzr revid: uco@tinyerp.com-20110427092544-qumq22dxhpv1hcg8
---
 addons/crm/crm_phonecall_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index ed818839196..55e7657ec05 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -107,7 +107,7 @@
         <field name="domain">[('state','!=','done')]</field>
         <field name="context" eval="'{\'search_default_section_id\':section_id, \'default_state\':\'open\', \'search_default_current\':1,\'search_default_today\':1}'"/>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
-        <field name="help">Schedule a call lists all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team.</field>
+        <field name="help">Scheduled calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team.</field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing0">