Merge lp:~camptocamp/partner-contact-management/7.0-add-firstname_display_name_trigger into lp:~partner-contact-core-editors/partner-contact-management/7.0

[Yannick Vaucher @ Camptocamp]

[lp:~camptocamp/partner-contact-management/7.0-add-firstname_display_name_trigger]

22. By Yannick Vaucher @ Camptocamp on 2013-05-24

[ADD] firstname_display_name - python unit tests

23. By Yannick Vaucher @ Camptocamp on 2013-05-24

[ADD] firstnamt_display_name_trigger - name_get overwrite to by pass reading of name

24. By Alexandre Fayolle - camptocamp on 2013-05-24

[IMP] update description

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM

review: Approve (code review, no test)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Could you put it in the 'Hidden' module category? (Or does this category disappeared in OpenERP 7?)

l.126-127: replace is done twice. It assumes there is good reason but the 'why' would deserve to be explained as a comment above the lines I think

Congrats for the tests :-)

review: Needs Fixing

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

For the name_get function, it is a copy of official name_get but with few changes about constructing the name.

The address concatenation where double \n are removed was taken from there. A cleanest way might be to ask for a hook to create the name.

I also found the l.126-127 quite strange but I assume there are few chances that an address has more than 4 empty lines, even though it would be possible as there is no limit in country address format field.

http://bazaar.launchpad.net/~openerp/openobject-server/7.0/view/head:/openerp/addons/base/res/res_partner.py#L524

I'll check about Hidden category.

[Eric Caudal - www.elico-corp.com (elicoidal)]

Not sure it is relevant but in China, family name is the first to be
displayed.

For me it should be part of the localization or address setup
Eric CAUDAL

Eric Caudal
/CEO/
--
*Elico Corporation, Shanghai branch
/OpenERP Premium Certified Training Partner/ *
Cell: + 86 186 2136 1670
Office: + 86 21 6211 8017/27/37
Skype: elico.corp
<email address hidden> <mailto:<email address hidden>>
http://www.elico-corp.com

Elico Corp
On 06/18/2013 04:38 PM, Yannick Vaucher @ Camptocamp wrote:
> For the name_get function, it is a copy of official name_get but with few changes about constructing the name.
>
> The address concatenation where double \n are removed was taken from there. A cleanest way might be to ask for a hook to create the name.
>
> I also found the l.126-127 quite strange but I assume there are few chances that an address has more than 4 empty lines, even though it would be possible as there is no limit in country address format field.
>
> http://bazaar.launchpad.net/~openerp/openobject-server/7.0/view/head:/openerp/addons/base/res/res_partner.py#L524
>
> I'll check about Hidden category.

[lp:~camptocamp/partner-contact-management/7.0-add-firstname_display_name_trigger]

25. By Yannick Vaucher @ Camptocamp on 2013-06-18

[IMP] firstname_display_name_trigger - change category to Hidden

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

@Eric, sure it should be an improvement of partner_firstname module to choose which name is first. Module partner_firstname being a module to split the full name in 2 fields firstname, lastname.

And if partner_firstname module is improved that way, then we can update this module the same way.

By the way in partner_firstname and in this link module we are both computing the name to show lastname first and firstname second. After, as you have 2 separate names you can still use them how you want in your reports.

120 + name = '%s %s'%(record.lastname if record.lastname else u"",
121 + record.firstname if record.firstname else u"")

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks for the change.
LGTM

review: Approve (code review, no test)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Hello, could this one be merged please

=== added directory 'firstname_display_name_trigger'
=== added file 'firstname_display_name_trigger/__init__.py'
--- firstname_display_name_trigger/__init__.py	1970-01-01 00:00:00 +0000
+++ firstname_display_name_trigger/__init__.py	2013-06-18 08:49:26 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Yannick Vaucher
+#    Copyright 2013 Camptocamp SA
+#
+#    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/>.
+#
+##############################################################################
+
+import res_partner
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'firstname_display_name_trigger/__openerp__.py'
--- firstname_display_name_trigger/__openerp__.py	1970-01-01 00:00:00 +0000
+++ firstname_display_name_trigger/__openerp__.py	2013-06-18 08:49:26 +0000
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Yannick Vaucher
+#    Copyright 2013 Camptocamp SA
+#
+#    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/>.
+#
+##############################################################################
+{'name': 'Link module if partner_lastname and account_report_company are installed',
+ 'version': '1.0',
+ 'author': 'Camptocamp',
+ 'maintainer': 'Camptocamp',
+ 'category': 'Hidden',
+ 'complexity': 'normal',  # easy, normal, expert
+ 'depends': [
+     'account_report_company',
+     'partner_firstname',
+     ],
+ 'description': """
+Adapt the computation of display name so that it gets visible in tree and kanban views.
+ """,
+ 'website': 'http://www.camptocamp.com',
+ 'data': [],
+ 'installable': True,
+ 'images': [],
+ 'auto_install': True,
+ 'license': 'AGPL-3',
+ 'application': False}
+

