Merge pull request #47577 from frappe/mergify/bp/version-15-hotfix/pr-47570

feat: add checkbox for validating time logs in job card (backport #47570)
This commit is contained in:
Mihir Kandoi
2025-05-17 00:34:56 +05:30
committed by GitHub
3 changed files with 12 additions and 3 deletions

View File

@@ -705,7 +705,7 @@ class JobCard(Document):
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:
if not row.from_time or not row.to_time:
frappe.throw(

View File

@@ -26,6 +26,7 @@
"overproduction_percentage_for_work_order",
"job_card_section",
"add_corrective_operation_cost_in_finished_good_valuation",
"enforce_time_logs",
"column_break_24",
"job_card_excess_transfer",
"capacity_planning",
@@ -235,13 +236,20 @@
"fieldname": "set_op_cost_and_scrap_from_sub_assemblies",
"fieldtype": "Check",
"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",
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
"modified": "2025-02-05 16:11:11.639916",
"modified": "2025-05-16 11:23:16.916512",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Manufacturing Settings",
@@ -259,4 +267,4 @@
"sort_order": "DESC",
"states": [],
"track_changes": 1
}
}

View File

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