Merge lp:~openerp-dev/openobject-addons/7.0-opw-594808-ado into lp:openobject-addons/7.0

[Amit Dodiya (OpenERP)]

Hello,

[FIX]crm_lead: (1) title field always shows the titles of type contact it should show the titles based on customers is_company field (2) while creating the title from lead it always create title for type partner not based on customers is_company field

Issue 1:
While creating title for customer from Lead/Customer form it always create title with domain contact, it should be created based on customers type(contact/partner).
Steps:
1). Create new lead with customer agrolait as it is of type partner OR Create new customer set the is_company field true
2). Now create new title
It should create the title for type partner but it always creates title for type contact

Issue 2:
The title field always shows the title of type contact, it should shows the title based on customer types
Steps:
1). Create new lead with customer agrolait as it is of type company
2). Click on title field you will find the title of type contact

The solution contains two side fix server and addons.
The server side fix for this issue is : https://code.launchpad.net/~openerp-dev/openobject-server/7.0-opw-591029-pna/+merge/160059

Regards,
Amit Dodiya

Unmerged revisions

9288. By Amit Dodiya (OpenERP) on 2013-07-08

[FIX]crm_lead: (1) title field always shows the titles of type contact it should show the titles based on customers is_company field (2) while creating the title from lead it always create title for type partner not based on customers is_company field

=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py	2013-06-19 11:46:33 +0000
+++ crm/crm_lead.py	2013-07-09 06:48:27 +0000
@@ -341,8 +341,11 @@
     def on_change_partner(self, cr, uid, ids, partner_id, context=None):
         result = {}
         values = {}
+        domain = {}
         if partner_id:
             partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+            dom_value = 'partner' if partner.is_company else 'contact'
+            domain = {'title':  [('domain', '=', dom_value)]}
             values = {
                 'partner_name' : partner.name,
                 'street' : partner.street,
@@ -355,7 +358,7 @@
                 'mobile' : partner.mobile,
                 'fax' : partner.fax,
             }
-        return {'value' : values}
+        return {'value' : values, 'domain': domain}
 
     def on_change_user(self, cr, uid, ids, user_id, context=None):
         """ When changing the user, also set a section_id or restrict section id

=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2013-06-21 12:06:09 +0000
+++ crm/crm_lead_view.xml	2013-07-09 06:48:27 +0000
@@ -137,7 +137,7 @@
                             <label for="contact_name"/>
                             <div>
                                 <field name="contact_name" class="oe_inline"/><span attrs="{'invisible': [('title', '=', '')]}">, </span>
-                                <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline" options='{"no_open": True}'/>
+                                <field name="title" placeholder="Title" context="{'partner_id': partner_id}" domain="[('domain', '=', 'contact')]" class="oe_inline" options='{"no_open": True}'/>
                             </div>
                             <field name="email_from" widget="email"/>
                             <field name="function"/>