[REV] purchase: revert incorrect patch for OPW 381630

See discussion on bug 916248

lp bug: https://launchpad.net/bugs/916248 fixed

bzr revid: odo@openerp.com-20120625155746-ehrz6r59m84634v0

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 726fffa..6fa1583 100644 (file)
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -438,16 +438,6 @@ class purchase_order(osv.osv):
     def action_picking_create(self,cr, uid, ids, *args):
         picking_id = False
         for order in self.browse(cr, uid, ids):
-            reception_address_id = False
-            if order.dest_address_id:
-                reception_address_id = order.dest_address_id.id
-            elif order.warehouse_id and order.warehouse_id.partner_address_id:
-                reception_address_id = order.warehouse_id.partner_address_id.id
-            else:
-                if order.company_id.partner_id.address:
-                    addresses_default = [address.id for address in order.company_id.partner_id.address if address.type == 'default']
-                    addresses_delivery = [address.id for address in order.company_id.partner_id.address if address.type == 'delivery']
-                    reception_address_id = (addresses_delivery and addresses_delivery[0]) or (addresses_default and addresses_default[0]) or False
             loc_id = order.partner_id.property_stock_supplier.id
             istate = 'none'
             if order.invoice_method=='picking':
@@ -457,7 +447,7 @@ class purchase_order(osv.osv):
                 'name': pick_name,
                 'origin': order.name+((order.origin and (':'+order.origin)) or ''),
                 'type': 'in',
-                'address_id': reception_address_id,
+                'address_id': order.dest_address_id.id or order.partner_address_id.id,
                 'invoice_state': istate,
                 'purchase_id': order.id,
                 'company_id': order.company_id.id,

diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index f8f01cd..a65f557 100644 (file)
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -31,7 +31,7 @@
             res_model="stock.picking"
            groups="base.group_extended"
             src_model="purchase.order"
-            context="{'contact_display': 'partner_address'}" />
+            context="{'contact_display': 'partner'}" />
        
        <record id="action_picking_in_tree_view" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>