[FIX] Use dict.get() instead of r['name'] or ''

lp bug: https://launchpad.net/bugs/307248 fixed

bzr revid: stephane@tinyerp.com-20081212000209-ak5e4ibl21jlv2tx
This commit is contained in:
Stephane Wirtel
2008-12-12 01:02:09 +01:00
parent 3e3f364abf
commit 5cc55266a7
+3 -3
View File
@@ -59,10 +59,10 @@ class res_partner_contact(osv.osv):
res = []
for r in self.read(cr, user, ids, ['name','first_name','title']):
addr = r['title'] and str(r['title'])+" " or ''
addr +=str(r['name'] or '')
addr += r.get('name', '')
if r['name'] and r['first_name']:
addr += ' '
addr += str(r['first_name'] or '')
addr += r.get('first_name', '')
res.append((r['id'], addr))
return res
res_partner_contact()
@@ -79,7 +79,7 @@ class res_partner_address(osv.osv):
res.append((r['id'], r['partner_id'][1]))
else:
addr = str('')
addr += str(r['street'] or '') + ' ' + str(r['zip'] or '') + ' ' + str(r['city'] or '')
addr += "%s %s %s" % ( r.get('street', ''), r.get('zip', ''), r.get('city', '') )
res.append((r['id'], addr.strip() or '/'))
return res