From 80c76618ae1d9587257e36ef38d93152abd964f7 Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Fri, 16 May 2025 11:32:22 +0530
Subject: [PATCH 1/2] feat: add checbox for validating time logs in job card

(cherry picked from commit 2d9a6a4de8ef8a0d9b7b8f4d8448eb7761814b61)

# Conflicts:
#	erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
---
 .../manufacturing/doctype/job_card/job_card.py  |  2 +-
 .../manufacturing_settings.json                 | 17 +++++++++++++++--
 .../manufacturing_settings.py                   |  1 +
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
index abea4bca606..47122685a8c 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -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(
diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
index efa561274f4..a26fb47a912 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -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",
@@ -255,8 +263,13 @@
    "write": 1
   }
  ],
+<<<<<<< HEAD
  "sort_field": "modified",
+=======
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+>>>>>>> 2d9a6a4de8 (feat: add checbox for validating time logs in job card)
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py
index 86b84b23339..e9f011f78ba 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py
@@ -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

From 249d18962c969928fef595c64e19be20eda920e5 Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Sat, 17 May 2025 00:08:39 +0530
Subject: [PATCH 2/2] chore: resolve conflicts

---
 .../manufacturing_settings/manufacturing_settings.json       | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
index a26fb47a912..277200af310 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -263,12 +263,7 @@
    "write": 1
   }
  ],
-<<<<<<< HEAD
  "sort_field": "modified",
-=======
- "row_format": "Dynamic",
- "sort_field": "creation",
->>>>>>> 2d9a6a4de8 (feat: add checbox for validating time logs in job card)
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1