From 0555a1f10c87e2f0d71b3d3c4a2e574a8f57eada Mon Sep 17 00:00:00 2001 From: "Hiral Patel (OpenERP)" Date: Wed, 5 Dec 2012 17:38:50 +0530 Subject: [PATCH 1/5] [FIX][trunk] stock - Error in new company bzr revid: hip@tinyerp.com-20121205120850-y2ob7y6a2bk3956f --- addons/stock/security/ir.model.access.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv index 84b475adf1d..2f93bfee3c6 100644 --- a/addons/stock/security/ir.model.access.csv +++ b/addons/stock/security/ir.model.access.csv @@ -62,3 +62,4 @@ access_product_pricelist_version_stock_manager,product.pricelist.version stock_m access_product_pricelist_item_stock_manager,product.pricelist.item stock_manager,product.model_product_pricelist_item,stock.group_stock_manager,1,1,1,1 access_account_account_stock_manager,account.account stock manager,account.model_account_account,stock.group_stock_manager,1,0,0,0 access_board_stock_user,board.board user,board.model_board_board,stock.group_stock_user,1,1,0,0 +access_stock_warehouse_salesman,stock.warehouse,stock.model_stock_warehouse,base.group_sale_salesman,1,0,0,0 \ No newline at end of file From 3bab853d8e5cef32b1ddca94e18ac4799b724993 Mon Sep 17 00:00:00 2001 From: "Hiral Patel (OpenERP)" Date: Wed, 12 Dec 2012 11:52:33 +0530 Subject: [PATCH 2/5] [Rev] Revert the unwanted commit bzr revid: hip@tinyerp.com-20121212062233-ajnbznvn0bhxsrsn --- addons/stock/security/ir.model.access.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv index 2f93bfee3c6..84b475adf1d 100644 --- a/addons/stock/security/ir.model.access.csv +++ b/addons/stock/security/ir.model.access.csv @@ -62,4 +62,3 @@ access_product_pricelist_version_stock_manager,product.pricelist.version stock_m access_product_pricelist_item_stock_manager,product.pricelist.item stock_manager,product.model_product_pricelist_item,stock.group_stock_manager,1,1,1,1 access_account_account_stock_manager,account.account stock manager,account.model_account_account,stock.group_stock_manager,1,0,0,0 access_board_stock_user,board.board user,board.model_board_board,stock.group_stock_user,1,1,0,0 -access_stock_warehouse_salesman,stock.warehouse,stock.model_stock_warehouse,base.group_sale_salesman,1,0,0,0 \ No newline at end of file From 72024d0fe51f5150ff5890047ad8387cff9288b8 Mon Sep 17 00:00:00 2001 From: "Hiral Patel (OpenERP)" Date: Wed, 12 Dec 2012 11:59:32 +0530 Subject: [PATCH 3/5] [FIX][trunk] stock - Error in new company bzr revid: hip@tinyerp.com-20121212062932-aijgsk27m0sl1qv5 --- addons/stock/product.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/stock/product.py b/addons/stock/product.py index 4d955495c28..abd74fb3a97 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -235,6 +235,8 @@ class product_product(osv.osv): else: location_ids = [] wids = warehouse_obj.search(cr, uid, [], context=context) + if not wids: + return res for w in warehouse_obj.browse(cr, uid, wids, context=context): location_ids.append(w.lot_stock_id.id) From 6d9b41b3bf0a99e699f7fc0670129120c5c6e1d4 Mon Sep 17 00:00:00 2001 From: "Hiral Patel (OpenERP)" Date: Thu, 31 Jan 2013 15:23:36 +0530 Subject: [PATCH 4/5] [IMP] Improve the code bzr revid: hip@tinyerp.com-20130131095336-317ww7oe391tg2wk --- addons/stock/product.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/product.py b/addons/stock/product.py index 1d56ce64988..ba855e0409b 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -235,10 +235,10 @@ class product_product(osv.osv): else: location_ids = [] wids = warehouse_obj.search(cr, uid, [], context=context) - if not wids: - return res for w in warehouse_obj.browse(cr, uid, wids, context=context): location_ids.append(w.lot_stock_id.id) + else: + return res # build the list of ids of children of the location given by id if context.get('compute_child',True): From 3a614884ccfef322a022543ac0c55db71cd98880 Mon Sep 17 00:00:00 2001 From: "Hiral Patel (OpenERP)" Date: Thu, 31 Jan 2013 16:40:36 +0530 Subject: [PATCH 5/5] [REV] Revert the changes bzr revid: hip@tinyerp.com-20130131111036-picfcuvfq4zhjk0m --- addons/stock/product.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/product.py b/addons/stock/product.py index ba855e0409b..1d56ce64988 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -235,10 +235,10 @@ class product_product(osv.osv): else: location_ids = [] wids = warehouse_obj.search(cr, uid, [], context=context) + if not wids: + return res for w in warehouse_obj.browse(cr, uid, wids, context=context): location_ids.append(w.lot_stock_id.id) - else: - return res # build the list of ids of children of the location given by id if context.get('compute_child',True):