From 9954cd3d0866eec4ebeb74d4c48c6244a795e7bc Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Thu, 25 Oct 2012 15:12:31 +0530
Subject: [PATCH 1/5] [IMp]:Improve code in crm

bzr revid: aja@tinyerp.com-20121025094231-ggp3s17n7r5ndkt5
---
 addons/base_calendar/base_calendar.py       |  7 ++++---
 addons/base_calendar/i18n/base_calendar.pot |  2 +-
 addons/crm/crm_lead.py                      |  3 +++
 addons/crm/crm_lead_view.xml                |  2 +-
 addons/crm/crm_phonecall_menu.xml           | 23 ++++++++++++---------
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index cbdc43b23af..5c20afb35a3 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -336,7 +336,7 @@ class calendar_attendee(osv.osv):
                     ('non-participant', 'For information Purpose')], 'Role', \
                     help='Participation role for the calendar user'),
         'state': fields.selection([('needs-action', 'Needs Action'),
-                        ('tentative', 'Tentative'),
+                        ('tentative', 'Uncertain'),
                         ('declined', 'Declined'),
                         ('accepted', 'Accepted'),
                         ('delegated', 'Delegated')], 'Status', readonly=True, \
@@ -559,7 +559,8 @@ property or property parameter."),
         for vals in self.browse(cr, uid, ids, context=context):
             if vals.ref and vals.ref.user_id:
                 mod_obj = self.pool.get(vals.ref._name)
-                defaults = {'user_id': vals.user_id.id, 'organizer_id': vals.ref.user_id.id}
+                res=mod_obj.read(cr,uid,[vals.ref.id],['duration','class'],context)
+                defaults = {'user_id': vals.user_id.id, 'organizer_id': vals.ref.user_id.id,'duration':res[0]['duration'],'class':res[0]['class']}
                 mod_obj.copy(cr, uid, vals.ref.id, default=defaults, context=context)
             self.write(cr, uid, vals.id, {'state': 'accepted'}, context)
 
@@ -1012,7 +1013,7 @@ class calendar_event(osv.osv):
                                                 'Show Time as', states={'done': [('readonly', True)]}),
         'base_calendar_url': fields.char('Caldav URL', size=264),
         'state': fields.selection([
-            ('tentative', 'Tentative'),
+            ('tentative', 'Uncertain'),
             ('cancelled', 'Cancelled'),
             ('confirmed', 'Confirmed'),
             ], 'Status', readonly=True),
diff --git a/addons/base_calendar/i18n/base_calendar.pot b/addons/base_calendar/i18n/base_calendar.pot
index 628f7af2baa..88ba245051f 100644
--- a/addons/base_calendar/i18n/base_calendar.pot
+++ b/addons/base_calendar/i18n/base_calendar.pot
@@ -1146,7 +1146,7 @@ msgstr ""
 #: selection:calendar.attendee,state:0
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
-msgid "Tentative"
+msgid "Uncertain"
 msgstr ""
 
 #. module: base_calendar
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 9ee5aeb2301..ec615e5cee0 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -896,6 +896,9 @@ class crm_lead(base_stage, format_address, osv.osv):
         lead.message_post(body=message)
         return True
 
+    def onchange_state(self, cr, uid, ids, state_id, context=None):
+        state=self.pool.get('res.country.state').browse(cr, uid, state_id, context)
+        return {'value':{'country_id':state.country_id.id,'zip':''}}
 crm_lead()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a0dce6a7ea9..41965cd0dd2 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -160,7 +160,7 @@
                                 <field name="street2"/>
                                 <div class="address_format">
                                     <field name="city" placeholder="City" style="width: 40%%"/>
-                                    <field name="state_id" options='{"no_open": True}' placeholder="State" style="width: 24%%"/>
+                                    <field name="state_id" on_change="onchange_state(state_id)" options='{"no_open": True}' placeholder="State" style="width: 24%%"/>
                                     <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                 </div>
                                 <field name="country_id" placeholder="Country" options='{"no_open": True}'/>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 30303d4205c..7391946e37f 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-
