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

fix: Allow only BOM with ops in BOM ID filter & add total row to report

Browse Source
This commit is contained in:
marination 2022-01-20 14:29:18 +05:30
parent 3c7b772112
commit af734298c8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/manufacturing/report/bom_operations_time/bom_operations_time.js
View File

@ -20,14 +20,14 @@ frappe.query_reports["BOM Operations Time"] = {
"fieldname": "bom_id", "fieldname": "bom_id",
"label": __("BOM ID"), "label": __("BOM ID"),
"fieldtype": "MultiSelectList", "fieldtype": "MultiSelectList",
"width": "80", "width": "100",
"options": "BOM", "options": "BOM",
"get_data": function(txt) { "get_data": function(txt) {
return frappe.db.get_link_options("BOM", txt); return frappe.db.get_link_options("BOM", txt);
}, },
"get_query": () =>{ "get_query": () =>{
return { return {
filters: { "docstatus": 1, "is_active": 1 } filters: { "docstatus": 1, "is_active": 1, "with_operations": 1 }
} }
} }
}, },

6
erpnext/manufacturing/report/bom_operations_time/bom_operations_time.json
View File

@ -1,14 +1,16 @@
{ {
"add_total_row": 0, "add_total_row": 1,
"columns": [],
"creation": "2020-03-03 01:41:20.862521", "creation": "2020-03-03 01:41:20.862521",
"disable_prepared_report": 0, "disable_prepared_report": 0,
"disabled": 0, "disabled": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "Report", "doctype": "Report",
"filters": [],
"idx": 0, "idx": 0,
"is_standard": "Yes", "is_standard": "Yes",
"letter_head": "", "letter_head": "",
"modified": "2020-03-03 01:41:20.862521", "modified": "2022-01-20 14:21:47.771591",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM Operations Time", "name": "BOM Operations Time",