diff --git a/addons/event/event.py b/addons/event/event.py
index 99ccddc660d..e09103865f3 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -393,7 +393,6 @@ class event_registration(osv.osv):
         for reg in self.browse(cr, uid, ids, context=context):
             val_invoice = inv_pool.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
             val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
-            partner_address_id = val_invoice['value']['address_invoice_id']
             if not partner_address_id:
                raise osv.except_osv(_('Error !'),
                         _("Registered partner doesn't have an address to make the invoice."))
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index bac38acee08..9910f43e607 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -183,18 +183,16 @@ class hr_expense_expense(osv.osv):
                 }))
             if not exp.employee_id.address_home_id:
                 raise osv.except_osv(_('Error !'), _('The employee must have a Home address.'))
-            if not exp.employee_id.address_home_id.partner_id:
+            if not exp.employee_id.address_home_id:
                 raise osv.except_osv(_('Error !'), _("The employee's home address must have a partner linked."))
-            acc = exp.employee_id.address_home_id.partner_id.property_account_payable.id
-            payment_term_id = exp.employee_id.address_home_id.partner_id.property_payment_term.id
+            acc = exp.employee_id.address_home_id.property_account_payable.id
+            payment_term_id = exp.employee_id.address_home_id.property_payment_term.id
             inv = {
                 'name': exp.name,
                 'reference': sequence_obj.get(cr, uid, 'hr.expense.invoice'),
                 'account_id': acc,
                 'type': 'in_invoice',
-                'partner_id': exp.employee_id.address_home_id.partner_id.id,
-                'address_invoice_id': exp.employee_id.address_home_id.id,
-                'address_contact_id': exp.employee_id.address_home_id.id,
+                'partner_id': exp.employee_id.address_home_id.id,
                 'company_id': company_id,
                 'origin': exp.name,
                 'invoice_line': lines,
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 134bde8a872..594a0a31c11 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -81,10 +81,6 @@ class account_analytic_line(osv.osv):
             curr_invoice = {
                 'name': time.strftime('%d/%m/%Y')+' - '+account.name,
                 'partner_id': account.partner_id.id,
-                'address_contact_id': res_partner_obj.address_get(cr, uid,
-                    [account.partner_id.id], adr_pref=['contact'])['contact'],
-                'address_invoice_id': res_partner_obj.address_get(cr, uid,
-                    [account.partner_id.id], adr_pref=['invoice'])['invoice'],
                 'payment_term': partner.property_payment_term.id or False,
                 'account_id': partner.property_account_receivable.id,
                 'currency_id': account.pricelist_id.currency_id.id,
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 49495318d60..543f9636f7c 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -427,7 +427,6 @@ class Partner(osv.osv):
 
             invoice_id = invoice_obj.create(cr, uid, {
                 'partner_id': partner.id,
-                'address_invoice_id': addr.get('invoice', False),
                 'account_id': account_id,
                 'fiscal_position': fpos_id or False
                 }, context=context)
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index c035833814f..47ca2db5823 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -389,7 +389,6 @@ class mrp_repair(osv.osv):
                         'type': 'out_invoice',
                         'account_id': account_id,
                         'partner_id': repair.partner_id.id,
-                        'address_invoice_id': repair.address_id.id,
                         'currency_id': repair.pricelist_id.currency_id.id,
                         'comment': repair.quotation_notes,
                         'fiscal_position': repair.partner_id.property_account_position.id
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5a7bf734f8c..8f6a7a594aa 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -985,9 +985,6 @@ class stock_picking(osv.osv):
             account_id = partner.property_account_receivable.id
         else:
             account_id = partner.property_account_payable.id
-        address_contact_id, address_invoice_id = \
-                self.pool.get('res.partner').address_get(cr, uid, [partner.id],
-                        ['contact', 'invoice']).values()
         comment = self._get_comment_invoice(cr, uid, picking)
         invoice_vals = {
             'name': picking.name,