Merge lp:~vrt-openerp/domsense-agilebg-addons/6.1-addons into lp:domsense-agilebg-addons/6.1

[Lorenzo Battistini]

[Lorenzo Battistini (elbati)]

Hello Stuart,
in your branch you 'import crm_lead' and include 'crm_lead_view.xml' in __openerp__.py but I can't find those files in your branch.
Do they need to be added?

review: Needs Information

[Stuart Longland (redhatter)]

On 07/03/12 04:28, Lorenzo Battistini - Agile BG - Domsense wrote:
> Review: Needs Information
>
> Hello Stuart,
> in your branch you 'import crm_lead' and include 'crm_lead_view.xml' in __openerp__.py but I can't find those files in your branch.
> Do they need to be added?

Hi,
 I'll check, but yes, they should be there, so if they're absent,
that'll be a blooper on my part. :-)
--
Stuart Longland (aka Redhatter, VK4MSL) .'''.
Gentoo Linux/MIPS Cobalt and Docs Developer '.'` :
. . . . . . . . . . . . . . . . . . . . . . .'.'
http://dev.gentoo.org/~redhatter :.'

I haven't lost my mind...
  ...it's backed up on a tape somewhere.

[Stuart Longland (redhatter)]

On 07/03/12 06:01, Stuart Longland wrote:
> On 07/03/12 04:28, Lorenzo Battistini - Agile BG - Domsense wrote:
>> in your branch you 'import crm_lead' and include 'crm_lead_view.xml' in __openerp__.py but I can't find those files in your branch.
>> Do they need to be added?
> I'll check, but yes, they should be there, so if they're absent,
> that'll be a blooper on my part. :-)

Okay, they're in now. Apologies for the mixup. :-)
--
Stuart Longland (aka Redhatter, VK4MSL) .'''.
Gentoo Linux/MIPS Cobalt and Docs Developer '.'` :
. . . . . . . . . . . . . . . . . . . . . . .'.'
http://dev.gentoo.org/~redhatter :.'

I haven't lost my mind...
  ...it's backed up on a tape somewhere.

[lp:~vrt-openerp/domsense-agilebg-addons/6.1-addons]

162. By Stuart Longland on 2012-03-06

Add missing files

[Stuart Longland (redhatter)]

A heads up with this update; the OpenERP system will drop the contact_name column of the table with potential data loss on application of this update.

One can rescue the data and migrate the schema over ahead of time by running the following SQL against the database:

-- crm improvements; add contact_first_name and contact_last_name --
ALTER TABLE crm_lead ADD COLUMN contact_first_name VARCHAR(64);
ALTER TABLE crm_lead ADD COLUMN contact_last_name VARCHAR(64);
UPDATE crm_lead
SET contact_first_name=TRIM(SUBSTRING(contact_name FROM E'^[^ ]+')),
        contact_last_name=TRIM(SUBSTRING(contact_name FROM E' .+$'));

[lp:~vrt-openerp/domsense-agilebg-addons/6.1-addons]

163. By Stuart Longland on 2012-03-06

crm_base_contact: Refactor crm.lead._name_get_full

This makes it more resillient to glitches such as having only a first name
entered into the leads database. Prior to conversion to an opportunity, the
lead will need both first and last names filled in, but until then, it should
be possible for the user to enter in only one, or even neither.

[Lorenzo Battistini (elbati)]

Hello Stuart,

about the '_lead_create_partner_address' method, I think we should use 'super'. Is it possible?

Also, do you want to set your copyright header on 'crm_base_contact/crm_lead.py' ?

review: Needs Information

[Stuart Longland (redhatter)]

On using super... we can do that, however wouldn't this cause the superclass function to get executed, thus, making the system attempt to insert the partner using the non-base_contact method?

Seems to me calling the superclasses' _lead_create_partner_address method would try to do it the old way, possibly failing and leaving things in an undefined state, before attempting to do things the way it should have done them in the first place.

As for copyright assignment, I can add one. I'll admit that was low on my priorities. :-)

[Stuart Longland (redhatter)]

Okay, just gave it a try, and as I suspected:

Server Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/openerp/addons/web/common/http.py", line 592, in send
    result = openerp.netsvc.dispatch_rpc(service_name, method, args)
  File "/usr/lib/pymodules/python2.6/openerp/netsvc.py", line 360, in dispatch_rpc
    result = ExportService.getService(service_name).dispatch(method, params)
  File "/usr/lib/pymodules/python2.6/openerp/service/web_services.py", line 572, in dispatch
    res = fn(db, uid, *params)
  File "/usr/lib/pymodules/python2.6/openerp/osv/osv.py", line 167, in execute_kw
    return self.execute(db, uid, obj, method, *args, **kw or {})
  File "/usr/lib/pymodules/python2.6/openerp/osv/osv.py", line 121, in wrapper
    return f(self, dbname, *args, **kwargs)
  File "/usr/lib/pymodules/python2.6/openerp/osv/osv.py", line 176, in execute
    res = self.execute_cr(cr, uid, obj, method, *args, **kw)
  File "/usr/lib/pymodules/python2.6/openerp/osv/osv.py", line 164, in execute_cr
    return getattr(object, method)(cr, uid, *args, **kw)
  File "/usr/lib/pymodules/python2.6/openerp/addons/crm/wizard/crm_lead_to_opportunity.py", line 140, in action_apply
    self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids}, context=context)
  File "/usr/lib/pymodules/python2.6/openerp/addons/crm/wizard/crm_lead_to_opportunity.py", line 111, in _convert_opportunity
    partner_id = self._create_partner(cr, uid, ids, context=context)
  File "/usr/lib/pymodules/python2.6/openerp/addons/crm_base_contact/wizard/crm_lead_to_opportunity.py", line 29, in _create_partner
    partner_ids = super(crm_lead2opportunity_partner, self)._create_partner(cr, uid, ids, context)
  File "/usr/lib/pymodules/python2.6/openerp/addons/crm/wizard/crm_lead_to_partner.py", line 110, in _create_partner
    partner_ids = lead.convert_partner(cr, uid, lead_ids, data.action, partner_id, context=context)
  File "/usr/lib/pymodules/python2.6/openerp/addons/crm/crm_lead.py", line 636, in convert_partner
    self._lead_create_partner_address(cr, uid, lead, partner_id, context=context)
  File "/usr/lib/pymodules/python2.6/openerp/addons/crm_base_contact/crm_lead.py", line 77, in _lead_create_partner_address
    address_id = super(crm_lead, self)._lead_create_partner_address(self, cr, uid, partner_id, context=context)
  File "/usr/lib/pymodules/python2.6/openerp/addons/crm/crm_lead.py", line 608, in _lead_create_partner_address
    'name': lead.contact_name,
AttributeError: 'int' object has no attribute 'contact_name'

So no, calling the superclass _lead_create_partner_address won't help.

The diff:
=== modified file 'crm_base_contact/crm_lead.py'
--- crm_base_contact/crm_lead.py 2012-03-06 23:56:07 +0000
+++ crm_base_contact/crm_lead.py 2012-03-13 00:53:14 +0000
@@ -2,6 +2,7 @@
 ##############################################################################
 #
 # OpenERP, Open Source Management Solution
+# Copyright (C) 2012 VRT Systems (<http://www.vrt.com.au>).
 # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 # This program is free software: you can redistribute it and/or modify
@@ -73,25 +74,16 @@
                 }...

[lp:~vrt-openerp/domsense-agilebg-addons/6.1-addons]

164. By Stuart Longland on 2012-03-13

crm_base_contact:

- Add copyright into crm_lead.py
- Fix missed include for to_email function

165. By Stuart Longland on 2012-03-13

crm_base_contact: Implement super() suggestion

Seems my prior attempt at this failed due to a typo. Having fixed this, I am
now able to use the superclass _lead_create_partner_address, which creates an
address linked to the partner, but with no location or contact.

Having done this, it is able to go back, edit the created address object, and
add in the location_id and contact_id created.

[Stuart Longland (redhatter)]

Silly me, I had a closer look at that backtrace, and realised that I hadn't passed in the lead to the superclass, no wonder it failed.

I've updated the class as per your suggestions.

[Lorenzo Battistini (elbati)]

Hello, I think you have to replace line 77 of crm_lead.py with the following:

address_id = super(crm_lead, self)._lead_create_partner_address(cr, uid, lead, partner_id, context=context)

review: Needs Fixing

[Stuart Longland (redhatter)]

It took me a double take to spot what had changed, but I have now committed this fix.

Thanks for reviewing. :-)

review: Needs Resubmitting (fixed)

[lp:~vrt-openerp/domsense-agilebg-addons/6.1-addons]

166. By Stuart Longland on 2012-03-13

crm_base_contact: Drop 'self' argument to superclass function

[Lorenzo Battistini (elbati)]

review: Approve

=== modified file 'crm_base_contact/__init__.py'
--- crm_base_contact/__init__.py	2011-05-08 16:50:55 +0000
+++ crm_base_contact/__init__.py	2012-03-13 20:24:21 +0000
@@ -18,4 +18,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+import crm_lead
 import wizard

=== modified file 'crm_base_contact/__openerp__.py'
--- crm_base_contact/__openerp__.py	2011-05-08 16:50:55 +0000
+++ crm_base_contact/__openerp__.py	2012-03-13 20:24:21 +0000
@@ -30,6 +30,7 @@
     'website': 'http://www.agilebg.com',
     'init_xml': [],
     'update_xml': [
+    	'crm_lead_view.xml'
         ],
     'demo_xml': [],
     'installable': True,

=== added file 'crm_base_contact/crm_lead.py'
--- crm_base_contact/crm_lead.py	1970-01-01 00:00:00 +0000
+++ crm_base_contact/crm_lead.py	2012-03-13 20:24:21 +0000
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012 VRT Systems (<http://www.vrt.com.au>).
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class crm_lead(osv.osv):
+    """ CRM Lead Case """
+    _name = "crm.lead"
+    _inherit = 'crm.lead'
+
+    def _name_get_full(self, cr, uid, ids, prop, unknow_none, context=None):
+        """ Calculate full name """
+        result = {}
+        for rec in self.browse(cr, uid, ids, context=context):
+            name_parts = []
+
+            if(rec.contact_first_name):
+                name_parts.append(rec.contact_first_name)
+
+            if(rec.contact_last_name):
+                name_parts.append(rec.contact_last_name)
+
+            if name_parts:
+                result[rec.id] = ' '.join(name_parts)
+            else:
+                result[rec.id] = False
+
+        return result
+
+    _columns = {
+        'contact_last_name': fields.char('Contact Last Name', size=64),
+        'contact_first_name': fields.char('Contact First Name', size=64),
+        'contact_name': fields.function(_name_get_full, string='Contact Name', size=64,
+                type="char", store=False),
+    }
+
+    def _lead_create_partner_location(self, cr, uid, lead, context=None):
+        location = self.pool.get('res.partner.location')
+        return location.create(cr, uid, {
+                    'street': lead.street,
+                    'street2': lead.street2,
+                    'zip': lead.zip,
+                    'city': lead.city,
+                    'state_id': lead.state_id and lead.state_id.id or False,
+                    'country_id': lead.country_id and lead.country_id.id or False,
+                })
+
+    def _lead_create_partner_contact(self, cr, uid, lead, context=None):
+        location = self.pool.get('res.partner.contact')
+        return location.create(cr, uid, {
+                    'first_name': lead.contact_first_name,
+                    'last_name': lead.contact_last_name,
+                    'mobile': lead.mobile,
+                    'title': lead.title and lead.title.id or False,
+                })
+
+    def _lead_create_partner_address(self, cr, uid, lead, partner_id, context=None):
+        address_id = super(crm_lead, self)._lead_create_partner_address(cr, uid, lead, partner_id, context=context)
+        location_id = self._lead_create_partner_location(cr, uid, lead, context=context)
+        contact_id = self._lead_create_partner_contact(cr, uid, lead, context=context)
+
+        address = self.pool.get('res.partner.address')
+        address.write(cr, uid, [address_id], {
+                    'location_id': location_id,
+                    'contact_id': contact_id,
+                })
+        return address_id
+
+crm_lead()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'crm_base_contact/crm_lead_view.xml'
--- crm_base_contact/crm_lead_view.xml	1970-01-01 00:00:00 +0000
+++ crm_base_contact/crm_lead_view.xml	2012-03-13 20:24:21 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+
+    <!-- CRM Lead Form View  -->
+    <record model="ir.ui.view" id="crm_case_form_view_leads">
+        <field name="name">crm.lead.form.inherited</field>
+        <field name="inherit_id" ref="crm.crm_case_form_view_leads" />
+        <field name="model">crm.lead</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+	    <xpath expr="/form/notebook/page[@string='Lead']/group/field[@name='contact_name']" position="replace">
+		<field name="contact_last_name"/>
+		<field name="contact_first_name"/>
+	    </xpath>
+        </field>
+    </record>
+
+</data>
+</openerp>

=== modified file 'crm_base_contact/wizard/crm_lead_to_opportunity.py'
--- crm_base_contact/wizard/crm_lead_to_opportunity.py	2011-05-08 16:50:55 +0000
+++ crm_base_contact/wizard/crm_lead_to_opportunity.py	2012-03-13 20:24:21 +0000
@@ -30,13 +30,14 @@
         rec_ids = context and context.get('active_ids', [])
         lead_obj = self.pool.get('crm.lead')
         contact_obj = self.pool.get('res.partner.contact')
-        job_obj = self.pool.get('res.partner.job')
+        job_obj = self.pool.get('res.partner.address')
         for data in self.browse(cr, uid, ids, context=context):
             for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
                 if data.action == 'create':
                     if lead.partner_address_id:
                         contact_id = contact_obj.create(cr, uid, {
-                            'name': lead.contact_name,
+                            'last_name': lead.contact_last_name,
+                            'first_name': lead.contact_first_name,
                             'mobile': lead.mobile,
                             'title': lead.title and lead.title.id or False,
                             'email': lead.email_from,

=== modified file 'crm_base_contact/wizard/crm_lead_to_partner.py'
--- crm_base_contact/wizard/crm_lead_to_partner.py	2011-05-08 16:50:55 +0000
+++ crm_base_contact/wizard/crm_lead_to_partner.py	2012-03-13 20:24:21 +0000
@@ -30,13 +30,14 @@
         rec_ids = context and context.get('active_ids', [])
         lead_obj = self.pool.get('crm.lead')
         contact_obj = self.pool.get('res.partner.contact')
-        job_obj = self.pool.get('res.partner.job')
+        job_obj = self.pool.get('res.partner.address')
         for data in self.browse(cr, uid, ids, context=context):
             for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
                 if data.action == 'create':
                     if lead.partner_address_id:
                         contact_id = contact_obj.create(cr, uid, {
-                            'name': lead.contact_name,
+                            'first_name': lead.contact_last_name,
+                            'last_name': lead.contact_first_name,
                             'mobile': lead.mobile,
                             'title': lead.title and lead.title.id or False,
                             'email': lead.email_from,

=== modified file 'crm_base_contact/wizard/crm_phonecall_to_partner.py'
--- crm_base_contact/wizard/crm_phonecall_to_partner.py	2011-05-08 16:50:55 +0000
+++ crm_base_contact/wizard/crm_phonecall_to_partner.py	2012-03-13 20:24:21 +0000
@@ -30,13 +30,13 @@
         rec_ids = context and context.get('active_ids', [])
         phonecall_obj = self.pool.get('crm.phonecall')
         contact_obj = self.pool.get('res.partner.contact')
-        job_obj = self.pool.get('res.partner.job')
+        job_obj = self.pool.get('res.partner.address')
         for data in self.browse(cr, uid, ids, context=context):
             for phonecall in phonecall_obj.browse(cr, uid, rec_ids, context=context):
                 if data.action == 'create':
                     if phonecall.partner_address_id:
                         contact_id = contact_obj.create(cr, uid, {
-                            'name': phonecall.name,
+                            'last_name': phonecall.name,
                             })
                         job_id = job_obj.create(cr, uid, {
                             'address_id': phonecall.partner_address_id.id,