openerp-community-reviewer team mailing list archive

[Alexandre Fayolle - camptocamp <alexandre.fayolle@xxxxxxxxxxxxxx>]

Alexandre Fayolle - camptocamp has proposed merging lp:~camptocamp/ocb-server/ocb-7.0-fix_1204920-afe into lp:ocb-server.

Requested reviews:
  OpenERP Community Backports Team (ocb)
Related bugs:
  Bug #1204920 in OpenERP Community Backports (Server): "[trunk] UnboundLocalError: local variable 'partner' referenced before assignment"
  https://bugs.launchpad.net/ocb-server/+bug/1204920

For more details, see:
https://code.launchpad.net/~camptocamp/ocb-server/ocb-7.0-fix_1204920-afe/+merge/208390

[FIX] UnboundLocalError (lp:1204920) 

port of https://code.launchpad.net/~camptocamp/openobject-server/7.0-fix_1204920-afe/+merge/208389 to OCB
-- 
https://code.launchpad.net/~camptocamp/ocb-server/ocb-7.0-fix_1204920-afe/+merge/208390
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~camptocamp/ocb-server/ocb-7.0-fix_1204920-afe into lp:ocb-server.

=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py	2014-01-29 13:22:40 +0000
+++ openerp/addons/base/res/res_partner.py	2014-02-26 14:58:12 +0000
@@ -690,6 +690,7 @@
             adr_pref.add('default')
         result = {}
         visited = set()
+        partner = None
         for partner in self.browse(cr, uid, filter(None, ids), context=context):
             current_partner = partner
             while current_partner:
@@ -712,7 +713,7 @@
                 current_partner = current_partner.parent_id
 
         # default to type 'default' or the partner itself
-        default = result.get('default', partner.id)
+        default = result.get('default', partner.id if partner is not None else False)
         for adr_type in adr_pref:
             result[adr_type] = result.get(adr_type) or default 
         return result