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

feat: validate leave expiry days

Browse Source
This commit is contained in:
Mangesh-Khairnar 2019-04-23 18:26:24 +05:30
parent 0c0bfb1ef0
commit 4badca54af
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -422,7 +422,7 @@
"depends_on": "", "depends_on": "",
"description": "calculated in days", "description": "calculated in days",
"fetch_if_empty": 0, "fetch_if_empty": 0,
"fieldname": "carry_forward__leave_expiry", "fieldname": "carry_forward_leave_expiry",
"fieldtype": "Int", "fieldtype": "Int",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
@ -729,7 +729,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2019-04-04 14:27:47.742997", "modified": "2019-04-11 15:38:39.334283",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Leave Type", "name": "Leave Type",

5
erpnext/hr/doctype/leave_type/leave_type.py
View File

@ -4,6 +4,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import calendar import calendar
import frappe import frappe
from datetime import datetime
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
@ -14,6 +15,6 @@ class LeaveType(Document):
self.validate_carry_forward() self.validate_carry_forward()
def validate_carry_forward(self): def validate_carry_forward(self):
max_days = 366 if calendar.isleap() else 365 max_days = 366 if calendar.isleap(datetime.now().year) else 365
if not (1 < self.carry_forward_leave_expiry < max_days): if not (0 <= self.carry_forward_leave_expiry <= max_days):
frappe.throw(_('Invalid entry!! Carried forward days need to expire within a year')) frappe.throw(_('Invalid entry!! Carried forward days need to expire within a year'))