diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 32b5e08d7b6..d686941ab32 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -141,7 +141,6 @@ class res_partner(osv.osv):
'company_id': fields.many2one('res.company', 'Company', select=1),
'color': fields.integer('Color Index'),
}
-
def _default_category(self, cr, uid, context=None):
if context is None:
context = {}
@@ -235,7 +234,7 @@ class res_partner(osv.osv):
address_obj = self.pool.get('res.partner.address')
address_ids = address_obj.search(cr, uid, [('partner_id', 'in', ids)])
address_rec = address_obj.read(cr, uid, address_ids, ['type'])
- res = list(tuple(addr.values()) for addr in address_rec)
+ res = list((addr['type'],addr['id']) for addr in address_rec)
adr = dict(res)
# get the id of the (first) default address if there is one,
# otherwise get the id of the first address in the list
@@ -314,7 +313,6 @@ class res_partner_address(osv.osv):
'active': lambda *a: 1,
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner.address', context=c),
}
-
def name_get(self, cr, user, ids, context=None):
if context is None:
context = {}
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index b489a4d6e79..1f0e8f88b1c 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -82,7 +82,7 @@
-
+
@@ -214,7 +214,7 @@