nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-26 18:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add checbox for validating time logs in job card

Browse Source 
(cherry picked from commit 2d9a6a4de8)

# Conflicts:
#	erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
This commit is contained in:
Mihir Kandoi
2025-05-16 11:32:22 +05:30
committed by Mergify
parent 926c0c5cf4
commit 80c76618ae
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/manufacturing/doctype/job_card/job_card.py
View File

@@ -705,7 +705,7 @@ class JobCard(Document):
bold("Job Card"), get_link_to_form("Job Card", self.name) bold("Job Card"), get_link_to_form("Job Card", self.name)
) )
) )
else: elif frappe.db.get_single_value("Manufacturing Settings", "enforce_time_logs"):
for row in self.time_logs: for row in self.time_logs:
if not row.from_time or not row.to_time: if not row.from_time or not row.to_time:
frappe.throw( frappe.throw(

17
erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
View File

@@ -26,6 +26,7 @@
"overproduction_percentage_for_work_order", "overproduction_percentage_for_work_order",
"job_card_section", "job_card_section",
"add_corrective_operation_cost_in_finished_good_valuation", "add_corrective_operation_cost_in_finished_good_valuation",
"enforce_time_logs",
"column_break_24", "column_break_24",
"job_card_excess_transfer", "job_card_excess_transfer",
"capacity_planning", "capacity_planning",
@@ -235,13 +236,20 @@
"fieldname": "set_op_cost_and_scrap_from_sub_assemblies", "fieldname": "set_op_cost_and_scrap_from_sub_assemblies",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Set Operating Cost / Scrap Items From Sub-assemblies" "label": "Set Operating Cost / Scrap Items From Sub-assemblies"
},
{
"default": "0",
"description": "Enabling this checkbox will force each Job Card Time Log to have From Time and To Time",
"fieldname": "enforce_time_logs",
"fieldtype": "Check",
"label": "Enforce Time Logs"
} }
], ],
"icon": "icon-wrench", "icon": "icon-wrench",
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2025-02-05 16:11:11.639916", "modified": "2025-05-16 11:23:16.916512",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Manufacturing Settings", "name": "Manufacturing Settings",
@@ -255,8 +263,13 @@
"write": 1 "write": 1
} }
], ],
<<<<<<< HEAD
"sort_field": "modified", "sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation",
>>>>>>> 2d9a6a4de8 (feat: add checbox for validating time logs in job card)
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1
} }

1
erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py
View File

@@ -26,6 +26,7 @@ class ManufacturingSettings(Document):
default_scrap_warehouse: DF.Link | None default_scrap_warehouse: DF.Link | None
default_wip_warehouse: DF.Link | None default_wip_warehouse: DF.Link | None
disable_capacity_planning: DF.Check disable_capacity_planning: DF.Check
enforce_time_logs: DF.Check
get_rm_cost_from_consumption_entry: DF.Check get_rm_cost_from_consumption_entry: DF.Check
job_card_excess_transfer: DF.Check job_card_excess_transfer: DF.Check
make_serial_no_batch_from_work_order: DF.Check make_serial_no_batch_from_work_order: DF.Check