Merge lp:~camptocamp/ocb-server/ocb-7.0-fix_1204920-afe into lp:ocb-server

[Alexandre Fayolle - camptocamp]

[FIX] UnboundLocalError (lp:1204920)

port of https://code.launchpad.net/~camptocamp/openobject-server/7.0-fix_1204920-afe/+merge/208389 to OCB

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

LGTM

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Alexandre, why don't you initialize partner to False and avoid comparison?

Regards.

review: Needs Information

[Holger Brunn (Therp) (hbrunn)]

why not simply initialize partner to browse_null, then you don't need to do anything in #16?

review: Needs Information

[lp:~camptocamp/ocb-server/ocb-7.0-fix_1204920-afe]

5274. By Alexandre Fayolle - camptocamp on 2014-04-11

[IMP] improve fix by using browse_null instead of None for default partner value

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

Thanks for the reviews. I updated both this MP and the original one by using orm.browse_null() instead of None.

[lp:~camptocamp/ocb-server/ocb-7.0-fix_1204920-afe]

5275. By Alexandre Fayolle - camptocamp on 2014-04-11

[MRG] resolved merge conflict

[Pedro Manuel Baeza (pedro.baeza)]

Thanks for the changes.

Regards.

review: Approve (code review)

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

I see the upstream branch is green on runbot, and Holger's old comment has been honoured.

Thanks!

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

review: Approve

=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py	2014-04-04 14:16:11 +0000
+++ openerp/addons/base/res/res_partner.py	2014-04-11 08:34:30 +0000
@@ -28,7 +28,7 @@
 import openerp
 from openerp import SUPERUSER_ID
 from openerp import pooler, tools
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 from openerp.osv.expression import get_unaccent_wrapper
 from openerp.tools.translate import _
 from openerp.tools.yaml_import import is_comment
@@ -696,6 +696,7 @@
             adr_pref.add('default')
         result = {}
         visited = set()
+        partner = orm.browse_null()
         for partner in self.browse(cr, uid, filter(None, ids), context=context):
             current_partner = partner
             while current_partner: