mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-26 00:14:50 +00:00
feat: Service Item and Finished Good Map (#36647)
* feat: new DocType `Service Item and Finished Good Map` * fix(ux): filters for Service Item and Finished Good * fix: validations for Service Item and Finished Good * feat: set FG Item on Service Item selection in PO * refactor: one-to-many mapping between service item and finished goods * feat: auto set Service Item for finished good in PO created from PP * feat: auto set Service Item on Finished Good selection in PO * test: add test case for service item and finished goods map * feat: `BOM` field in `Finished Good Detail` * feat: new DocType `Subcontracting BOM` * fix: filters and validations for Subcontracting BOM * feat: auto select Service Item in PO created from PP * test: add test case for PO service item auto pick * feat: pick BOM from Subcontracting BOM in SCO * feat: auto pick `Service Item` on FG select * refactor: remove DocType `Service Item and Finished Goods Map` and `Finished Good Detail` * feat: fetch FG for Service Item * chore: `linter` * refactor: update `Auto Name` expression for Subcontracting BOM
This commit is contained in:
s-aga-r
@@ -0,0 +1,40 @@
|
||||
// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
|
||||
// For license information, please see license.txt
|
||||
|
||||
frappe.ui.form.on('Subcontracting BOM', {
|
||||
setup: (frm) => {
|
||||
frm.trigger('set_queries');
|
||||
},
|
||||
|
||||
set_queries: (frm) => {
|
||||
frm.set_query('finished_good', () => {
|
||||
return {
|
||||
filters: {
|
||||
disabled: 0,
|
||||
is_stock_item: 1,
|
||||
default_bom: ['!=', ''],
|
||||
is_sub_contracted_item: 1,
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
frm.set_query('finished_good_bom', () => {
|
||||
return {
|
||||
filters: {
|
||||
docstatus: 1,
|
||||
is_active: 1,
|
||||
item: frm.doc.finished_good,
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
frm.set_query('service_item', () => {
|
||||
return {
|
||||
filters: {
|
||||
disabled: 0,
|
||||
is_stock_item: 0,
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,155 @@
|
||||
{
|
||||
"actions": [],
|
||||
"allow_rename": 1,
|
||||
"autoname": "format:SB-{####}",
|
||||
"creation": "2023-08-29 12:43:20.417184",
|
||||
"default_view": "List",
|
||||
"doctype": "DocType",
|
||||
"editable_grid": 1,
|
||||
"engine": "InnoDB",
|
||||
"field_order": [
|
||||
"is_active",
|
||||
"section_break_dsjm",
|
||||
"finished_good",
|
||||
"finished_good_qty",
|
||||
"column_break_quoy",
|
||||
"finished_good_uom",
|
||||
"finished_good_bom",
|
||||
"section_break_qdw9",
|
||||
"service_item",
|
||||
"service_item_qty",
|
||||
"column_break_uzmw",
|
||||
"service_item_uom",
|
||||
"conversion_factor"
|
||||
],
|
||||
"fields": [
|
||||
{
|
||||
"default": "1",
|
||||
"fieldname": "is_active",
|
||||
"fieldtype": "Check",
|
||||
"in_list_view": 1,
|
||||
"in_preview": 1,
|
||||
"in_standard_filter": 1,
|
||||
"label": "Is Active",
|
||||
"print_hide": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "section_break_dsjm",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "finished_good",
|
||||
"fieldtype": "Link",
|
||||
"in_list_view": 1,
|
||||
"in_preview": 1,
|
||||
"in_standard_filter": 1,
|
||||
"label": "Finished Good",
|
||||
"options": "Item",
|
||||
"reqd": 1,
|
||||
"search_index": 1,
|
||||
"set_only_once": 1
|
||||
},
|
||||
{
|
||||
"default": "1",
|
||||
"fieldname": "finished_good_qty",
|
||||
"fieldtype": "Float",
|
||||
"label": "Finished Good Qty",
|
||||
"non_negative": 1,
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"fetch_from": "finished_good.default_bom",
|
||||
"fetch_if_empty": 1,
|
||||
"fieldname": "finished_good_bom",
|
||||
"fieldtype": "Link",
|
||||
"in_list_view": 1,
|
||||
"in_preview": 1,
|
||||
"in_standard_filter": 1,
|
||||
"label": "Finished Good BOM",
|
||||
"options": "BOM",
|
||||
"reqd": 1,
|
||||
"search_index": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "section_break_qdw9",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "service_item",
|
||||
"fieldtype": "Link",
|
||||
"in_list_view": 1,
|
||||
"in_preview": 1,
|
||||
"in_standard_filter": 1,
|
||||
"label": "Service Item",
|
||||
"options": "Item",
|
||||
"reqd": 1,
|
||||
"search_index": 1
|
||||
},
|
||||
{
|
||||
"default": "1",
|
||||
"fieldname": "service_item_qty",
|
||||
"fieldtype": "Float",
|
||||
"label": "Service Item Qty",
|
||||
"non_negative": 1,
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"fetch_from": "service_item.stock_uom",
|
||||
"fetch_if_empty": 1,
|
||||
"fieldname": "service_item_uom",
|
||||
"fieldtype": "Link",
|
||||
"label": "Service Item UOM",
|
||||
"options": "UOM",
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"description": "Service Item Qty / Finished Good Qty",
|
||||
"fieldname": "conversion_factor",
|
||||
"fieldtype": "Float",
|
||||
"label": "Conversion Factor",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_quoy",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fetch_from": "finished_good.stock_uom",
|
||||
"fieldname": "finished_good_uom",
|
||||
"fieldtype": "Link",
|
||||
"label": "Finished Good UOM",
|
||||
"options": "UOM",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_uzmw",
|
||||
"fieldtype": "Column Break"
|
||||
}
|
||||
],
|
||||
"index_web_pages_for_search": 1,
|
||||
"links": [],
|
||||
"modified": "2023-09-03 16:51:43.558295",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Subcontracting",
|
||||
"name": "Subcontracting BOM",
|
||||
"naming_rule": "Expression",
|
||||
"owner": "Administrator",
|
||||
"permissions": [
|
||||
{
|
||||
"create": 1,
|
||||
"delete": 1,
|
||||
"email": 1,
|
||||
"export": 1,
|
||||
"print": 1,
|
||||
"read": 1,
|
||||
"report": 1,
|
||||
"role": "System Manager",
|
||||
"share": 1,
|
||||
"write": 1
|
||||
}
|
||||
],
|
||||
"sort_field": "modified",
|
||||
"sort_order": "DESC",
|
||||
"states": [],
|
||||
"track_changes": 1
|
||||
}
|
||||
@@ -0,0 +1,97 @@
|
||||
# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
|
||||
# For license information, please see license.txt
|
||||
|
||||
import frappe
|
||||
from frappe import _
|
||||
from frappe.model.document import Document
|
||||
from frappe.utils import flt
|
||||
|
||||
|
||||
class SubcontractingBOM(Document):
|
||||
def validate(self):
|
||||
self.validate_finished_good()
|
||||
self.validate_service_item()
|
||||
self.validate_is_active()
|
||||
|
||||
def before_save(self):
|
||||
self.set_conversion_factor()
|
||||
|
||||
def validate_finished_good(self):
|
||||
disabled, is_stock_item, default_bom, is_sub_contracted_item = frappe.db.get_value(
|
||||
"Item",
|
||||
self.finished_good,
|
||||
["disabled", "is_stock_item", "default_bom", "is_sub_contracted_item"],
|
||||
)
|
||||
|
||||
if disabled:
|
||||
frappe.throw(_("Finished Good {0} is disabled.").format(frappe.bold(self.finished_good)))
|
||||
if not is_stock_item:
|
||||
frappe.throw(
|
||||
_("Finished Good {0} must be a stock item.").format(frappe.bold(self.finished_good))
|
||||
)
|
||||
if not default_bom:
|
||||
frappe.throw(
|
||||
_("Finished Good {0} does not have a default BOM.").format(frappe.bold(self.finished_good))
|
||||
)
|
||||
if not is_sub_contracted_item:
|
||||
frappe.throw(
|
||||
_("Finished Good {0} must be a sub-contracted item.").format(frappe.bold(self.finished_good))
|
||||
)
|
||||
|
||||
def validate_service_item(self):
|
||||
disabled, is_stock_item = frappe.db.get_value(
|
||||
"Item", self.service_item, ["disabled", "is_stock_item"]
|
||||
)
|
||||
|
||||
if disabled:
|
||||
frappe.throw(_("Service Item {0} is disabled.").format(frappe.bold(self.service_item)))
|
||||
if is_stock_item:
|
||||
frappe.throw(
|
||||
_("Service Item {0} must be a non-stock item.").format(frappe.bold(self.service_item))
|
||||
)
|
||||
|
||||
def validate_is_active(self):
|
||||
if self.is_active:
|
||||
if sb := frappe.db.exists(
|
||||
"Subcontracting BOM",
|
||||
{"finished_good": self.finished_good, "is_active": 1, "name": ["!=", self.name]},
|
||||
):
|
||||
frappe.throw(
|
||||
_("There is already an active Subcontracting BOM {0} for the Finished Good {1}.").format(
|
||||
frappe.bold(sb), frappe.bold(self.finished_good)
|
||||
)
|
||||
)
|
||||
|
||||
def set_conversion_factor(self):
|
||||
self.conversion_factor = flt(self.service_item_qty) / flt(self.finished_good_qty)
|
||||
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_subcontracting_boms_for_finished_goods(fg_items: str | list) -> dict:
|
||||
if fg_items:
|
||||
filters = {"is_active": 1}
|
||||
|
||||
if isinstance(fg_items, list):
|
||||
filters["finished_good"] = ["in", fg_items]
|
||||
else:
|
||||
filters["finished_good"] = fg_items
|
||||
|
||||
if subcontracting_boms := frappe.get_all("Subcontracting BOM", filters=filters, fields=["*"]):
|
||||
if isinstance(fg_items, list):
|
||||
return {d.finished_good: d for d in subcontracting_boms}
|
||||
else:
|
||||
return subcontracting_boms[0]
|
||||
|
||||
return {}
|
||||
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_subcontracting_boms_for_service_item(service_item: str) -> dict:
|
||||
if service_item:
|
||||
filters = {"is_active": 1, "service_item": service_item}
|
||||
Subcontracting_boms = frappe.db.get_all("Subcontracting BOM", filters=filters, fields=["*"])
|
||||
|
||||
if Subcontracting_boms:
|
||||
return {d.finished_good: d for d in Subcontracting_boms}
|
||||
|
||||
return {}
|
||||
@@ -0,0 +1,26 @@
|
||||
# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
|
||||
# See license.txt
|
||||
|
||||
import frappe
|
||||
from frappe.tests.utils import FrappeTestCase
|
||||
|
||||
|
||||
class TestSubcontractingBOM(FrappeTestCase):
|
||||
pass
|
||||
|
||||
|
||||
def create_subcontracting_bom(**kwargs):
|
||||
kwargs = frappe._dict(kwargs)
|
||||
|
||||
doc = frappe.new_doc("Subcontracting BOM")
|
||||
doc.is_active = kwargs.is_active or 1
|
||||
doc.finished_good = kwargs.finished_good
|
||||
doc.finished_good_uom = kwargs.finished_good_uom
|
||||
doc.finished_good_qty = kwargs.finished_good_qty or 1
|
||||
doc.finished_good_bom = kwargs.finished_good_bom
|
||||
doc.service_item = kwargs.service_item
|
||||
doc.service_item_uom = kwargs.service_item_uom
|
||||
doc.service_item_qty = kwargs.service_item_qty or 1
|
||||
doc.save()
|
||||
|
||||
return doc
|
||||
@@ -128,8 +128,12 @@ class SubcontractingOrder(SubcontractingController):
|
||||
for si in self.service_items:
|
||||
if si.fg_item:
|
||||
item = frappe.get_doc("Item", si.fg_item)
|
||||
bom = frappe.db.get_value("BOM", {"item": item.item_code, "is_active": 1, "is_default": 1})
|
||||
|
||||
bom = (
|
||||
frappe.db.get_value(
|
||||
"Subcontracting BOM", {"finished_good": item.item_code, "is_active": 1}, "finished_good_bom"
|
||||
)
|
||||
or item.default_bom
|
||||
)
|
||||
items.append(
|
||||
{
|
||||
"item_code": item.item_code,
|
||||
|
||||
Reference in New Issue
Block a user