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

[Ronald Portier (Therp)]

Fixes lp1091184

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

Looks perfect to me!

review: Approve

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2012-10-24 14:46:52 +0000
+++ openerp/osv/orm.py	2012-12-17 15:03:35 +0000
@@ -4208,7 +4208,7 @@
                     if not pleft_old:
                         cr.execute('select parent_left from '+self._table+' where id=%s', (parent,))
                         pleft_old = cr.fetchone()[0]
-                    pleft = pleft_old
+                    pleft = pleft_old or 0  ## In case no left parent found
                 else:
                     cr.execute('select max(parent_right) from '+self._table)
                     pleft = cr.fetchone()[0] or 0