diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index d36a257bba9..406fd56ee31 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -56,7 +56,7 @@
                     <label string="Quantity :" align="1.0"/>
                     <group colspan="1" col="2">
                         <field name="quantity" nolabel="1"/>
-                        <field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_contact_id, parent.currency_id, context, parent.company_id)" nolabel="1"/>
+                        <field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)" nolabel="1"/>
                     </group>
                     <field name="price_unit"/>
                     <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
index a7bf89b6c26..fe173ff583a 100644
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -40,13 +40,13 @@
             <field name="name">Automated Invoice Notification Mail</field>
             <field name="email_from">${object.user_id.user_email or object.company_id.email or 'noreply@localhost'}</field>
             <field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })</field>
-            <field name="email_to">${object.address_contact_id.email or ''}</field>
+            <field name="email_to">${object.partner_id.email or ''}</field>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field name="auto_delete" eval="True"/>
             <field name="body_html"><![CDATA[
 <div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); ">
 
-    <p>Hello${object.address_contact_id.name and ' ' or ''}${object.address_contact_id.name or ''},</p>
+    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.title or ''},</p>
     
     <p>A new invoice is available for ${object.partner_id.name}: </p>
     
@@ -124,7 +124,7 @@
 </div>
             ]]></field>
             <field name="body_text"><![CDATA[
-Hello${object.address_contact_id.name and ' ' or ''}${object.address_contact_id.name or ''},
+Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
 
 A new invoice is available for ${object.partner_id.name}:
        | Invoice number: *${object.number}*
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 34579d2a7d9..35193dfa07b 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -58,8 +58,6 @@ class stock_picking(osv.osv):
         """
         invoice_vals = super(stock_picking, self)._prepare_invoice(cr, uid, picking, partner, inv_type, journal_id, context=context)
         if picking.purchase_id:
-            invoice_vals['address_contact_id'], invoice_vals['address_invoice_id'] = \
-                self.pool.get('res.partner').address_get(cr, uid, [partner.id], ['contact', 'invoice']).values()
             invoice_vals['fiscal_position'] = picking.purchase_id.fiscal_position.id
         return invoice_vals
 
diff --git a/addons/purchase/wizard/purchase_line_invoice.py b/addons/purchase/wizard/purchase_line_invoice.py
index 77cf408949b..1c94ba08588 100644
--- a/addons/purchase/wizard/purchase_line_invoice.py
+++ b/addons/purchase/wizard/purchase_line_invoice.py
@@ -86,8 +86,6 @@ class purchase_line_invoice(osv.osv_memory):
                     'reference' : partner.ref,
                     'account_id': a,
                     'partner_id': partner.id,
-#                    'address_invoice_id': orders[0].partner_id.id,
-#                    'address_contact_id': orders[0].partner_id.id,
                     'invoice_line': [(6,0,lines_ids)],
                     'currency_id' : orders[0].pricelist_id.currency_id.id,
                     'comment': multiple_order_invoice_notes(orders),