bzr revid: fp@tinyerp.com-20081213125314-t3csvq95lk0nbkk3
This commit is contained in:
Fabien Pinckaers
2008-12-13 13:53:14 +01:00
parent f3f97eff55
commit dbd44cd71a
2 changed files with 2 additions and 3 deletions
+2 -2
View File
@@ -306,10 +306,10 @@ class res_partner_address(osv.osv):
if context.get('contact_display', 'contact')=='partner':
res.append((r['id'], r['partner_id'][1]))
else:
addr = str(r['name'] or '')
addr = r['name'] or ''
if r['name'] and (r['zip'] or r['city']):
addr += ', '
addr += str(r['street'] or '') + ' ' + str(r['zip'] or '') + ' ' + str(r['city'] or '')
addr += (r['street'] or '') + ' ' + (r['zip'] or '') + ' ' + (r['city'] or '')
res.append((r['id'], addr.strip() or '/'))
return res
-1
View File
@@ -2005,7 +2005,6 @@ class orm(orm_template):
ids = [ids]
result_store = self._store_get_values(cr, uid, ids, None, context)
delta = context.get('read_delta', False)
if delta and self._log_access:
for i in range(0, len(ids), cr.IN_MAX):