nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Parent Item of Product Bundle should not appear in dialog (#20222)

Browse Source 
* fix: add new delivery note button in Sales Order

* fix: parent item should not appear in raw material request dialog
This commit is contained in:
Pranav Nachnekar
2020-01-09 08:01:53 +00:00
committed by Nabin Hait
parent 4479b93c1a
commit 03c1396fc7
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/selling/doctype/sales_order/sales_order.js
View File

@@ -135,6 +135,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
} }
if(doc.status !== 'Closed') { if(doc.status !== 'Closed') {
if(doc.status !== 'On Hold') { 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)) 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 && !this.frm.doc.skip_delivery_note

5
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -380,6 +380,9 @@ class SalesOrder(SellingController):
def get_work_order_items(self, for_raw_material_request=0): def get_work_order_items(self, for_raw_material_request=0):
'''Returns items with BOM that already do not have a linked work order''' '''Returns items with BOM that already do not have a linked work order'''
items = [] 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 table in [self.items, self.packed_items]:
for i in table: for i in table:
bom = get_default_bom_item(i.item_code) bom = get_default_bom_item(i.item_code)
@@ -391,7 +394,7 @@ class SalesOrder(SellingController):
else: else:
pending_qty = stock_qty pending_qty = stock_qty
if pending_qty: if pending_qty and i.item_code not in product_bundle_parents:
if bom: if bom:
items.append(dict( items.append(dict(
name= i.name, name= i.name,