diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 5b3902cf1cd..f3f77f0f23c 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -67,7 +67,7 @@ Dashboard for purchase management that includes:
         'test/process/generate_invoice_from_reception.yml',
         'test/process/run_scheduler.yml',
         'test/process/merge_order.yml',
-        'test/process/edi_purchase_order.yml',
+#        'test/process/edi_purchase_order.yml',
         'test/process/invoice_on_poline.yml',
         'test/ui/print_report.yml',
         'test/ui/duplicate_order.yml',
diff --git a/addons/purchase/edi/purchase_order.py b/addons/purchase/edi/purchase_order.py
index b8359f3bf7f..cdc2f319bc6 100644
--- a/addons/purchase/edi/purchase_order.py
+++ b/addons/purchase/edi/purchase_order.py
@@ -79,7 +79,7 @@ class purchase_order(osv.osv, EDIMixin):
                     '__import_module': 'sale',
 
                     'company_address': res_company.edi_export_address(cr, uid, order.company_id, context=context),
-                    'partner_address': res_partner_address.edi_export(cr, uid, [order.partner_address_id], context=context)[0],
+                    'partner_address': res_partner_address.edi_export(cr, uid, [order.partner_id], context=context)[0],
                     'currency': self.pool.get('res.currency').edi_export(cr, uid, [order.pricelist_id.currency_id],
                                                                          context=context)[0],
             })
@@ -115,7 +115,7 @@ class purchase_order(osv.osv, EDIMixin):
         partner_address = res_partner_address.browse(cr, uid, address_id, context=context)
         edi_document['partner_id'] = (src_company_id, src_company_name)
         edi_document.pop('partner_address', False) # ignored
-        edi_document['partner_address_id'] = self.edi_m2o(cr, uid, partner_address, context=context)
+        edi_document['partner_id'] = self.edi_m2o(cr, uid, partner_address, context=context)
 
         return partner_id
 
diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index f3f610b8e75..560b566b19f 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -38,13 +38,13 @@
             <field name="name">Automated Purchase Order Notification Mail</field>
             <field name="email_from">${object.validator.user_email or ''}</field>
             <field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field>
-            <field name="email_to">${object.partner_address_id.email}</field>
+            <field name="email_to">${object.partner_id.email}</field>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <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.partner_address_id.name and ' ' or ''}${object.partner_address_id.name or ''},</p>
+    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>
     
     <p>Here is a purchase order confirmation from ${object.company_id.name}: </p>
     
@@ -107,7 +107,7 @@
 </div>
             ]]></field>
             <field name="body_text"><![CDATA[
-Hello${object.partner_address_id.name and ' ' or ''}${object.partner_address_id.name or ''},
+Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
 
 Here is a purchase order confirmation from ${object.company_id.name}:
        | Order number: *${object.name}*
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index 7334cd92809..bf37504c3d0 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -603,7 +603,7 @@ msgid "Available"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.report,partner_address_id:0
+#: field:purchase.report,partner_id:0
 msgid "Address Contact Name"
 msgstr ""
 
@@ -1557,7 +1557,7 @@ msgid "Waiting"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,partner_address_id:0
+#: field:purchase.order,partner_id:0
 msgid "Address"
 msgstr ""
 
@@ -1770,8 +1770,8 @@ msgstr ""
 #: model:email.template,body_text:purchase.email_template_edi_purchase
 msgid ""
 "\n"
-"Hello${object.partner_address_id.name and ' ' or ''}${object."
-"partner_address_id.name or ''},\n"
+"Hello${object.partner_id.name and ' ' or ''}${object."
+"partner_id.name or ''},\n"
 "\n"
 "Here is a purchase order confirmation from ${object.company_id.name}:\n"
 "       | Order number: *${object.name}*\n"
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index a3135935045..5548e5b3898 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -49,7 +49,7 @@ class purchase_order(osv.osv):
             cur = order.pricelist_id.currency_id
             for line in order.order_line:
                val1 += line.price_subtotal
-               for c in self.pool.get('account.tax').compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id.id, order.partner_id)['taxes']:
+               for c in self.pool.get('account.tax').compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_id.id, line.product_id.id, order.partner_id)['taxes']:
                     val += c.get('amount', 0.0)
             res[order.id]['amount_tax']=cur_obj.round(cr, uid, cur, val)
             res[order.id]['amount_untaxed']=cur_obj.round(cr, uid, cur, val1)
