Merge pull request #26514 from ankush/backport/develop/pr-26240
feat: provision to make subcontracted purchase order from the production plan (#26240)
diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
index 1dbd7c6..132dd17 100644
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -97,6 +97,9 @@
"is_fixed_asset",
"item_tax_rate",
"section_break_72",
+ "production_plan",
+ "production_plan_item",
+ "production_plan_sub_assembly_item",
"page_break"
],
"fields": [
@@ -803,13 +806,37 @@
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1
+ },
+ {
+ "fieldname": "production_plan",
+ "fieldtype": "Link",
+ "label": "Production Plan",
+ "options": "Production Plan",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "production_plan_item",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Production Plan Item",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "production_plan_sub_assembly_item",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Production Plan Sub Assembly Item",
+ "no_copy": 1,
+ "read_only": 1
}
],
"idx": 1,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2021-03-22 11:46:12.357435",
+ "modified": "2021-06-28 19:22:22.715365",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order Item",
diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json
index f38d1b9..7e53918 100644
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json
@@ -36,6 +36,9 @@
"materials_section",
"inspection_required",
"quality_inspection_template",
+ "column_break_31",
+ "bom_level",
+ "section_break_33",
"items",
"scrap_section",
"scrap_items",
@@ -513,6 +516,22 @@
"no_copy": 1,
"print_hide": 1,
"read_only": 1
+ },
+ {
+ "fieldname": "column_break_31",
+ "fieldtype": "Column Break"
+ },
+ {
+ "default": "0",
+ "fieldname": "bom_level",
+ "fieldtype": "Int",
+ "label": "BOM Level",
+ "read_only": 1
+ },
+ {
+ "fieldname": "section_break_33",
+ "fieldtype": "Section Break",
+ "hide_border": 1
}
],
"icon": "fa fa-sitemap",
@@ -520,7 +539,7 @@
"image_field": "image",
"is_submittable": 1,
"links": [],
- "modified": "2021-03-16 12:25:09.081968",
+ "modified": "2021-05-16 12:25:09.081968",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "BOM",
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 3bd1fe6..c32a8a9 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -154,6 +154,7 @@
self.calculate_cost()
self.update_stock_qty()
self.update_cost(update_parent=False, from_child_bom=True, update_hour_rate = False, save=False)
+ self.set_bom_level()
def get_context(self, context):
context.parents = [{'name': 'boms', 'title': _('All BOMs') }]
@@ -676,6 +677,19 @@
"""Get a complete tree representation preserving order of child items."""
return BOMTree(self.name)
+ def set_bom_level(self, update=False):
+ levels = []
+
+ self.bom_level = 0
+ for row in self.items:
+ if row.bom_no:
+ levels.append(frappe.get_cached_value("BOM", row.bom_no, "bom_level") or 0)
+
+ if levels:
+ self.bom_level = max(levels) + 1
+
+ if update:
+ self.db_set("bom_level", self.bom_level)
def get_bom_item_rate(args, bom_doc):
if bom_doc.rm_cost_as_per == 'Valuation Rate':
@@ -860,7 +874,7 @@
frappe.form_dict.parent = parent
if frappe.form_dict.parent:
- bom_doc = frappe.get_doc("BOM", frappe.form_dict.parent)
+ bom_doc = frappe.get_cached_doc("BOM", frappe.form_dict.parent)
frappe.has_permission("BOM", doc=bom_doc, throw=True)
bom_items = frappe.get_all('BOM Item',
@@ -871,7 +885,7 @@
item_names = tuple(d.get('item_code') for d in bom_items)
items = frappe.get_list('Item',
- fields=['image', 'description', 'name', 'stock_uom', 'item_name'],
+ fields=['image', 'description', 'name', 'stock_uom', 'item_name', 'is_sub_contracted_item'],
filters=[['name', 'in', item_names]]) # to get only required item dicts
for bom_item in bom_items:
@@ -884,6 +898,7 @@
bom_item.parent_bom_qty = bom_doc.quantity
bom_item.expandable = 0 if bom_item.value in ('', None) else 1
+ bom_item.image = frappe.db.escape(bom_item.image)
return bom_items
diff --git a/erpnext/manufacturing/doctype/bom/bom_item_preview.html b/erpnext/manufacturing/doctype/bom/bom_item_preview.html
index 6cd5f8c..6088e46 100644
--- a/erpnext/manufacturing/doctype/bom/bom_item_preview.html
+++ b/erpnext/manufacturing/doctype/bom/bom_item_preview.html
@@ -1,13 +1,31 @@
<div style="padding: 15px;">
- {% if data.image %}
- <img class="responsive" src={{ data.image }}>
- <hr style="margin: 15px -15px;">
- {% endif %}
- <h4>
- {{ __("Description") }}
- </h4>
- <div style="padding-top: 10px;">
- {{ data.description }}
+ <div class="row mb-5">
+ <div class="col-md-5" style="max-height: 500px">
+ {% if data.image %}
+ <div class="border image-field " style="overflow: hidden;border-color:#e6e6e6">
+ <img class="responsive" src={{ data.image }}>
+ </div>
+ {% endif %}
+ </div>
+ <div class="col-md-7 h-500">
+ <h4>
+ {{ __("Description") }}
+ </h4>
+ <div style="padding-top: 10px;">
+ {{ data.description }}
+ </div>
+ <hr style="margin: 15px -15px;">
+ <p>
+ {% if data.value %}
+ <a style="margin-right: 7px; margin-bottom: 7px" class="btn btn-default btn-xs" href="#Form/BOM/{{ data.value }}">
+ {{ __("Open BOM {0}", [data.value.bold()]) }}</a>
+ {% endif %}
+ {% if data.item_code %}
+ <a class="btn btn-default btn-xs" href="#Form/Item/{{ data.item_code }}">
+ {{ __("Open Item {0}", [data.item_code.bold()]) }}</a>
+ {% endif %}
+ </p>
+ </div>
</div>
<hr style="margin: 15px -15px;">
<p>
diff --git a/erpnext/manufacturing/doctype/bom/bom_tree.js b/erpnext/manufacturing/doctype/bom/bom_tree.js
index 185b9ed..60fb377 100644
--- a/erpnext/manufacturing/doctype/bom/bom_tree.js
+++ b/erpnext/manufacturing/doctype/bom/bom_tree.js
@@ -64,7 +64,7 @@
if(node.is_root && node.data.value!="BOM") {
frappe.model.with_doc("BOM", node.data.value, function() {
var bom = frappe.model.get_doc("BOM", node.data.value);
- node.data.image = bom.image || "";
+ node.data.image = escape(bom.image) || "";
node.data.description = bom.description || "";
});
}
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.js b/erpnext/manufacturing/doctype/production_plan/production_plan.js
index 450aa04..d198a69 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.js
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.js
@@ -4,7 +4,7 @@
frappe.ui.form.on('Production Plan', {
setup: function(frm) {
frm.custom_make_buttons = {
- 'Work Order': 'Work Order',
+ 'Work Order': 'Work Order / Subcontract PO',
'Material Request': 'Material Request',
};
@@ -68,17 +68,13 @@
frm.trigger("show_progress");
if (frm.doc.status !== "Completed") {
- if (frm.doc.po_items && frm.doc.status !== "Closed") {
- frm.add_custom_button(__("Work Order"), ()=> {
- frm.trigger("make_work_order");
- }, __('Create'));
- }
+ frm.add_custom_button(__("Work Order Tree"), ()=> {
+ frappe.set_route('Tree', 'Work Order', {production_plan: frm.doc.name});
+ }, __('View'));
- if (frm.doc.mr_items && !in_list(['Material Requested', 'Closed'], frm.doc.status)) {
- frm.add_custom_button(__("Material Request"), ()=> {
- frm.trigger("make_material_request");
- }, __('Create'));
- }
+ frm.add_custom_button(__("Production Plan Summary"), ()=> {
+ frappe.set_route('query-report', 'Production Plan Summary', {production_plan: frm.doc.name});
+ }, __('View'));
if (frm.doc.status === "Closed") {
frm.add_custom_button(__("Re-open"), function() {
@@ -89,6 +85,18 @@
frm.events.close_open_production_plan(frm, true);
}, __("Status"));
}
+
+ if (frm.doc.po_items && frm.doc.status !== "Closed") {
+ frm.add_custom_button(__("Work Order / Subcontract PO"), ()=> {
+ frm.trigger("make_work_order");
+ }, __('Create'));
+ }
+
+ if (frm.doc.mr_items && !in_list(['Material Requested', 'Closed'], frm.doc.status)) {
+ frm.add_custom_button(__("Material Request"), ()=> {
+ frm.trigger("make_material_request");
+ }, __('Create'));
+ }
}
}
@@ -233,6 +241,17 @@
});
},
+ get_sub_assembly_items: function(frm) {
+ frappe.call({
+ method: "get_sub_assembly_items",
+ freeze: true,
+ doc: frm.doc,
+ callback: function() {
+ refresh_field("sub_assembly_items");
+ }
+ });
+ },
+
get_items_for_mr: function(frm) {
if (!frm.doc.for_warehouse) {
frappe.throw(__("Select warehouse for material requests"));
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.json b/erpnext/manufacturing/doctype/production_plan/production_plan.json
index 1c0dde2..8437895 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.json
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.json
@@ -32,6 +32,9 @@
"po_items",
"section_break_25",
"prod_plan_references",
+ "section_break_24",
+ "get_sub_assembly_items",
+ "sub_assembly_items",
"material_request_planning",
"include_non_stock_items",
"include_subcontracted_items",
@@ -187,7 +190,7 @@
"depends_on": "get_items_from",
"fieldname": "get_items",
"fieldtype": "Button",
- "label": "Get Items For Work Order"
+ "label": "Get Finished Goods for Manufacture"
},
{
"fieldname": "po_items",
@@ -199,7 +202,7 @@
{
"fieldname": "material_request_planning",
"fieldtype": "Section Break",
- "label": "Material Request Planning"
+ "label": "Material Requirement Planning"
},
{
"default": "1",
@@ -237,12 +240,13 @@
},
{
"fieldname": "section_break_27",
- "fieldtype": "Section Break"
+ "fieldtype": "Section Break",
+ "hide_border": 1
},
{
"fieldname": "mr_items",
"fieldtype": "Table",
- "label": "Material Request Plan Item",
+ "label": "Raw Materials",
"no_copy": 1,
"options": "Material Request Plan Item"
},
@@ -337,13 +341,30 @@
"hidden": 1,
"label": "Production Plan Item Reference",
"options": "Production Plan Item Reference"
+ },
+ {
+ "fieldname": "section_break_24",
+ "fieldtype": "Section Break",
+ "hide_border": 1
+ },
+ {
+ "fieldname": "sub_assembly_items",
+ "fieldtype": "Table",
+ "label": "Sub Assembly Items",
+ "no_copy": 1,
+ "options": "Production Plan Sub Assembly Item"
+ },
+ {
+ "fieldname": "get_sub_assembly_items",
+ "fieldtype": "Button",
+ "label": "Get Sub Assembly Items"
}
],
"icon": "fa fa-calendar",
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2021-05-24 16:59:03.643211",
+ "modified": "2021-06-28 20:00:33.905114",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Production Plan",
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index 0ede1bd..38a0ee7 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -5,10 +5,11 @@
from __future__ import unicode_literals
import frappe, json, copy
from frappe import msgprint, _
-from six import string_types, iteritems
+from six import iteritems
from frappe.model.document import Document
-from frappe.utils import cstr, flt, cint, nowdate, add_days, comma_and, now_datetime, ceil
+from frappe.utils import (flt, cint, nowdate, add_days, comma_and, now_datetime,
+ ceil, get_link_to_form, getdate)
from frappe.utils.csvutils import build_csv_response
from erpnext.manufacturing.doctype.bom.bom import validate_bom_no, get_children
from erpnext.manufacturing.doctype.work_order.work_order import get_item_details
@@ -349,49 +350,88 @@
@frappe.whitelist()
def make_work_order(self):
- wo_list = []
+ wo_list, po_list = [], []
+ subcontracted_po = {}
+
self.validate_data()
+ self.make_work_order_for_finished_goods(wo_list)
+ self.make_work_order_for_subassembly_items(wo_list, subcontracted_po)
+ self.make_subcontracted_purchase_order(subcontracted_po, po_list)
+ self.show_list_created_message('Work Order', wo_list)
+ self.show_list_created_message('Purchase Order', po_list)
+
+ def make_work_order_for_finished_goods(self, wo_list):
items_data = self.get_production_items()
for key, item in items_data.items():
+ if self.sub_assembly_items:
+ item['use_multi_level_bom'] = 0
+
work_order = self.create_work_order(item)
if work_order:
wo_list.append(work_order)
- if item.get("make_work_order_for_sub_assembly_items"):
- work_orders = self.make_work_order_for_sub_assembly_items(item)
- wo_list.extend(work_orders)
+ def make_work_order_for_subassembly_items(self, wo_list, subcontracted_po):
+ for row in self.sub_assembly_items:
+ if row.type_of_manufacturing == 'Subcontract':
+ subcontracted_po.setdefault(row.supplier, []).append(row)
+ continue
+
+ args = {}
+ self.prepare_args_for_sub_assembly_items(row, args)
+ work_order = self.create_work_order(args)
+ if work_order:
+ wo_list.append(work_order)
+
+ def make_subcontracted_purchase_order(self, subcontracted_po, purchase_orders):
+ if not subcontracted_po:
+ return
+
+ for supplier, po_list in subcontracted_po.items():
+ po = frappe.new_doc('Purchase Order')
+ po.supplier = supplier
+ po.schedule_date = getdate(po_list[0].schedule_date) if po_list[0].schedule_date else nowdate()
+ po.is_subcontracted_item = 'Yes'
+ for row in po_list:
+ args = {
+ 'item_code': row.production_item,
+ 'warehouse': row.fg_warehouse,
+ 'production_plan_sub_assembly_item': row.name,
+ 'bom': row.bom_no,
+ 'production_plan': self.name
+ }
+
+ for field in ['schedule_date', 'qty', 'uom', 'stock_uom', 'item_name',
+ 'description', 'production_plan_item']:
+ args[field] = row.get(field)
+
+ po.append('items', args)
+
+ po.set_missing_values()
+ po.flags.ignore_mandatory = True
+ po.flags.ignore_validate = True
+ po.insert()
+ purchase_orders.append(po.name)
+
+ def show_list_created_message(self, doctype, doc_list=None):
+ if not doc_list:
+ return
frappe.flags.mute_messages = False
+ if doc_list:
+ doc_list = [get_link_to_form(doctype, p) for p in doc_list]
+ msgprint(_("{0} created").format(comma_and(doc_list)))
- if wo_list:
- wo_list = ["""<a href="/app/Form/Work Order/%s" target="_blank">%s</a>""" % \
- (p, p) for p in wo_list]
- msgprint(_("{0} created").format(comma_and(wo_list)))
- else :
- msgprint(_("No Work Orders created"))
+ def prepare_args_for_sub_assembly_items(self, row, args):
+ for field in ["production_item", "item_name", "qty", "fg_warehouse",
+ "description", "bom_no", "stock_uom", "bom_level", "production_plan_item"]:
+ args[field] = row.get(field)
- def make_work_order_for_sub_assembly_items(self, item):
- work_orders = []
- bom_data = {}
-
- get_sub_assembly_items(item.get("bom_no"), bom_data, item.get("qty"))
-
- for key, data in bom_data.items():
- data.update({
- 'qty': data.get("stock_qty"),
- 'production_plan': self.name,
- 'use_multi_level_bom': item.get("use_multi_level_bom"),
- 'company': self.company,
- 'fg_warehouse': item.get("fg_warehouse"),
- 'update_consumed_material_cost_in_project': 0
- })
-
- work_order = self.create_work_order(data)
- if work_order:
- work_orders.append(work_order)
-
- return work_orders
+ args.update({
+ "use_multi_level_bom": 0,
+ "production_plan": self.name,
+ "production_plan_sub_assembly_item": row.name
+ })
def create_work_order(self, item):
from erpnext.manufacturing.doctype.work_order.work_order import OverProductionError, get_default_warehouse
@@ -476,9 +516,32 @@
else :
msgprint(_("No material request created"))
+ @frappe.whitelist()
+ def get_sub_assembly_items(self, manufacturing_type=None):
+ self.sub_assembly_items = []
+ for row in self.po_items:
+ bom_data = []
+ get_sub_assembly_items(row.bom_no, bom_data, row.planned_qty)
+ self.set_sub_assembly_items_based_on_level(row, bom_data, manufacturing_type)
+
+ self.save()
+
+ def set_sub_assembly_items_based_on_level(self, row, bom_data, manufacturing_type=None):
+ bom_data = sorted(bom_data, key = lambda i: i.bom_level)
+
+ for data in bom_data:
+ data.qty = data.stock_qty
+ data.production_plan_item = row.name
+ data.fg_warehouse = row.warehouse
+ data.schedule_date = row.planned_start_date
+ data.type_of_manufacturing = manufacturing_type or ("Subcontract" if data.is_sub_contracted_item
+ else "In House")
+
+ self.append("sub_assembly_items", data)
+
@frappe.whitelist()
def download_raw_materials(doc, warehouses=None):
- if isinstance(doc, string_types):
+ if isinstance(doc, str):
doc = frappe._dict(json.loads(doc))
item_list = [['Item Code', 'Description', 'Stock UOM', 'Warehouse', 'Required Qty as per BOM',
@@ -660,7 +723,7 @@
@frappe.whitelist()
def get_bin_details(row, company, for_warehouse=None, all_warehouse=False):
- if isinstance(row, string_types):
+ if isinstance(row, str):
row = frappe._dict(json.loads(row))
company = frappe.db.escape(company)
@@ -684,8 +747,11 @@
group by item_code, warehouse
""".format(conditions=conditions), { "item_code": row['item_code'] }, as_dict=1)
-def get_warehouse_list(warehouses, warehouse_list=[]):
- if isinstance(warehouses, string_types):
+def get_warehouse_list(warehouses, warehouse_list=None):
+ if not warehouse_list:
+ warehouse_list = []
+
+ if isinstance(warehouses, str):
warehouses = json.loads(warehouses)
for row in warehouses:
@@ -697,7 +763,7 @@
@frappe.whitelist()
def get_items_for_material_requests(doc, warehouses=None, get_parent_warehouse_data=None):
- if isinstance(doc, string_types):
+ if isinstance(doc, str):
doc = frappe._dict(json.loads(doc))
warehouse_list = []
@@ -726,6 +792,9 @@
so_item_details = frappe._dict()
for data in po_items:
+ if not data.get("include_exploded_items") and doc.get("sub_assembly_items"):
+ data["include_exploded_items"] = 1
+
planned_qty = data.get('required_qty') or data.get('planned_qty')
ignore_existing_ordered_qty = data.get('ignore_existing_ordered_qty') or ignore_existing_ordered_qty
warehouse = doc.get('for_warehouse')
@@ -857,23 +926,28 @@
# "description": item_details.get("description")
}
-def get_sub_assembly_items(bom_no, bom_data, to_produce_qty):
+def get_sub_assembly_items(bom_no, bom_data, to_produce_qty, indent=0):
data = get_children('BOM', parent = bom_no)
for d in data:
if d.expandable:
- key = (d.name, d.value)
- if key not in bom_data:
- bom_data.setdefault(key, {
- 'stock_qty': 0,
- 'description': d.description,
- 'production_item': d.item_code,
- 'item_name': d.item_name,
- 'stock_uom': d.stock_uom,
- 'uom': d.stock_uom,
- 'bom_no': d.value
- })
+ parent_item_code = frappe.get_cached_value("BOM", bom_no, "item")
+ bom_level = (frappe.get_cached_value("BOM", d.value, "bom_level")
+ if d.value else 0)
- bom_item = bom_data.get(key)
- bom_item["stock_qty"] += (d.stock_qty / d.parent_bom_qty) * flt(to_produce_qty)
+ stock_qty = (d.stock_qty / d.parent_bom_qty) * flt(to_produce_qty)
+ bom_data.append(frappe._dict({
+ 'parent_item_code': parent_item_code,
+ 'description': d.description,
+ 'production_item': d.item_code,
+ 'item_name': d.item_name,
+ 'stock_uom': d.stock_uom,
+ 'uom': d.stock_uom,
+ 'bom_no': d.value,
+ 'is_sub_contracted_item': d.is_sub_contracted_item,
+ 'bom_level': bom_level,
+ 'indent': indent,
+ 'stock_qty': stock_qty
+ }))
- get_sub_assembly_items(bom_item.get("bom_no"), bom_data, bom_item["stock_qty"])
+ if d.value:
+ get_sub_assembly_items(d.value, bom_data, stock_qty, indent=indent+1)
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py b/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py
index 09ec24a..ca597f6 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py
@@ -9,5 +9,9 @@
'label': _('Transactions'),
'items': ['Work Order', 'Material Request']
},
+ {
+ 'label': _('Subcontract'),
+ 'items': ['Purchase Order']
+ },
]
}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
index 768f99e..cce1bb6 100644
--- a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
@@ -169,7 +169,7 @@
pln.get_items()
pln.submit()
- self.assertTrue(pln.po_items[0].planned_qty, 3)
+ self.assertTrue(pln.po_items[0].planned_qty, 3)
pln.make_work_order()
work_order = frappe.db.get_value('Work Order', {
@@ -193,10 +193,10 @@
for so_item in so_items:
so_wo_qty = frappe.db.get_value('Sales Order Item', so_item, 'work_order_qty')
self.assertEqual(so_wo_qty, 0.0)
-
+
latest_plan = frappe.get_doc('Production Plan', pln.name)
latest_plan.cancel()
-
+
def test_pp_to_mr_customer_provided(self):
#Material Request from Production Plan for Customer Provided
create_item('CUST-0987', is_customer_provided_item = 1, customer = '_Test Customer', is_purchase_item = 0)
@@ -236,10 +236,10 @@
pln.append("po_items", {
"item_code": item_code,
"bom_no": frappe.db.get_value('BOM', {'item': "Test BOM 1"}),
- "planned_qty": 3,
- "make_work_order_for_sub_assembly_items": 1
+ "planned_qty": 3
})
+ pln.get_sub_assembly_items('In House')
pln.submit()
pln.make_work_order()
diff --git a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
index 89ab7aa..f829d57 100644
--- a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
+++ b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
@@ -9,18 +9,17 @@
"include_exploded_items",
"item_code",
"bom_no",
- "planned_qty",
"column_break_6",
- "make_work_order_for_sub_assembly_items",
+ "planned_qty",
"warehouse",
"planned_start_date",
"section_break_9",
"pending_qty",
"ordered_qty",
- "produced_qty",
"column_break_17",
"description",
"stock_uom",
+ "produced_qty",
"reference_section",
"sales_order",
"sales_order_item",
@@ -32,11 +31,10 @@
],
"fields": [
{
- "columns": 2,
- "default": "0",
+ "columns": 1,
+ "default": "1",
"fieldname": "include_exploded_items",
"fieldtype": "Check",
- "in_list_view": 1,
"label": "Include Exploded Items"
},
{
@@ -81,13 +79,6 @@
"fieldtype": "Column Break"
},
{
- "default": "0",
- "description": "If enabled, system will create the work order for the exploded items against which BOM is available.",
- "fieldname": "make_work_order_for_sub_assembly_items",
- "fieldtype": "Check",
- "label": "Make Work Order for Sub Assembly Items"
- },
- {
"fieldname": "warehouse",
"fieldtype": "Link",
"in_list_view": 1,
@@ -218,7 +209,7 @@
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2021-04-28 19:14:57.772123",
+ "modified": "2021-06-28 18:31:06.822168",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Production Plan Item",
diff --git a/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/__init__.py b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/__init__.py
diff --git a/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
new file mode 100644
index 0000000..657ee35
--- /dev/null
+++ b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
@@ -0,0 +1,202 @@
+{
+ "actions": [],
+ "creation": "2020-12-27 16:08:36.127199",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "production_item",
+ "item_name",
+ "fg_warehouse",
+ "parent_item_code",
+ "schedule_date",
+ "column_break_3",
+ "qty",
+ "bom_no",
+ "bom_level",
+ "type_of_manufacturing",
+ "supplier",
+ "work_order_details_section",
+ "work_order",
+ "purchase_order",
+ "production_plan_item",
+ "column_break_7",
+ "produced_qty",
+ "received_qty",
+ "indent",
+ "section_break_19",
+ "uom",
+ "stock_uom",
+ "column_break_22",
+ "description"
+ ],
+ "fields": [
+ {
+ "fetch_from": "sub_assembly_item_code.item_name",
+ "fieldname": "item_name",
+ "fieldtype": "Data",
+ "label": "Item Name",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_3",
+ "fieldtype": "Column Break"
+ },
+ {
+ "depends_on": "eval:doc.type_of_manufacturing == \"In House\"",
+ "fieldname": "work_order_details_section",
+ "fieldtype": "Section Break",
+ "label": "Reference"
+ },
+ {
+ "fieldname": "work_order",
+ "fieldtype": "Link",
+ "label": "Work Order",
+ "options": "Work Order",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_7",
+ "fieldtype": "Column Break"
+ },
+ {
+ "columns": 1,
+ "fieldname": "qty",
+ "fieldtype": "Float",
+ "in_list_view": 1,
+ "label": "Required Qty",
+ "read_only": 1
+ },
+ {
+ "fieldname": "purchase_order",
+ "fieldtype": "Link",
+ "label": "Purchase Order",
+ "options": "Purchase Order",
+ "read_only": 1
+ },
+ {
+ "fieldname": "received_qty",
+ "fieldtype": "Float",
+ "label": "Received Qty"
+ },
+ {
+ "fieldname": "bom_no",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Bom No",
+ "options": "BOM"
+ },
+ {
+ "fieldname": "production_plan_item",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Production Plan Item",
+ "read_only": 1
+ },
+ {
+ "fieldname": "parent_item_code",
+ "fieldtype": "Link",
+ "label": "Finished Good",
+ "options": "Item",
+ "read_only": 1
+ },
+ {
+ "columns": 1,
+ "fetch_from": "bom_no.bom_level",
+ "fieldname": "bom_level",
+ "fieldtype": "Int",
+ "in_list_view": 1,
+ "label": "Level (BOM)",
+ "read_only": 1
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "section_break_19",
+ "fieldtype": "Section Break",
+ "label": "Item Details"
+ },
+ {
+ "fieldname": "uom",
+ "fieldtype": "Link",
+ "label": "UOM",
+ "options": "UOM",
+ "read_only": 1
+ },
+ {
+ "fieldname": "stock_uom",
+ "fieldtype": "Link",
+ "label": "Stock UOM",
+ "options": "UOM",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_22",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "label": "description",
+ "read_only": 1
+ },
+ {
+ "fieldname": "production_item",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Sub Assembly Item Code",
+ "options": "Item",
+ "read_only": 1
+ },
+ {
+ "fieldname": "indent",
+ "fieldtype": "Int",
+ "label": "Indent"
+ },
+ {
+ "fieldname": "fg_warehouse",
+ "fieldtype": "Link",
+ "label": "Target Warehouse",
+ "options": "Warehouse"
+ },
+ {
+ "fieldname": "produced_qty",
+ "fieldtype": "Data",
+ "label": "Produced Quantity",
+ "read_only": 1
+ },
+ {
+ "default": "In House",
+ "fieldname": "type_of_manufacturing",
+ "fieldtype": "Select",
+ "in_list_view": 1,
+ "label": "Manufacturing Type",
+ "options": "In House\nSubcontract"
+ },
+ {
+ "fieldname": "supplier",
+ "fieldtype": "Link",
+ "label": "Supplier",
+ "mandatory_depends_on": "eval:doc.type_of_manufacturing == 'Subcontract'",
+ "options": "Supplier"
+ },
+ {
+ "fieldname": "schedule_date",
+ "fieldtype": "Datetime",
+ "in_list_view": 1,
+ "label": "Schedule Date"
+ }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2021-06-28 20:10:56.296410",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Production Plan Sub Assembly Item",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.py b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.py
new file mode 100644
index 0000000..6850a2e
--- /dev/null
+++ b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class ProductionPlanSubAssemblyItem(Document):
+ pass
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.json b/erpnext/manufacturing/doctype/work_order/work_order.json
index 44d76d2..3b56854 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.json
+++ b/erpnext/manufacturing/doctype/work_order/work_order.json
@@ -64,11 +64,16 @@
"description",
"stock_uom",
"column_break2",
+ "references_section",
"material_request",
"material_request_item",
"sales_order_item",
+ "column_break_61",
"production_plan",
"production_plan_item",
+ "production_plan_sub_assembly_item",
+ "parent_work_order",
+ "bom_level",
"product_bundle_item",
"amended_from"
],
@@ -546,17 +551,26 @@
"no_copy": 1,
"print_hide": 1,
"read_only": 1
- }
+ },
+ {
+ "fieldname": "production_plan_sub_assembly_item",
+ "fieldtype": "Data",
+ "label": "Production Plan Sub-assembly Item",
+ "no_copy": 1,
+ "print_hide": 1,
+ "read_only": 1
+ }
],
"icon": "fa fa-cogs",
"idx": 1,
"image_field": "image",
"is_submittable": 1,
"links": [],
- "modified": "2021-06-20 15:19:14.902699",
+ "modified": "2021-06-28 16:19:14.902699",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Work Order",
+ "nsm_parent_field": "parent_work_order",
"owner": "Administrator",
"permissions": [
{
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index a55b0b3..0a8e532 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -483,7 +483,7 @@
self.set('operations', [])
- if not self.bom_no:
+ if not self.bom_no or not frappe.get_cached_value('BOM', self.bom_no, 'with_operations'):
return
operations = []
@@ -590,6 +590,7 @@
def validate_operation_time(self):
for d in self.operations:
if not d.time_in_mins > 0:
+ print(self.bom_no, self.production_item)
frappe.throw(_("Operation Time must be greater than 0 for Operation {0}").format(d.operation))
def update_required_items(self):
diff --git a/erpnext/manufacturing/doctype/work_order/work_order_preview.html b/erpnext/manufacturing/doctype/work_order/work_order_preview.html
new file mode 100644
index 0000000..a4bf93e
--- /dev/null
+++ b/erpnext/manufacturing/doctype/work_order/work_order_preview.html
@@ -0,0 +1,33 @@
+<div style="padding: 15px;">
+ <div class="row mb-5">
+ <div class="col-md-5" style="max-height: 500px">
+ {% if data.image %}
+ <div class="border image-field " style="overflow: hidden;border-color:#e6e6e6">
+ <img class="responsive" src={{ data.image }}>
+ </div>
+ {% endif %}
+ </div>
+ <div class="col-md-7 h-500">
+ <div style="padding-top: 10px;">
+ <b> Status </b> {{ data.status }}
+ </div>
+ <div style="padding-top: 10px;">
+ <b> Qty to Produce </b> {{ data.qty }}
+ </div>
+ <div style="padding-top: 10px;">
+ <b> Produced Qty </b> {{ data.produced_qty }}
+ </div>
+ <hr style="margin: 15px -15px;">
+ <p>
+ {% if data.value %}
+ <a style="margin-right: 7px; margin-bottom: 7px" class="btn btn-default btn-xs" href="#Form/Work Order/{{ data.value }}">
+ {{ __("Open Work Order {0}", [data.value.bold()]) }}</a>
+ {% endif %}
+ {% if data.item_code %}
+ <a class="btn btn-default btn-xs" href="#Form/Item/{{ data.item_code }}">
+ {{ __("Open Item {0}", [data.item_code.bold()]) }}</a>
+ {% endif %}
+ </p>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/erpnext/manufacturing/report/bom_explorer/bom_explorer.py b/erpnext/manufacturing/report/bom_explorer/bom_explorer.py
index 48907ad..858b554 100644
--- a/erpnext/manufacturing/report/bom_explorer/bom_explorer.py
+++ b/erpnext/manufacturing/report/bom_explorer/bom_explorer.py
@@ -20,17 +20,20 @@
fields= ['qty','bom_no','qty','scrap','item_code','item_name','description','uom'])
for item in exploded_items:
+ print(item.bom_no, indent)
item["indent"] = indent
data.append({
'item_code': item.item_code,
'item_name': item.item_name,
'indent': indent,
+ 'bom_level': (frappe.get_cached_value("BOM", item.bom_no, "bom_level")
+ if item.bom_no else ""),
'bom': item.bom_no,
'qty': item.qty * qty,
'uom': item.uom,
'description': item.description,
'scrap': item.scrap
- })
+ })
if item.bom_no:
get_exploded_items(item.bom_no, data, indent=indent+1, qty=item.qty)
@@ -69,6 +72,12 @@
"width": 100
},
{
+ "label": "BOM Level",
+ "fieldtype": "Data",
+ "fieldname": "bom_level",
+ "width": 100
+ },
+ {
"label": "Standard Description",
"fieldtype": "data",
"fieldname": "description",
diff --git a/erpnext/manufacturing/report/job_card_summary/job_card_summary.js b/erpnext/manufacturing/report/job_card_summary/job_card_summary.js
index bd68db1..cb771e4 100644
--- a/erpnext/manufacturing/report/job_card_summary/job_card_summary.js
+++ b/erpnext/manufacturing/report/job_card_summary/job_card_summary.js
@@ -68,6 +68,18 @@
get_data: function(txt) {
return frappe.db.get_link_options('Item', txt);
}
+ },
+ {
+ label: __("Workstation"),
+ fieldname: "workstation",
+ fieldtype: "Link",
+ options: "Workstation"
+ },
+ {
+ label: __("Operation"),
+ fieldname: "operation",
+ fieldtype: "Link",
+ options: "Operation"
}
]
};
diff --git a/erpnext/manufacturing/report/job_card_summary/job_card_summary.json b/erpnext/manufacturing/report/job_card_summary/job_card_summary.json
index 9f08fc3..ecf2b74 100644
--- a/erpnext/manufacturing/report/job_card_summary/job_card_summary.json
+++ b/erpnext/manufacturing/report/job_card_summary/job_card_summary.json
@@ -1,14 +1,16 @@
{
- "add_total_row": 0,
+ "add_total_row": 1,
+ "columns": [],
"creation": "2020-04-20 12:00:21.436619",
"disable_prepared_report": 0,
"disabled": 0,
"docstatus": 0,
"doctype": "Report",
+ "filters": [],
"idx": 0,
"is_standard": "Yes",
- "letter_head": "Gadgets International",
- "modified": "2020-04-20 12:00:21.436619",
+ "letter_head": "",
+ "modified": "2020-12-30 11:49:21.713561",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Job Card Summary",
diff --git a/erpnext/manufacturing/report/production_plan_summary/__init__.py b/erpnext/manufacturing/report/production_plan_summary/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/manufacturing/report/production_plan_summary/__init__.py
diff --git a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js
new file mode 100644
index 0000000..59396fe
--- /dev/null
+++ b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js
@@ -0,0 +1,32 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Production Plan Summary"] = {
+ "filters": [
+ {
+ fieldname: "production_plan",
+ label: __("Production Plan"),
+ fieldtype: "Link",
+ options: "Production Plan",
+ reqd: 1,
+ get_query: function() {
+ return {
+ filters: {
+ "docstatus": 1
+ }
+ };
+ }
+ }
+ ],
+ "formatter": function(value, row, column, data, default_formatter) {
+ value = default_formatter(value, row, column, data);
+
+ if (column.fieldname == "document_name") {
+ var color = data.pending_qty > 0 ? 'red': 'green';
+ value = `<a style='color:${color}' href="#Form/${data['document_type']}/${data['document_name']}" data-doctype="${data['document_type']}">${data['document_name']}</a>`;
+ }
+
+ return value;
+ },
+};
diff --git a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.json b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.json
new file mode 100644
index 0000000..33aca21
--- /dev/null
+++ b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.json
@@ -0,0 +1,26 @@
+{
+ "add_total_row": 0,
+ "columns": [],
+ "creation": "2020-12-27 11:43:39.781793",
+ "disable_prepared_report": 0,
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "filters": [],
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2020-12-27 11:43:42.677584",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Production Plan Summary",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "Production Plan",
+ "report_name": "Production Plan Summary",
+ "report_type": "Script Report",
+ "roles": [
+ {
+ "role": "Manufacturing User"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py
new file mode 100644
index 0000000..81b1791
--- /dev/null
+++ b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py
@@ -0,0 +1,136 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import flt
+
+def execute(filters=None):
+ columns, data = [], []
+ data = get_data(filters)
+ columns = get_column(filters)
+
+ return columns, data
+
+def get_data(filters):
+ data = []
+
+ order_details = {}
+ get_work_order_details(filters, order_details)
+ get_purchase_order_details(filters, order_details)
+ get_production_plan_item_details(filters, data, order_details)
+
+ return data
+
+def get_production_plan_item_details(filters, data, order_details):
+ itemwise_indent = {}
+
+ production_plan_doc = frappe.get_cached_doc("Production Plan", filters.get("production_plan"))
+ for row in production_plan_doc.po_items:
+ work_order = frappe.get_cached_value("Work Order", {"production_plan_item": row.name,
+ "bom_no": row.bom_no, "production_item": row.item_code}, "name")
+
+ if row.item_code not in itemwise_indent:
+ itemwise_indent.setdefault(row.item_code, {})
+
+ data.append({
+ "indent": 0,
+ "item_code": row.item_code,
+ "item_name": frappe.get_cached_value("Item", row.item_code, "item_name"),
+ "qty": row.planned_qty,
+ "document_type": "Work Order",
+ "document_name": work_order,
+ "bom_level": frappe.get_cached_value("BOM", row.bom_no, "bom_level"),
+ "produced_qty": order_details.get((work_order, row.item_code)).get("produced_qty"),
+ "pending_qty": flt(row.planned_qty) - flt(order_details.get((work_order, row.item_code)).get("produced_qty"))
+ })
+
+ get_production_plan_sub_assembly_item_details(filters, row, production_plan_doc, data, order_details)
+
+def get_production_plan_sub_assembly_item_details(filters, row, production_plan_doc, data, order_details):
+ for item in production_plan_doc.sub_assembly_items:
+ if row.name == item.production_plan_item:
+ subcontracted_item = (item.type_of_manufacturing == 'Subcontract')
+
+ if subcontracted_item:
+ docname = frappe.get_cached_value("Purchase Order Item",
+ {"production_plan_sub_assembly_item": item.name, "docstatus": ("<", 2)}, "parent")
+ else:
+ docname = frappe.get_cached_value("Work Order",
+ {"production_plan_sub_assembly_item": item.name, "docstatus": ("<", 2)}, "name")
+
+ data.append({
+ "indent": 1,
+ "item_code": item.production_item,
+ "item_name": item.item_name,
+ "qty": item.qty,
+ "document_type": "Work Order" if not subcontracted_item else "Purchase Order",
+ "document_name": docname,
+ "bom_level": item.bom_level,
+ "produced_qty": order_details.get((docname, item.production_item)).get("produced_qty"),
+ "pending_qty": flt(item.qty) - flt(order_details.get((docname, item.production_item)).get("produced_qty"))
+ })
+
+def get_work_order_details(filters, order_details):
+ for row in frappe.get_all("Work Order", filters = {"production_plan": filters.get("production_plan")},
+ fields=["name", "produced_qty", "production_plan", "production_item"]):
+ order_details.setdefault((row.name, row.production_item), row)
+
+def get_purchase_order_details(filters, order_details):
+ for row in frappe.get_all("Purchase Order Item", filters = {"production_plan": filters.get("production_plan")},
+ fields=["parent", "received_qty as produced_qty", "item_code"]):
+ order_details.setdefault((row.parent, row.item_code), row)
+
+def get_column(filters):
+ return [
+ {
+ "label": "Finished Good",
+ "fieldtype": "Link",
+ "fieldname": "item_code",
+ "width": 300,
+ "options": "Item"
+ },
+ {
+ "label": "Item Name",
+ "fieldtype": "data",
+ "fieldname": "item_name",
+ "width": 100
+ },
+ {
+ "label": "Document Type",
+ "fieldtype": "Link",
+ "fieldname": "document_type",
+ "width": 150,
+ "options": "DocType"
+ },
+ {
+ "label": "Document Name",
+ "fieldtype": "Dynamic Link",
+ "fieldname": "document_name",
+ "width": 150
+ },
+ {
+ "label": "BOM Level",
+ "fieldtype": "Int",
+ "fieldname": "bom_level",
+ "width": 100
+ },
+ {
+ "label": "Order Qty",
+ "fieldtype": "Float",
+ "fieldname": "qty",
+ "width": 120
+ },
+ {
+ "label": "Received Qty",
+ "fieldtype": "Float",
+ "fieldname": "produced_qty",
+ "width": 160
+ },
+ {
+ "label": "Pending Qty",
+ "fieldtype": "Float",
+ "fieldname": "pending_qty",
+ "width": 110
+ }
+ ]
diff --git a/erpnext/manufacturing/report/work_order_summary/work_order_summary.py b/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
index fb047b2..612dad0 100644
--- a/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
+++ b/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
@@ -19,7 +19,7 @@
return columns, data, None, chart_data
def get_data(filters):
- query_filters = {"docstatus": 1}
+ query_filters = {"docstatus": ("<", 2)}
fields = ["name", "status", "sales_order", "production_item", "qty", "produced_qty",
"planned_start_date", "planned_end_date", "actual_start_date", "actual_end_date", "lead_time"]
@@ -62,7 +62,8 @@
"Not Started": 0,
"In Process": 0,
"Stopped": 0,
- "Completed": 0
+ "Completed": 0,
+ "Draft": 0
}
for d in data:
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index c93f7a7..7ea2c13 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -293,3 +293,4 @@
erpnext.patches.v13_0.update_response_by_variance
erpnext.patches.v13_0.bill_for_rejected_quantity_in_purchase_invoice
erpnext.patches.v13_0.update_job_card_details
+erpnext.patches.v13_0.update_level_in_bom #1234sswef
diff --git a/erpnext/patches/v13_0/update_level_in_bom.py b/erpnext/patches/v13_0/update_level_in_bom.py
new file mode 100644
index 0000000..0d03c42
--- /dev/null
+++ b/erpnext/patches/v13_0/update_level_in_bom.py
@@ -0,0 +1,30 @@
+# Copyright (c) 2020, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ for document in ["bom", "bom_item", "bom_explosion_item"]:
+ frappe.reload_doc('manufacturing', 'doctype', document)
+
+ frappe.db.sql(" update `tabBOM` set bom_level = 0 where docstatus = 1")
+
+ bom_list = frappe.db.sql_list("""select name from `tabBOM` bom
+ where docstatus=1 and is_active=1 and not exists(select bom_no from `tabBOM Item`
+ where parent=bom.name and ifnull(bom_no, '')!='')""")
+
+ count = 0
+ while(count < len(bom_list)):
+ for parent_bom in get_parent_boms(bom_list[count]):
+ bom_doc = frappe.get_cached_doc("BOM", parent_bom)
+ bom_doc.set_bom_level(update=True)
+ bom_list.append(parent_bom)
+ count += 1
+
+def get_parent_boms(bom_no):
+ return frappe.db.sql_list("""
+ select distinct bom_item.parent from `tabBOM Item` bom_item
+ where bom_item.bom_no = %s and bom_item.docstatus=1 and bom_item.parenttype='BOM'
+ and exists(select bom.name from `tabBOM` bom where bom.name=bom_item.parent and bom.is_active=1)
+ """, bom_no)
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 90b81dd..9dc6378 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -72,7 +72,7 @@
self.validate_with_material_request()
self.validate_batch()
self.validate_inspection()
- self.validate_fg_completed_qty()
+ # self.validate_fg_completed_qty()
self.validate_difference_account()
self.set_job_card_data()
self.set_purpose_for_stock_entry()