From deedfe20348bade91b6d847eb654fb9658c64a2c Mon Sep 17 00:00:00 2001
From: "Sbh (Openerp)" <sbh@tinyerp.com>
Date: Fri, 30 Mar 2012 13:20:32 +0530
Subject: [PATCH] [IMP] sale: rename address_id with parnter_id

bzr revid: sbh@tinyerp.com-20120330075032-wmbw3kv21h44u60i
---
 addons/sale/sale.py                       | 4 ++--
 addons/sale/sale_unit_test.xml            | 2 +-
 addons/sale/test/picking_order_policy.yml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 93938fa4f8e..d8e8ac60f3d 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -733,7 +733,7 @@ class sale_order(osv.osv):
             'product_uos': (line.product_uos and line.product_uos.id)\
                     or line.product_uom.id,
             'product_packaging': line.product_packaging.id,
-            'address_id': line.address_allotment_id.id or order.partner_shipping_id.id,
+            'partner_id': line.address_allotment_id.id or order.partner_shipping_id.id,
             'location_id': location_id,
             'location_dest_id': output_id,
             'sale_line_id': line.id,
@@ -755,7 +755,7 @@ class sale_order(osv.osv):
             'state': 'auto',
             'move_type': order.picking_policy,
             'sale_id': order.id,
-            'address_id': order.partner_shipping_id.id,
+            'partner_id': order.partner_shipping_id.id,
             'note': order.note,
             'invoice_state': (order.order_policy=='picking' and '2binvoiced') or 'none',
             'company_id': order.company_id.id,
diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml
index 787373dae99..5ce1156a206 100644
--- a/addons/sale/sale_unit_test.xml
+++ b/addons/sale/sale_unit_test.xml
@@ -84,7 +84,7 @@
         </assert>
 
         <assert id="test_order_1" model="sale.order" severity="error" string="the sales order's picking will be sent to the good address and is already confirmed">
-            <test expr="picking_ids[0].address_id == partner_shipping_id"/>
+            <test expr="picking_ids[0].partner_id == partner_shipping_id"/>
             <!-- test expr="picking_ids[0].state">confirmed</test # Desactivated because of MRP_JIT -->
         </assert>
 
diff --git a/addons/sale/test/picking_order_policy.yml b/addons/sale/test/picking_order_policy.yml
index 0d2a2e19a34..f2e3cd0e24a 100644
--- a/addons/sale/test/picking_order_policy.yml
+++ b/addons/sale/test/picking_order_policy.yml
@@ -52,7 +52,7 @@
       assert picking.origin == sale_order.name,"Origin of Delivery order is not correspond with sequence number of sale order."
       assert picking.type == 'out',"Shipment should be Outgoing."
       assert picking.move_type == sale_order.picking_policy,"Delivery Method is not corresponding with delivery method of sale order."
-      assert picking.address_id.id == sale_order.partner_shipping_id.id,"Shipping Address is not correspond with sale order."
+      assert picking.partner_id.id == sale_order.partner_shipping_id.id,"Shipping Address is not correspond with sale order."
       assert picking.note == sale_order.note,"Note is not correspond with sale order."
       assert picking.invoice_state == (sale_order.order_policy=='picking' and '2binvoiced') or 'none',"Invoice policy is not correspond with sale order."
       assert len(picking.move_lines) == len(sale_order.order_line), "Total move of delivery order are not corresposning with total sale order lines."
@@ -69,7 +69,7 @@
          assert move.product_uos_qty == (order_line.product_uos and order_line.product_uos_qty) or order_line.product_uom_qty,"Product UOS Quantity is not correspond."
          assert move.product_uos == (order_line.product_uos and order_line.product_uos.id) or order_line.product_uom.id,"Product UOS is not correspond"
          assert move.product_packaging.id == order_line.product_packaging.id,"Product packaging is not correspond."
-         assert move.address_id.id == order_line.address_allotment_id.id or sale_order.partner_shipping_id.id,"Address is not correspond"
+         assert move.partner_id.id == order_line.address_allotment_id.id or sale_order.partner_shipping_id.id,"Address is not correspond"
          #assert move.location_id.id == location_id,"Source Location is not correspond."
          #assert move.location_dest_id == output_id,"Destination Location is not correspond."
          assert move.note == order_line.notes,"Note is not correspond"