From 53bff2650575d091d976696b3e28acc51812714d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 6 Jan 2011 11:07:27 +0530
Subject: [PATCH 1/2] [FIX]: purchase: Fixed pricelist of PO as purchase
 pricelist instead of Public pricelist

bzr revid: rpa@tinyerp.com-20110106053727-srr35ji3wnd56vhn
---
 addons/purchase/purchase_demo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml
index c4d69699d5e..60a59cacb88 100644
--- a/addons/purchase/purchase_demo.xml
+++ b/addons/purchase/purchase_demo.xml
@@ -10,14 +10,14 @@
 
         <record id="order_purchase1" model="purchase.order">
             <field name="location_id" ref="stock.stock_location_stock"/>
-            <field model="product.pricelist" name="pricelist_id" search="[]"/>
+            <field name="pricelist_id" ref="purchase.list0"/>
             <field name="partner_id" ref="base.res_partner_asus"/>
             <field name="partner_address_id" ref="base.res_partner_address_tang"/>
         </record>
 
         <record id="order_purchase2" model="purchase.order">
             <field name="location_id" ref="stock.stock_location_stock"/>
-            <field model="product.pricelist" name="pricelist_id" search="[]"/>
+            <field name="pricelist_id" ref="purchase.list0"/>
             <field name="partner_id" ref="base.res_partner_3"/>
             <field name="partner_address_id" ref="base.res_partner_address_zen"/>
         </record>

From 2d17e1ee573449f2dc452b271fa49a8e0bcf0412 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 13 Jan 2011 18:44:33 +0530
Subject: [PATCH 2/2] [IMP]: stock: when scrapping some stock move, if the
 source location is virtual, and if the destination isn't, take the
 destination location instead of the source as source for the scrapped move

bzr revid: rpa@tinyerp.com-20110113131433-ya5q5ldwrx3jgnra
---
 addons/stock/stock.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 68b6edb5f8d..62e24a3f80a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2221,6 +2221,8 @@ class stock_move(osv.osv):
                 'tracking_id': move.tracking_id.id,
                 'prodlot_id': move.prodlot_id.id,
             }
+            if move.location_id.usage <> 'internal':
+                default_val.update({'location_id': move.location_dest_id.id})
             new_move = self.copy(cr, uid, move.id, default_val)
 
             res += [new_move]