Merge lp:~therp-nl/partner-contact-management/7.0-firstname_display_name_trigger_prepare_name into lp:~partner-contact-core-editors/partner-contact-management/7.0

[Holger Brunn (Therp)]

[Leonardo Pistone (lepistone)]

Apparently a symlink is gone in that commit.

The diff also says "=== target was u'base_location'" which I don't understand.

If that is intentional, can you please split into another commit and elaborate in the commit message?

Thanks!

review: Needs Fixing

[Holger Brunn (Therp) (hbrunn)]

That's not intentional. I currently can't see the problem, could you elaborate?

[Leonardo Pistone (lepistone)]

I think the the symlink was intentionally there for backwards compatibility when the module better_zip was renamed to base_location.

I now understand the second line of the diff - it has to be read as one sentence (removed symlink better_zip, target was base_location).

I suggest you start again with a fresh branch, re-apply your change leaving the symlink alone and push --overwrite.

Thanks!

[lp:~therp-nl/partner-contact-management/7.0-firstname_display_name_trigger_prepare_name]

42. By Holger Brunn (Therp) on 2014-07-17

[RFR] use _prepare_name from refactoring of partner_firstname

[Holger Brunn (Therp) (hbrunn)]

now I got it, thanks! Now launchpad still talks about that link, but the merge itself is clean as far as I see.

[Leonardo Pistone (lepistone)]

+1

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

LGTM

review: Approve (code review)

[Stefan Rijnhart (Opener) (stefan-opener)]

Tnx!

review: Approve

=== modified file 'firstname_display_name_trigger/res_partner.py'
--- firstname_display_name_trigger/res_partner.py	2013-12-04 12:52:48 +0000
+++ firstname_display_name_trigger/res_partner.py	2014-07-17 10:54:21 +0000
@@ -37,8 +37,7 @@
             ids = [ids]
         res = []
         for record in self.browse(cr, uid, ids, context=context):
-            names = (record.lastname, record.firstname)
-            name = u" ".join([s for s in names if s])
+            name = self._prepare_name_custom(cr, uid, record, context=context)
             if record.parent_id and not record.is_company:
                 name =  "%s, %s" % (record.parent_id.name, name)
             if context.get('show_address'):