From c47834937967061e28a99d61dbda6e2ceb83cf2c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 7 Aug 2013 12:35:45 +0530 Subject: [PATCH 1/2] [fix] [minot] reserved warehouse mandatory validation for packing items --- selling/doctype/sales_common/sales_common.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/selling/doctype/sales_common/sales_common.py b/selling/doctype/sales_common/sales_common.py index 0ca28e230f..04ac8912dc 100644 --- a/selling/doctype/sales_common/sales_common.py +++ b/selling/doctype/sales_common/sales_common.py @@ -115,6 +115,10 @@ class DocType(TransactionBase): reserved_qty_for_main_item = 0 if obj.doc.doctype == "Sales Order": + if (webnotes.conn.get_value("Item", d.item_code, "is_stock_item") == 'Yes' or + self.has_sales_bom(d.item_code)) and not d.reserved_warehouse: + webnotes.throw(_("Please enter Reserved Warehouse for item ") + + d.item_code + _(" as it is stock Item or packing item")) reserved_warehouse = d.reserved_warehouse if flt(d.qty) > flt(d.delivered_qty): reserved_qty_for_main_item = flt(d.qty) - flt(d.delivered_qty) From 1107f20dd66d0557dee1461f4b9047baf9bc441e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 7 Aug 2013 14:33:32 +0530 Subject: [PATCH 2/2] [fix] [minor] bug fixed _ imported --- selling/doctype/sales_common/sales_common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selling/doctype/sales_common/sales_common.py b/selling/doctype/sales_common/sales_common.py index 04ac8912dc..3c43c1ede7 100644 --- a/selling/doctype/sales_common/sales_common.py +++ b/selling/doctype/sales_common/sales_common.py @@ -8,7 +8,7 @@ from webnotes.utils import cint, cstr, flt from webnotes.model.doc import addchild from webnotes.model.bean import getlist from webnotes.model.code import get_obj -from webnotes import msgprint +from webnotes import msgprint, _ from setup.utils import get_company_currency get_value = webnotes.conn.get_value