-    <act_window
-        id="crm_case_categ_phone_create_partner"
-        name="Schedule a Call"
-        res_model="crm.phonecall"
-        view_mode="tree,form,calendar"
-        context="{'search_default_partner_id': active_id, 'default_duration': 1.0, 'default_partner_id': active_id}"
-        groups="base.group_sale_salesman"
-        />
-
+    <record model="ir.actions.act_window" id="crm_case_categ_phone_create_partner">
+        <field name="name">Schedule a Call</field>
+        <field name="res_model">crm.phonecall</field>
+        <field name="view_mode">tree,form,calendar</field>
+        <field name="context">{'search_default_partner_id': active_id, 'default_duration': 1.0, 'default_partner_id': active_id}</field>
+        <field name="groups">base.group_sale_salesman</field>
+        <field name="help" type="html">
+            <p class="oe_view_nocontent_create">
+            No call for this contact found.
+    OpenERP allows you to easily define all the calls to be done by your sales team and follow up based on their summary.
+            </p>
+        </field>
+    </record>
     <!-- TO CONFIRM: This is fine -->
     <!-- act_window
             id="act_crm_phonecall_crm_meeting_new"

From 8bc8b450ef69b9c2a93902970d5e3e4fa4b1be50 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Thu, 25 Oct 2012 15:36:29 +0530
Subject: [PATCH 2/5] [IMP]:Improve onchange

bzr revid: aja@tinyerp.com-20121025100629-dxjw5wsgi10pv2zz
---
 addons/crm/crm_lead.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index ec615e5cee0..bef0644f3b5 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -897,8 +897,10 @@ class crm_lead(base_stage, format_address, osv.osv):
         return True
 
     def onchange_state(self, cr, uid, ids, state_id, context=None):
-        state=self.pool.get('res.country.state').browse(cr, uid, state_id, context)
-        return {'value':{'country_id':state.country_id.id,'zip':''}}
+        if state_id:
+            state=self.pool.get('res.country.state').browse(cr, uid, state_id, context)
+            return {'value':{'state_id':state_id,'country_id':state.country_id.id,'zip':''}}
+        return {'value':{'state_id':state_id,'country_id':'','zip':''}}
 crm_lead()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 1ef9c076547fe7a9f630d62cd58496e0928fc017 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Thu, 25 Oct 2012 15:56:36 +0530
Subject: [PATCH 3/5] [REM]:Remove unwanted code

bzr revid: aja@tinyerp.com-20121025102636-gsbkpfs2q85yo3lu
---
 addons/crm/crm_lead.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index bef0644f3b5..00f083bbc7f 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -897,10 +897,12 @@ class crm_lead(base_stage, format_address, osv.osv):
         return True
 
     def onchange_state(self, cr, uid, ids, state_id, context=None):
+        country_id = False
         if state_id:
-            state=self.pool.get('res.country.state').browse(cr, uid, state_id, context)
-            return {'value':{'state_id':state_id,'country_id':state.country_id.id,'zip':''}}
-        return {'value':{'state_id':state_id,'country_id':'','zip':''}}
+            country_id=self.pool.get('res.country.state').browse(cr, uid, state_id, context).country_id.id
+        return {'value':{'state_id':state_id,
+        'country_id':country_id,
+        'zip':False}}
 crm_lead()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 1cab72f26c498eea5d94a35c9d8ab4d158331a9d Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Thu, 25 Oct 2012 16:29:50 +0530
Subject: [PATCH 4/5] [Add]:Add onchange in opportunity view

bzr revid: aja@tinyerp.com-20121025105950-2zw2xmxr759qz3eo
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 41965cd0dd2..cd9db31729a 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -477,7 +477,7 @@
                                         <field name="street2"/>
                                         <div class="address_format">
                                             <field name="city" placeholder="City" style="width: 40%%"/>
-                                            <field name="state_id" options='{"no_open": True}' placeholder="State" style="width: 24%%"/>
+                                            <field name="state_id" options='{"no_open": True}' on_change="onchange_state(state_id)" placeholder="State" style="width: 24%%"/>
                                             <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                         </div>
                                         <field name="country_id" placeholder="Country" options='{"no_open": True}'/>

From ee4cd1af53b5e932d1fcf64e19cab00a4ed96291 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Tue, 30 Oct 2012 14:38:06 +0530
Subject: [PATCH 5/5] [FIX] crm lead country id shoud respect the state

bzr revid: jam@tinyerp.com-20121030090806-kdhfku7g8c108s8j
---
 addons/crm/crm_lead.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 00f083bbc7f..8ed48049d69 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -251,7 +251,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         'street2': fields.char('Street2', size=128),
         'zip': fields.char('Zip', change_default=True, size=24),
         'city': fields.char('City', size=128),
-        'state_id': fields.many2one("res.country.state", 'State', domain="[('country_id','=',country_id)]"),
+        'state_id': fields.many2one("res.country.state", 'State'),
         'country_id': fields.many2one('res.country', 'Country'),
         'phone': fields.char('Phone', size=64),
         'fax': fields.char('Fax', size=64),