nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 09:54:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-11-08 17:42:29 +05:30
committed by GitHub
parent 6163a052c8
commit 19b3152e32
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,13 +100,10 @@ def get_default_holiday_list():
def check_if_within_operating_hours(workstation, operation, from_datetime, to_datetime): def check_if_within_operating_hours(workstation, operation, from_datetime, to_datetime):
if from_datetime and to_datetime: if from_datetime and to_datetime:
<<<<<<< HEAD
if not cint( 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")
): ):
=======
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) check_workstation_for_holiday(workstation, from_datetime, to_datetime)
if not cint(frappe.db.get_value("Manufacturing Settings", None, "allow_overtime")): if not cint(frappe.db.get_value("Manufacturing Settings", None, "allow_overtime")):