From 05caf0a5ce4d59a4cfdb1a3f4c83239b4f2849f3 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 21 Jan 2013 16:31:05 +0530
Subject: [PATCH] [IMP]remove shop from stock and stock_location
bzr revid: sgo@tinyerp.com-20130121110105-d3teso7rsz7v00rm
---
addons/stock/product.py | 8 --------
addons/stock_location/stock_location_demo_cpu1.xml | 12 ------------
2 files changed, 20 deletions(-)
diff --git a/addons/stock/product.py b/addons/stock/product.py
index ba556884bba..f59c28e1e4e 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -205,7 +205,6 @@ class product_product(osv.osv):
location_obj = self.pool.get('stock.location')
warehouse_obj = self.pool.get('stock.warehouse')
- shop_obj = self.pool.get('sale.shop')
states = context.get('states',[])
what = context.get('what',())
@@ -215,11 +214,6 @@ class product_product(osv.osv):
if not ids:
return res
- if context.get('shop', False):
- warehouse_id = shop_obj.read(cr, uid, int(context['shop']), ['warehouse_id'])['warehouse_id'][0]
- if warehouse_id:
- context['warehouse'] = warehouse_id
-
if context.get('warehouse', False):
lot_id = warehouse_obj.read(cr, uid, int(context['warehouse']), ['lot_stock_id'])['lot_stock_id'][0]
if lot_id:
@@ -370,7 +364,6 @@ class product_product(osv.osv):
"In a context with a single Warehouse, this includes "
"goods stored in the Stock Location of this Warehouse, or any "
"of its children.\n"
- "In a context with a single Shop, this includes goods "
"stored in the Stock Location of the Warehouse of this Shop, "
"or any of its children.\n"
"Otherwise, this includes goods stored in any Stock Location "
@@ -385,7 +378,6 @@ class product_product(osv.osv):
"In a context with a single Warehouse, this includes "
"goods stored in the Stock Location of this Warehouse, or any "
"of its children.\n"
- "In a context with a single Shop, this includes goods "
"stored in the Stock Location of the Warehouse of this Shop, "
"or any of its children.\n"
"Otherwise, this includes goods stored in any Stock Location "
diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml
index 6578a961ff3..1c161792ba6 100644
--- a/addons/stock_location/stock_location_demo_cpu1.xml
+++ b/addons/stock_location/stock_location_demo_cpu1.xml
@@ -76,17 +76,5 @@
-
- Chicago Shop
-
-
-
-
-
- Birmingham shop
-
-
-
-