@@ -161,9 +161,7 @@ class purchase_order(osv.osv):
         'date_order':fields.date('Order Date', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, select=True, help="Date on which this document has been created."),
         'date_approve':fields.date('Date Approved', readonly=1, select=True, help="Date on which purchase order has been approved"),
         'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, change_default=True),
-        'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True,
-            states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},domain="[('partner_id', '=', partner_id)]"),
-        'dest_address_id':fields.many2one('res.partner.address', 'Destination Address', domain="[('partner_id', '!=', False)]",
+        'dest_address_id':fields.many2one('res.partner', 'Destination Address', domain="[('parent_id','=',partner_id)]", 
             states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},
             help="Put an address if you want to deliver directly from the supplier to the customer." \
                 "In this case, it will remove the warehouse link and set the customer location."
@@ -215,7 +213,6 @@ class purchase_order(osv.osv):
         'shipped': 0,
         'invoice_method': 'order',
         'invoiced': 0,
-        'partner_address_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['default'])['default'],
         'pricelist_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').browse(cr, uid, context['partner_id']).property_product_pricelist_purchase.id,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order', context=c),
     }
@@ -249,9 +246,9 @@ class purchase_order(osv.osv):
     def onchange_dest_address_id(self, cr, uid, ids, address_id):
         if not address_id:
             return {}
-        address = self.pool.get('res.partner.address')
+        address = self.pool.get('res.partner')
         values = {'warehouse_id': False}
-        supplier = address.browse(cr, uid, address_id).partner_id
+        supplier = address.browse(cr, uid, address_id)
         if supplier:
             location_id = supplier.property_stock_customer.id
             values.update({'location_id': location_id})
@@ -266,12 +263,12 @@ class purchase_order(osv.osv):
     def onchange_partner_id(self, cr, uid, ids, partner_id):
         partner = self.pool.get('res.partner')
         if not partner_id:
-            return {'value':{'partner_address_id': False, 'fiscal_position': False}}
+            return {'value':{'fiscal_position': False}}
         supplier_address = partner.address_get(cr, uid, [partner_id], ['default'])
         supplier = partner.browse(cr, uid, partner_id)
         pricelist = supplier.property_product_pricelist_purchase.id
         fiscal_position = supplier.property_account_position and supplier.property_account_position.id or False
