From 03c1396fc78bb6092cf04c3eac65b8797fed25b7 Mon Sep 17 00:00:00 2001 From: Pranav Nachnekar Date: Thu, 9 Jan 2020 08:01:53 +0000 Subject: [PATCH] fix: Parent Item of Product Bundle should not appear in dialog (#20222) * fix: add new delivery note button in Sales Order * fix: parent item should not appear in raw material request dialog --- erpnext/selling/doctype/sales_order/sales_order.js | 1 + erpnext/selling/doctype/sales_order/sales_order.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 193938a3bb7..45dd51891c9 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -135,6 +135,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( } if(doc.status !== 'Closed') { if(doc.status !== 'On Hold') { + debugger; allow_delivery = this.frm.doc.items.some(item => item.delivered_by_supplier === 0 && item.qty > flt(item.delivered_qty)) && !this.frm.doc.skip_delivery_note diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 978dd29aebe..4a365004da8 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -380,6 +380,9 @@ class SalesOrder(SellingController): def get_work_order_items(self, for_raw_material_request=0): '''Returns items with BOM that already do not have a linked work order''' items = [] + item_codes = [i.item_code for i in self.items] + product_bundle_parents = [pb.new_item_code for pb in frappe.get_all("Product Bundle", {"new_item_code": ["in", item_codes]}, ["new_item_code"])] + for table in [self.items, self.packed_items]: for i in table: bom = get_default_bom_item(i.item_code) @@ -391,7 +394,7 @@ class SalesOrder(SellingController): else: pending_qty = stock_qty - if pending_qty: + if pending_qty and i.item_code not in product_bundle_parents: if bom: items.append(dict( name= i.name,