mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-21 22:19:18 +00:00
Merge branch 'latest' of github.com:webnotes/erpnext into latest
This commit is contained in:
@@ -318,7 +318,6 @@ class DocType:
|
|||||||
ch.fields[i] = d[i]
|
ch.fields[i] = d[i]
|
||||||
ch.docstatus = is_submit
|
ch.docstatus = is_submit
|
||||||
ch.save(1)
|
ch.save(1)
|
||||||
|
|
||||||
self.doc.save()
|
self.doc.save()
|
||||||
|
|
||||||
|
|
||||||
@@ -351,10 +350,6 @@ class DocType:
|
|||||||
""" Get all raw materials including items from child bom"""
|
""" Get all raw materials including items from child bom"""
|
||||||
self.cur_flat_bom_items = []
|
self.cur_flat_bom_items = []
|
||||||
for d in getlist(self.doclist, 'bom_materials'):
|
for d in getlist(self.doclist, 'bom_materials'):
|
||||||
item = {}
|
|
||||||
if d.bom_no:
|
|
||||||
item = sql("select is_sub_contracted_item from `tabItem` where name = '%s'" % d.item_code)
|
|
||||||
|
|
||||||
self.cur_flat_bom_items.append({
|
self.cur_flat_bom_items.append({
|
||||||
'item_code' : d.item_code,
|
'item_code' : d.item_code,
|
||||||
'description' : d.description,
|
'description' : d.description,
|
||||||
|
|||||||
Reference in New Issue
Block a user