Changes done

This commit is contained in:
Kanchan Chauhan
2016-06-26 14:10:24 +05:30
parent 4c0df04db0
commit 68f5ae5cbf

View File

@@ -4,7 +4,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe.utils import getdate, validate_email_add, today from frappe.utils import getdate, validate_email_add, today, add_years
from frappe.model.naming import make_autoname from frappe.model.naming import make_autoname
from frappe import throw, _ from frappe import throw, _
import frappe.permissions import frappe.permissions
@@ -186,12 +186,8 @@ def get_retirement_date(date_of_birth=None):
ret = {} ret = {}
if date_of_birth: if date_of_birth:
try: try:
retirement_age = frappe.db.get_single_value("HR Settings", "retirement_age") retirement_age = int(frappe.db.get_single_value("HR Settings", "retirement_age") or 60)
if retirement_age: dt = add_years(getdate(date_of_birth),retirement_age)
dt = getdate(date_of_birth) + datetime.timedelta(int(retirement_age)*365.2425)
else:
dt = getdate(date_of_birth) + datetime.timedelta(21914.55)
ret = {'date_of_retirement': dt.strftime('%Y-%m-%d')} ret = {'date_of_retirement': dt.strftime('%Y-%m-%d')}
except ValueError: except ValueError:
# invalid date # invalid date