Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: remove "scrap %" field (#31069)

Browse Source 
This does nothing, there's scrap items table below that's actually used
for specifying scrap.
This commit is contained in:
Ankush Menat 2022-05-19 14:25:16 +05:30 committed by GitHub
parent 9fb7b49b43
commit 1de6b14d15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/manufacturing/doctype/bom/bom.js
View File

@ -499,15 +499,11 @@ cur_frm.cscript.qty = function(doc) {
cur_frm.cscript.rate = function(doc, cdt, cdn) { cur_frm.cscript.rate = function(doc, cdt, cdn) {
var d = locals[cdt][cdn]; var d = locals[cdt][cdn];
var scrap_items = false; const is_scrap_item = cdt == "BOM Scrap Item";
if(cdt == 'BOM Scrap Item') {
scrap_items = true;
}
if (d.bom_no) { if (d.bom_no) {
frappe.msgprint(__("You cannot change the rate if BOM is mentioned against any Item.")); frappe.msgprint(__("You cannot change the rate if BOM is mentioned against any Item."));
get_bom_material_detail(doc, cdt, cdn, scrap_items); get_bom_material_detail(doc, cdt, cdn, is_scrap_item);
} else { } else {
erpnext.bom.calculate_rm_cost(doc); erpnext.bom.calculate_rm_cost(doc);
erpnext.bom.calculate_scrap_materials_cost(doc); erpnext.bom.calculate_scrap_materials_cost(doc);

12
erpnext/manufacturing/doctype/bom_item/bom_item.json
View File

@ -33,7 +33,6 @@
"amount", "amount",
"base_amount", "base_amount",
"section_break_18", "section_break_18",
"scrap",
"qty_consumed_per_unit", "qty_consumed_per_unit",
"section_break_27", "section_break_27",
"has_variants", "has_variants",
@ -223,15 +222,6 @@
"fieldname": "section_break_18", "fieldname": "section_break_18",
"fieldtype": "Section Break" "fieldtype": "Section Break"
}, },
{
"columns": 1,
"fieldname": "scrap",
"fieldtype": "Float",
"label": "Scrap %",
"oldfieldname": "scrap",
"oldfieldtype": "Currency",
"print_hide": 1
},
{ {
"fieldname": "qty_consumed_per_unit", "fieldname": "qty_consumed_per_unit",
"fieldtype": "Float", "fieldtype": "Float",
@ -298,7 +288,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2022-01-24 16:57:57.020232", "modified": "2022-05-19 02:32:43.785470",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM Item", "name": "BOM Item",

4
erpnext/manufacturing/report/bom_explorer/bom_explorer.py
View File

@ -21,7 +21,7 @@ def get_exploded_items(bom, data, indent=0, qty=1):
exploded_items = frappe.get_all( exploded_items = frappe.get_all(
"BOM Item", "BOM Item",
filters={"parent": bom}, filters={"parent": bom},
fields=["qty", "bom_no", "qty", "scrap", "item_code", "item_name", "description", "uom"], fields=["qty", "bom_no", "qty", "item_code", "item_name", "description", "uom"],
) )
for item in exploded_items: for item in exploded_items:
@ -37,7 +37,6 @@ def get_exploded_items(bom, data, indent=0, qty=1):
"qty": item.qty * qty, "qty": item.qty * qty,
"uom": item.uom, "uom": item.uom,
"description": item.description, "description": item.description,
"scrap": item.scrap,
} }
) )
if item.bom_no: if item.bom_no:
@ -64,5 +63,4 @@ def get_columns():
"fieldname": "description", "fieldname": "description",
"width": 150, "width": 150,
}, },
{"label": _("Scrap"), "fieldtype": "data", "fieldname": "scrap", "width": 100},
] ]