Odoo Server (MOVED TO GITHUB)

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

  1. 7.0-fix_1204920-afe
  2. Merge into 7.0
Proposed by Alexandre Fayolle - camptocamp
Status: Needs review
Proposed branch: lp:~camptocamp/openobject-server/7.0-fix_1204920-afe
Merge into: lp:openobject-server/7.0
Diff against target: 20 lines (+2/-1)
1 file modified
openerp/addons/base/res/res_partner.py (+2/-1)
To merge this branch: bzr merge lp:~camptocamp/openobject-server/7.0-fix_1204920-afe
Reviewer Review Type Date Requested Status
Leonardo Pistone (community) code review Approve
OpenERP Core Team Pending
Review via email: mp+208389@code.launchpad.net

Description of the change

[FIX] UnboundNameError in res_partner

To post a comment you must log in.
Revision history for this message
Leonardo Pistone (lepistone) wrote :

lgtm

review: Approve (code review)
Reply
lp:~camptocamp/openobject-server/7.0-fix_1204920-afe updated
5089. By Alexandre Fayolle - camptocamp

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

5090. By Alexandre Fayolle - camptocamp

[MRG] resolved merge conflict

Unmerged revisions

5090. By Alexandre Fayolle - camptocamp

[MRG] resolved merge conflict

5089. By Alexandre Fayolle - camptocamp

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

5088. By Alexandre Fayolle - camptocamp

[FIX] UnboundLocalError

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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:36:24 +0000
@@ -28,7 +28,7 @@
28import openerp28import openerp
29from openerp import SUPERUSER_ID29from openerp import SUPERUSER_ID
30from openerp import pooler, tools30from openerp import pooler, tools
31from openerp.osv import osv, fields31from openerp.osv import osv, fields, orm
32from openerp.osv.expression import get_unaccent_wrapper32from openerp.osv.expression import get_unaccent_wrapper
33from openerp.tools.translate import _33from openerp.tools.translate import _
34from openerp.tools.yaml_import import is_comment34from openerp.tools.yaml_import import is_comment
@@ -696,6 +696,7 @@
696 adr_pref.add('default')696 adr_pref.add('default')
697 result = {}697 result = {}
698 visited = set()698 visited = set()
699 partner = orm.browse_null()
699 for partner in self.browse(cr, uid, filter(None, ids), context=context):700 for partner in self.browse(cr, uid, filter(None, ids), context=context):
700 current_partner = partner701 current_partner = partner
701 while current_partner:702 while current_partner: