From 6163a052c8a27e4dcdeba5948e39a764f8ba0230 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 8 Nov 2022 11:00:48 +0530 Subject: [PATCH] chore: Linting Issues (cherry picked from commit 7b5cf6978ed11fa251dce7bbb961088ac20ab1d6) # Conflicts: # erpnext/manufacturing/doctype/workstation/workstation.py --- erpnext/manufacturing/doctype/workstation/workstation.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/manufacturing/doctype/workstation/workstation.py b/erpnext/manufacturing/doctype/workstation/workstation.py index 59e5318ab8d..d07bd8f0e6a 100644 --- a/erpnext/manufacturing/doctype/workstation/workstation.py +++ b/erpnext/manufacturing/doctype/workstation/workstation.py @@ -100,9 +100,13 @@ def get_default_holiday_list(): def check_if_within_operating_hours(workstation, operation, from_datetime, to_datetime): if from_datetime and to_datetime: +<<<<<<< HEAD if not cint( frappe.db.get_value("Manufacturing Settings", "None", "allow_production_on_holidays") ): +======= + if not cint(frappe.db.get_value("Manufacturing Settings", None, "allow_production_on_holidays")): +>>>>>>> 7b5cf6978e (chore: Linting Issues) check_workstation_for_holiday(workstation, from_datetime, to_datetime) if not cint(frappe.db.get_value("Manufacturing Settings", None, "allow_overtime")):