=== added file 'firstname_display_name_trigger/res_partner.py'
--- firstname_display_name_trigger/res_partner.py	1970-01-01 00:00:00 +0000
+++ firstname_display_name_trigger/res_partner.py	2013-06-18 08:49:26 +0000
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Yannick Vaucher
+#    Copyright 2013 Camptocamp SA
+#
+#    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 openerp.osv import orm, fields
+
+
+class ResPartner(orm.Model):
+    _inherit = 'res.partner'
+
+    def _display_name_compute(self, cr, uid, ids, name, args, context=None):
+        return dict(self.name_get(cr, uid, ids, context=context))
+
+    def name_get(self, cr, uid, ids, context=None):
+        """ By pass of name_get to use directly firstname and lastname
+        as we cannot ensure name as already been computed when calling this
+        method for display_name"""
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        res = []
+        for record in self.browse(cr, uid, ids, context=context):
+            name = '%s %s'%(record.lastname if record.lastname else u"",
+                            record.firstname if record.firstname else u"")
+            if record.parent_id and not record.is_company:
+                name =  "%s, %s" % (record.parent_id.name, name)
+            if context.get('show_address'):
+                name = name + "\n" + self._display_address(cr, uid, record, without_company=True, context=context)
+                name = name.replace('\n\n','\n')
+                name = name.replace('\n\n','\n')
+            if context.get('show_email') and record.email:
+                name = "%s <%s>" % (name, record.email)
+            res.append((record.id, name))
+        return res
+
+
+    _display_name_store_triggers = {
+        'res.partner': (lambda self,cr,uid,ids,context=None: self.search(cr, uid, [('id','child_of',ids)]),
+                        ['parent_id', 'is_company', 'name', 'firstname', 'lastname'], 10)
+        }
+
+    # indirection to avoid passing a copy of the overridable method when declaring the function field
+    _display_name = lambda self, *args, **kwargs: self._display_name_compute(*args, **kwargs)
+
+    _columns = {
+        # extra field to allow ORDER BY to match visible names
+        'display_name': fields.function(_display_name, type='char', string='Name', store=_display_name_store_triggers),
+        }

=== added directory 'firstname_display_name_trigger/tests'
=== added file 'firstname_display_name_trigger/tests/__init__.py'
--- firstname_display_name_trigger/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ firstname_display_name_trigger/tests/__init__.py	2013-06-18 08:49:26 +0000
@@ -0,0 +1,5 @@
+import test_display_name
+
+checks = [
+    test_display_name
+    ]

=== added file 'firstname_display_name_trigger/tests/test_display_name.py'
--- firstname_display_name_trigger/tests/test_display_name.py	1970-01-01 00:00:00 +0000
+++ firstname_display_name_trigger/tests/test_display_name.py	2013-06-18 08:49:26 +0000
@@ -0,0 +1,31 @@
+import unittest2
+
+import openerp.tests.common as common
+
+class test_display_name(common.TransactionCase):
+
+    def setUp(self):
+        super(test_display_name,self).setUp()
+        cr, uid = self.cr, self.uid
+        self.res_partner = self.registry('res.partner')
+
+
+    def test_00_create_res_partner(self):
+        """ Test if the display name has been correctly set """
+        cr, uid = self.cr, self.uid
+        partner_id = self.res_partner.create(cr, uid, {'lastname': 'Lastname', 'firstname': 'Firstname', 'is_company': True})
+        partner_records = self.res_partner.browse(cr, uid, [partner_id])
+        p1 = partner_records[0]
+        self.assertEqual(p1.display_name, 'Lastname Firstname', 'Partner display_name incorect')
+
+    def test_01_res_partner_write_lastname(self):
+        """ Test if the display name has been correctly set """
+        cr, uid = self.cr, self.uid
+        partner_id = self.res_partner.create(cr, uid, {'lastname': 'Lastname', 'firstname': 'Firstname', 'is_company': True})
+        partner_records = self.res_partner.browse(cr, uid, [partner_id])
+        p1 = partner_records[0]
+        self.res_partner.write(cr, uid, partner_id, {'lastname': 'Last'})
+        self.assertEqual(p1.display_name, 'Last Firstname', 'Partner display_name incorect')
+
+if __name__ == '__main__':
+    unittest2.main()