diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py index 226e95990f6..7cbc59687a0 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.py +++ b/erpnext/hr/doctype/leave_application/leave_application.py @@ -245,7 +245,7 @@ def get_total_leave_days(leave_app): } else: ret = { - 'total_leave_days' : flt(tot_days) + 'total_leave_days' : flt(tot_days) } return ret diff --git a/erpnext/hr/doctype/leave_type/test_records.json b/erpnext/hr/doctype/leave_type/test_records.json index 8042e30f528..2ac46cf626e 100644 --- a/erpnext/hr/doctype/leave_type/test_records.json +++ b/erpnext/hr/doctype/leave_type/test_records.json @@ -1,11 +1,13 @@ [ { "doctype": "Leave Type", - "leave_type_name": "_Test Leave Type" + "leave_type_name": "_Test Leave Type", + "include_holiday": 1 }, { "doctype": "Leave Type", "is_lwp": 1, - "leave_type_name": "_Test Leave Type LWP" + "leave_type_name": "_Test Leave Type LWP", + "include_holiday": 1 } ] \ No newline at end of file diff --git a/erpnext/patches.txt b/erpnext/patches.txt index ef08098c32d..b029d55f5f8 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -181,3 +181,4 @@ erpnext.patches.v5_1.rename_roles erpnext.patches.v5_1.default_bom execute:frappe.delete_doc("DocType", "Party Type") erpnext.patches.v5_4.fix_reserved_qty_and_sle_for_packed_items +execute:frappe.db.sql("update `tabLeave Type` set include_holiday=1") \ No newline at end of file diff --git a/erpnext/setup/page/setup_wizard/install_fixtures.py b/erpnext/setup/page/setup_wizard/install_fixtures.py index 6265e4a36ce..dd3ec3a2e6b 100644 --- a/erpnext/setup/page/setup_wizard/install_fixtures.py +++ b/erpnext/setup/page/setup_wizard/install_fixtures.py @@ -41,11 +41,16 @@ def install(country=None): {'doctype': 'Expense Claim Type', 'name': _('Travel'), 'expense_type': _('Travel')}, # leave type - {'doctype': 'Leave Type', 'leave_type_name': _('Casual Leave'), 'name': _('Casual Leave'), 'is_encash': 1, 'is_carry_forward': 1, 'max_days_allowed': '3', }, - {'doctype': 'Leave Type', 'leave_type_name': _('Compensatory Off'), 'name': _('Compensatory Off'), 'is_encash': 0, 'is_carry_forward': 0, }, - {'doctype': 'Leave Type', 'leave_type_name': _('Sick Leave'), 'name': _('Sick Leave'), 'is_encash': 0, 'is_carry_forward': 0, }, - {'doctype': 'Leave Type', 'leave_type_name': _('Privilege Leave'), 'name': _('Privilege Leave'), 'is_encash': 0, 'is_carry_forward': 0, }, - {'doctype': 'Leave Type', 'leave_type_name': _('Leave Without Pay'), 'name': _('Leave Without Pay'), 'is_encash': 0, 'is_carry_forward': 0, 'is_lwp':1}, + {'doctype': 'Leave Type', 'leave_type_name': _('Casual Leave'), 'name': _('Casual Leave'), + 'is_encash': 1, 'is_carry_forward': 1, 'max_days_allowed': '3', 'include_holiday': 1}, + {'doctype': 'Leave Type', 'leave_type_name': _('Compensatory Off'), 'name': _('Compensatory Off'), + 'is_encash': 0, 'is_carry_forward': 0, 'include_holiday': 1}, + {'doctype': 'Leave Type', 'leave_type_name': _('Sick Leave'), 'name': _('Sick Leave'), + 'is_encash': 0, 'is_carry_forward': 0, 'include_holiday': 1}, + {'doctype': 'Leave Type', 'leave_type_name': _('Privilege Leave'), 'name': _('Privilege Leave'), + 'is_encash': 0, 'is_carry_forward': 0, 'include_holiday': 1}, + {'doctype': 'Leave Type', 'leave_type_name': _('Leave Without Pay'), 'name': _('Leave Without Pay'), + 'is_encash': 0, 'is_carry_forward': 0, 'is_lwp':1, 'include_holiday': 1}, # Employment Type {'doctype': 'Employment Type', 'employee_type_name': _('Full-time')},