Merge lp:~therp-nl/therp-backports/server-6.1-lp1091184_csv_import into lp:therp-backports/server-6.1

Proposed by Ronald Portier (Therp)
Status: Merged
Merged at revision: 4293
Proposed branch: lp:~therp-nl/therp-backports/server-6.1-lp1091184_csv_import
Merge into: lp:therp-backports/server-6.1
Diff against target: 12 lines (+1/-1)
1 file modified
openerp/osv/orm.py (+1/-1)
To merge this branch: bzr merge lp:~therp-nl/therp-backports/server-6.1-lp1091184_csv_import
Reviewer Review Type Date Requested Status
Stefan Rijnhart (Opener) (community) Approve
Review via email: mp+140217@code.launchpad.net

Description of the change

Fixes lp1091184

To post a comment you must log in.

Looks perfect to me!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/osv/orm.py'
2--- openerp/osv/orm.py 2012-10-24 14:46:52 +0000
3+++ openerp/osv/orm.py 2012-12-17 15:03:35 +0000
4@@ -4208,7 +4208,7 @@
5 if not pleft_old:
6 cr.execute('select parent_left from '+self._table+' where id=%s', (parent,))
7 pleft_old = cr.fetchone()[0]
8- pleft = pleft_old
9+ pleft = pleft_old or 0 ## In case no left parent found
10 else:
11 cr.execute('select max(parent_right) from '+self._table)
12 pleft = cr.fetchone()[0] or 0

Subscribers

People subscribed via source and target branches

to all changes: