fix: recursion issue while submitting work order (backport #40400) (#…

…40402) * fix: recursion issue while submitting work order (#40400) (cherry picked from commit 72614bb) * chore: fix linter issue --------- Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
frappe · Mar 12, 2024 · d6e87f3 · d6e87f3
1 parent 91af7c0
commit d6e87f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -264,7 +264,7 @@ def get_overlap_for(self, args):
 		if not self.has_overlap(production_capacity, time_logs):
 			return {}
 
-		if self.workstation_type and time_logs:
+		if not self.workstation and self.workstation_type and time_logs:
 			if workstation_time := self.get_workstation_based_on_available_slot(time_logs):
 				self.workstation = workstation_time.get("workstation")
 				return workstation_time
@@ -420,7 +420,7 @@ def check_workstation_time(self, row):
 		if not workstation_doc.working_hours or cint(
 			frappe.db.get_single_value("Manufacturing Settings", "allow_overtime")
 		):
-			if get_datetime(row.planned_end_time) < get_datetime(row.planned_start_time):
+			if get_datetime(row.planned_end_time) <= get_datetime(row.planned_start_time):
 				row.planned_end_time = add_to_date(row.planned_start_time, minutes=row.time_in_mins)
 				row.remaining_time_in_mins = 0.0
 			else:

diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
@@ -611,4 +611,4 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
 
 		this.dialog.fields_dict.entries.grid.refresh();
 	}
-};
+};
-Original file line number
+Diff line change
@@ Expand Up @@
     		this.dialog.fields_dict.entries.grid.refresh();
     	}
-    };
+    };