nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 12:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'meatechsupport-develop' into develop

Browse Source
This commit is contained in:
Nabin Hait
2015-07-29 16:15:27 +05:30
parent 763821d57d b24d2efc4b
commit 8ce47862f9
6 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/hr/doctype/leave_application/leave_application.py
View File

@@ -238,10 +238,15 @@ def get_total_leave_days(leave_app):
ret = {'total_leave_days' : 0.5} ret = {'total_leave_days' : 0.5}
if not leave_app.half_day: if not leave_app.half_day:
tot_days = date_diff(leave_app.to_date, leave_app.from_date) + 1 tot_days = date_diff(leave_app.to_date, leave_app.from_date) + 1
holidays = leave_app.get_holidays() if frappe.db.get_value("Leave Type", self.leave_type, "include_holiday"):
ret = { holidays = leave_app.get_holidays()
'total_leave_days' : flt(tot_days)-flt(holidays) ret = {
} 'total_leave_days' : flt(tot_days)-flt(holidays)
}
else:
ret = {
'total_leave_days' : flt(tot_days)
}
return ret return ret
@frappe.whitelist() @frappe.whitelist()

2
erpnext/hr/doctype/leave_application/test_leave_application.py
View File

@@ -246,4 +246,4 @@ class TestLeaveApplication(unittest.TestCase):
frappe.db.sql("""delete from `tabEmployee Leave Approver` where parent=%s""", frappe.db.sql("""delete from `tabEmployee Leave Approver` where parent=%s""",
"_T-Employee-0001") "_T-Employee-0001")
frappe.db.set_value("Employee", "_T-Employee-0001", "department", original_department) frappe.db.set_value("Employee", "_T-Employee-0001", "department", original_department)

6
erpnext/hr/doctype/leave_type/leave_type.json
View File

@@ -59,6 +59,12 @@
"fieldtype": "Check", "fieldtype": "Check",
"label": "Allow Negative Balance", "label": "Allow Negative Balance",
"permlevel": 0 "permlevel": 0
},
{
"fieldname": "include_holiday",
"fieldtype": "Check",
"label": "Include holidays within leaves as leaves",
"permlevel": 0
} }
], ],
"icon": "icon-flag", "icon": "icon-flag",

6
erpnext/hr/doctype/leave_type/test_records.json
View File

@@ -1,11 +1,13 @@
[ [
{ {
"doctype": "Leave Type", "doctype": "Leave Type",
"leave_type_name": "_Test Leave Type" "leave_type_name": "_Test Leave Type",
"include_holiday": 1
}, },
{ {
"doctype": "Leave Type", "doctype": "Leave Type",
"is_lwp": 1, "is_lwp": 1,
"leave_type_name": "_Test Leave Type LWP" "leave_type_name": "_Test Leave Type LWP",
"include_holiday": 1
} }
] ]

1
erpnext/patches.txt
View File

@@ -181,3 +181,4 @@ erpnext.patches.v5_1.rename_roles
erpnext.patches.v5_1.default_bom erpnext.patches.v5_1.default_bom
execute:frappe.delete_doc("DocType", "Party Type") execute:frappe.delete_doc("DocType", "Party Type")
erpnext.patches.v5_4.fix_reserved_qty_and_sle_for_packed_items erpnext.patches.v5_4.fix_reserved_qty_and_sle_for_packed_items
execute:frappe.db.sql("update `tabLeave Type` set include_holiday=1")

15
erpnext/setup/page/setup_wizard/install_fixtures.py
View File

@@ -41,11 +41,16 @@ def install(country=None):
{'doctype': 'Expense Claim Type', 'name': _('Travel'), 'expense_type': _('Travel')}, {'doctype': 'Expense Claim Type', 'name': _('Travel'), 'expense_type': _('Travel')},
# leave type # 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': _('Casual Leave'), 'name': _('Casual Leave'),
{'doctype': 'Leave Type', 'leave_type_name': _('Compensatory Off'), 'name': _('Compensatory Off'), 'is_encash': 0, 'is_carry_forward': 0, }, 'is_encash': 1, 'is_carry_forward': 1, 'max_days_allowed': '3', 'include_holiday': 1},
{'doctype': 'Leave Type', 'leave_type_name': _('Sick Leave'), 'name': _('Sick Leave'), 'is_encash': 0, 'is_carry_forward': 0, }, {'doctype': 'Leave Type', 'leave_type_name': _('Compensatory Off'), 'name': _('Compensatory Off'),
{'doctype': 'Leave Type', 'leave_type_name': _('Privilege Leave'), 'name': _('Privilege Leave'), 'is_encash': 0, 'is_carry_forward': 0, }, '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}, {'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 # Employment Type
{'doctype': 'Employment Type', 'employee_type_name': _('Full-time')}, {'doctype': 'Employment Type', 'employee_type_name': _('Full-time')},