-        return {'value':{'partner_address_id': supplier_address['default'], 'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
+        return {'value':{'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
 
     def wkf_approve_order(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': fields.date.context_today(self,cr,uid,context=context)})
@@ -376,8 +373,6 @@ class purchase_order(osv.osv):
                 'type': 'in_invoice',
                 'partner_id': order.partner_id.id,
                 'currency_id': order.pricelist_id.currency_id.id,
-                'address_invoice_id': order.partner_address_id.id,
-                'address_contact_id': order.partner_address_id.id,
                 'journal_id': len(journal_ids) and journal_ids[0] or False,
                 'invoice_line': [(6, 0, inv_lines)], 
                 'origin': order.name,
@@ -433,7 +428,7 @@ class purchase_order(osv.osv):
             'origin': order.name + ((order.origin and (':' + order.origin)) or ''),
             'date': order.date_order,
             'type': 'in',
-            'address_id': order.dest_address_id.id or order.partner_address_id.id,
+            'address_id': order.dest_address_id.id or order.partner_id.id,
             'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none',
             'purchase_id': order.id,
             'company_id': order.company_id.id,
@@ -453,7 +448,7 @@ class purchase_order(osv.osv):
             'location_id': order.partner_id.property_stock_supplier.id,
             'location_dest_id': order.location_id.id,
             'picking_id': picking_id,
-            'address_id': order.dest_address_id.id or order.partner_address_id.id,
+            'address_id': order.dest_address_id.id or order.partner_id.id,
             'move_dest_id': order_line.move_dest_id.id,
             'state': 'draft',
             'purchase_line_id': order_line.id,
@@ -574,7 +569,7 @@ class purchase_order(osv.osv):
                     'origin': porder.origin,
                     'date_order': porder.date_order,
                     'partner_id': porder.partner_id.id,
-                    'partner_address_id': porder.partner_address_id.id,
+#                    'partner_address_id': porder.partner_id.id,
                     'dest_address_id': porder.dest_address_id.id,
                     'warehouse_id': porder.warehouse_id.id,
                     'location_id': porder.location_id.id,
@@ -925,7 +920,6 @@ class procurement_order(osv.osv):
                 'name': name,
                 'origin': procurement.origin,
                 'partner_id': partner_id,
-                'partner_address_id': address_id,
                 'location_id': procurement.location_id.id,
                 'warehouse_id': warehouse_id and warehouse_id[0] or False,
                 'pricelist_id': pricelist_id,
diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml
index 6999f85b076..aee902c8e91 100644
--- a/addons/purchase/purchase_demo.xml
+++ b/addons/purchase/purchase_demo.xml
@@ -7,7 +7,7 @@
         </record>
 
         <workflow action="purchase_confirm" model="purchase.order" ref="order_purchase2"/>
-        <workflow action="purchase_confirm" model="purchase.order" ref="order_purchase6"/>
+        <!--workflow action="purchase_confirm" model="purchase.order" ref="order_purchase6"/-->
 
         <record id="stock.res_company_tinyshop0" model="res.company">
             <field eval="1.0" name="po_lead"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 1c936055aff..e6f6929647c 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -62,24 +62,23 @@
         <record id="action_supplier_address_form" model="ir.actions.act_window">
             <field name="name">Addresses</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.partner.address</field>
+            <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
             <field name="context">{"search_default_supplier":1}</field>
-            <field name="search_view_id" ref="base.view_res_partner_address_filter"/>
             <field name="help">Access your supplier records and maintain a good relationship with your suppliers. You can track all your interactions with them through the History tab: emails, orders, meetings, etc.</field>
         </record>
         <record id="action_supplier_address_form_view1" model="ir.actions.act_window.view">
             <field eval="10" name="sequence"/>
             <field name="view_mode">tree</field>
-            <field name="view_id" ref="base.view_partner_address_tree"/>
+            <field name="view_id" ref="base.view_partner_tree"/>
             <field name="act_window_id" ref="action_supplier_address_form"/>
         </record>
-        <record id="action_supplier_address_form_view2" model="ir.actions.act_window.view">
+        <!--record id="action_supplier_address_form_view2" model="ir.actions.act_window.view">
             <field eval="20" name="sequence"/>
             <field name="view_mode">form</field>
             <field name="view_id" ref="base.view_partner_address_form1"/>
             <field name="act_window_id" ref="action_supplier_address_form"/>
-        </record>
+        </record-->
 
      <!--supplier menu-->
       <menuitem id="base.menu_procurement_management_supplier" name="Address Book"
@@ -173,7 +172,7 @@
                     <notebook colspan="4">
                         <page string="Purchase Order">
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}"  options='{"quick_create": false}'/>
-                            <field name="partner_address_id" options='{"quick_create": false}'/>
+                            <!--field name="partner_address_id" options='{"quick_create": false}'/-->
                             <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
                             <field name="origin" groups="base.group_extended"/>
                             <newline/>
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index ffea456d77f..639ac3cfe72 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -167,7 +167,7 @@
               <td>
                 <para style="terp_default_Bold_9">Shipping address :</para>
                 <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id.partner_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']]</para>
-                <para style="terp_default_9">[[ (o.dest_address_id and display_address(o.dest_address_id)) or (o.warehouse_id and displaye_address(o.warehouse_id.partner_address_id)) or '']]</para>
+                <para style="terp_default_9">[[ (o.dest_address_id and display_address(o.partner_id)) or (o.warehouse_id and displaye_address(o.warehouse_id.partner_address_id)) or '']]</para>
               </td>
             </tr>
           </blockTable>
@@ -182,12 +182,12 @@
         </td>
         <td>
           <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_address_id and display_address(o.partner_address_id) ]] </para>
+          <para style="terp_default_9">[[ o.partner_id and display_address(o.partner_id) ]] </para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">Tél. : [[ (o.partner_address_id and o.partner_address_id.phone) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">Fax : [[ (o.partner_address_id and o.partner_address_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Tél. : [[ (o.partner_id and o.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax : [[ (o.partner_id and o.partner_id.fax) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index e3a4a651b7f..99692907591 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -46,8 +46,6 @@ class purchase_report(osv.osv):
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', readonly=True),
         'location_id': fields.many2one('stock.location', 'Destination', readonly=True),
         'partner_id':fields.many2one('res.partner', 'Supplier', readonly=True),
-        'partner_address_id':fields.many2one('res.partner.address', 'Address Contact Name', readonly=True),
-        'dest_address_id':fields.many2one('res.partner.address', 'Dest. Address Contact Name',readonly=True),
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', readonly=True),
         'date_approve':fields.date('Date Approved', readonly=True),
         'expected_date':fields.date('Expected Date', readonly=True),
@@ -82,7 +80,6 @@ class purchase_report(osv.osv):
                     s.state,
                     s.date_approve,
                     date_trunc('day',s.minimum_planned_date) as expected_date,
-                    s.partner_address_id,
                     s.dest_address_id,
                     s.pricelist_id,
                     s.validator,
@@ -122,7 +119,6 @@ class purchase_report(osv.osv):
                     l.date_planned,
                     l.product_uom,
                     date_trunc('day',s.minimum_planned_date),
-                    s.partner_address_id,
                     s.pricelist_id,
                     s.validator,
                     s.dest_address_id,
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index e75d062542c..4d747966699 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -101,12 +101,12 @@
         </td>
         <td>
           <para style="terp_default_9">[[ (order.partner_id and order.partner_id.title and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ order.partner_address_id and display_address(order.partner_address_id) ]] </para>
+          <para style="terp_default_9">[[ order.partner_id and display_address(order.partner_id) ]] </para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">Tel.: [[ (order.partner_address_id and order.partner_address_id.phone) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">Fax: [[ (order.partner_address_id and order.partner_address_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Tel.: [[ (order.partner_id and order.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax: [[ (order.partner_id and order.partner_id.fax) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">TVA: [[ (order.partner_id and order.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 0ea49a9900b..ced9f116cab 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -30,7 +30,7 @@ access_account_invoice_tax_purchase,account_invoice.tax purchase,account.model_a
 access_account_fiscal_position_purchase_user,account.fiscal.position purchase,account.model_account_fiscal_position,group_purchase_user,1,0,0,0
 access_account_sequence_fiscalyear_purchase_user,account.sequence.fiscalyear purchase,account.model_account_sequence_fiscalyear,group_purchase_user,1,1,1,1
 access_res_partner_purchase_user,res.partner purchase,base.model_res_partner,group_purchase_user,1,0,0,0
-access_res_partner_address_purchase_user,res.partner.address purchase,base.model_res_partner_address,group_purchase_user,1,0,0,0
+access_res_partner_purchase_user,res.partner purchase,base.model_res_partner,group_purchase_user,1,0,0,0
 access_account_journal_period,account.journal.period,account.model_account_journal_period,group_purchase_user,1,1,1,0
 access_account_journal,account.journal,account.model_account_journal,group_purchase_user,1,0,0,0
 access_account_journal_manager,account.journal,account.model_account_journal,group_purchase_manager,1,0,0,0
diff --git a/addons/purchase/test/process/edi_purchase_order.yml b/addons/purchase/test/process/edi_purchase_order.yml
index ff49b41157b..549107df23a 100644
--- a/addons/purchase/test/process/edi_purchase_order.yml
+++ b/addons/purchase/test/process/edi_purchase_order.yml
@@ -3,7 +3,6 @@
 -
   !record {model: purchase.order, id: purchase_order_edi_1}:
     partner_id: base.res_partner_agrolait
-    partner_address_id: base.res_partner_address_8invoice
     location_id: stock.stock_location_3
     pricelist_id: 1
     order_line:
@@ -59,7 +58,7 @@
         "partner_address": {
                 "__id": "base:724f93ec-ddd0-11e0-88ec-701a04e25543.res_partner_address_7wdsjasdjh",
                 "__module": "base",
-                "__model": "res.partner.address",
+                "__model": "res.partner",
                 "phone": "(+32).81.81.37.00", 
                 "street": "Chaussee de Namur 40", 
                 "city": "Gerompont", 
@@ -70,7 +69,7 @@
         "company_address": {
                 "__id": "base:724f93ec-ddd0-11e0-88ec-701a04e25543.main_address", 
                 "__module": "base",
-                "__model": "res.partner.address",
+                "__model": "res.partner",
                 "city": "Gerompont", 
                 "zip": "1367", 
                 "country_id": ["base:724f93ec-ddd0-11e0-88ec-701a04e25543.be", "Belgium"], 
diff --git a/addons/purchase/test/process/merge_order.yml b/addons/purchase/test/process/merge_order.yml
index 2ea8b7e2a31..5ba4a1a21f2 100644
--- a/addons/purchase/test/process/merge_order.yml
+++ b/addons/purchase/test/process/merge_order.yml
@@ -26,7 +26,6 @@
        
        assert total_new_qty == total_qty,"product quantities are not correspond" 
        assert order.partner_id == order3.partner_id ,"partner is not correspond"
-       assert order.partner_address_id == order3.partner_address_id ,"Partner address is not correspond"
        assert order.warehouse_id == order3.warehouse_id or order7.warehouse_id,"Warehouse is not correspond"
        assert order.state == 'draft',"New created order state should be in draft"
        assert order.pricelist_id == order3.pricelist_id,"Price list is not correspond"
diff --git a/addons/purchase/test/process/rfq2order2done.yml b/addons/purchase/test/process/rfq2order2done.yml
index 80c9e85778f..a9635fdfe4f 100644
--- a/addons/purchase/test/process/rfq2order2done.yml
+++ b/addons/purchase/test/process/rfq2order2done.yml
@@ -40,7 +40,7 @@
     assert len(purchase_order.picking_ids) >= 1, "You should have only one reception order"
     for picking in purchase_order.picking_ids:
       assert picking.state == "assigned", "Reception state should be in assigned state"
-      assert picking.address_id.id == purchase_order.partner_address_id.id, "Delivery address of reception id is different from order"
+      assert picking.address_id.id == purchase_order.partner_id.id, "Delivery address of reception id is different from order"
       assert picking.company_id.id == purchase_order.company_id.id, "Company is not correspond with purchase order"
 -
   Reception is ready for process so now done the reception.
diff --git a/addons/purchase/wizard/purchase_line_invoice.py b/addons/purchase/wizard/purchase_line_invoice.py
index 236cde7dde5..77cf408949b 100644
--- a/addons/purchase/wizard/purchase_line_invoice.py
+++ b/addons/purchase/wizard/purchase_line_invoice.py
@@ -86,8 +86,8 @@ class purchase_line_invoice(osv.osv_memory):
                     'reference' : partner.ref,
                     'account_id': a,
                     'partner_id': partner.id,
-                    'address_invoice_id': orders[0].partner_address_id.id,
-                    'address_contact_id': orders[0].partner_address_id.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),
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 885f7cd2077..f9da08f4b39 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -190,7 +190,7 @@ class stock_location(osv.osv):
         'chained_picking_type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', help="Shipping Type of the Picking List that will contain the chained move (leave empty to automatically detect the type based on the source and destination locations)."),
         'chained_company_id': fields.many2one('res.company', 'Chained Company', help='The company the Picking List containing the chained move will belong to (leave empty to use the default company determination rules'),
         'chained_delay': fields.integer('Chaining Lead Time',help="Delay between original move and chained move in days"),
-        'address_id': fields.many2one('res.partner.address', 'Location Address',help="Address of  customer or supplier."),
+        'address_id': fields.many2one('res.partner', 'Location Address',help="Address of  customer or supplier."),
         'icon': fields.selection(tools.icons, 'Icon', size=64,help="Icon show in  hierarchical tree view"),
 
         'comment': fields.text('Additional Information'),