Merge lp:~therp-nl/therp-backports/6.1_fix_base_contact_name into lp:therp-backports

Proposed by Holger Brunn (Therp)
Status: Merged
Merged at revision: 6697
Proposed branch: lp:~therp-nl/therp-backports/6.1_fix_base_contact_name
Merge into: lp:therp-backports
Diff against target: 21 lines (+3/-1)
1 file modified
base_contact/base_contact.py (+3/-1)
To merge this branch: bzr merge lp:~therp-nl/therp-backports/6.1_fix_base_contact_name
Reviewer Review Type Date Requested Status
Stefan Rijnhart (Opener) (community) Approve
Review via email: mp+140472@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Pep8 dictates spacing like 'result = super', but I will do that at merge time.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'base_contact/base_contact.py'
2--- base_contact/base_contact.py 2012-02-15 13:22:13 +0000
3+++ base_contact/base_contact.py 2012-12-18 15:24:29 +0000
4@@ -93,7 +93,7 @@
5 return bool(value == 1)
6
7 exists = table_exists(self._table)
8- super(res_partner_contact, self)._auto_init(cr, context)
9+ result=super(res_partner_contact, self)._auto_init(cr, context)
10
11 if not exists:
12 cr.execute("""
13@@ -108,6 +108,8 @@
14 cr.execute("update res_partner_address set contact_id=id")
15 cr.execute("select setval('res_partner_contact_id_seq', (select max(id)+1 from res_partner_contact))")
16
17+ return result
18+
19 res_partner_contact()
20
21 class res_partner_location(osv.osv):

Subscribers

People subscribed via source and target branches

to all changes: