commit 734db5b722a2a36ad9b6579f0fd47b8d5fb3ec56
author Sagar Sharma <sagarsharma.s312@gmail.com> Mon Nov 07 17:36:42 2022 +0530
committer GitHub <noreply@github.com> Mon Nov 07 17:36:42 2022 +0530
tree c92d665a480959624c6798cdccfd229c00375f64
parent bf4b012cec46cc7df261303d0f5d3106bc61d97c
parent 30daeb90a8eca0b2f0494f2ce86b5e19a25acf20

Merge branch 'develop' into fix/ux/scr/supplied-items/consumed-qty

erpnext/manufacturing/doctype/workstation/workstation.py

diff --git a/erpnext/manufacturing/doctype/workstation/workstation.py b/erpnext/manufacturing/doctype/workstation/workstation.py
index 59e5318..76795e3 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.py
+++ b/erpnext/manufacturing/doctype/workstation/workstation.py
@@ -101,7 +101,7 @@
 def check_if_within_operating_hours(workstation, operation, from_datetime, to_datetime):
 	if from_datetime and to_datetime:
 		if not cint(
-			frappe.db.get_value("Manufacturing Settings", "None", "allow_production_on_holidays")
+			frappe.db.get_value("Manufacturing Settings", None, "allow_production_on_holidays")
 		):
 			check_workstation_for_holiday(workstation, from_datetime, to_datetime)