Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sagar Sharma 2022-11-07 17:36:42 +05:30 committed by GitHub
commit 734db5b722
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@ def get_default_holiday_list():
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)