CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-16 08:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Linting Issues

Browse Source 
(cherry picked from commit 7b5cf6978e)

# Conflicts:
#	erpnext/manufacturing/doctype/workstation/workstation.py
This commit is contained in:
Deepesh Garg
2022-11-08 11:00:48 +05:30
committed by Mergify
parent 37bed12df4
commit 6163a052c8
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/manufacturing/doctype/workstation/workstation.py
View File

@@ -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")):