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

[minor] check if date of joining is available before creating Salary Slip (#8700)

Browse Source
This commit is contained in:
Makarand Bauskar 2017-05-06 12:47:42 +05:30 committed by Nabin Hait
parent 3257aeeb55
commit 486045e1d1
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/doctype/salary_slip/salary_slip.py
View File

@ -321,9 +321,13 @@ class SalarySlip(TransactionBase):
def sum_components(self, component_type, total_field): def sum_components(self, component_type, total_field):
joining_date, relieving_date = frappe.db.get_value("Employee", self.employee, joining_date, relieving_date = frappe.db.get_value("Employee", self.employee,
["date_of_joining", "relieving_date"]) ["date_of_joining", "relieving_date"])
if not relieving_date: if not relieving_date:
relieving_date = getdate(self.end_date) relieving_date = getdate(self.end_date)
if not joining_date:
frappe.throw(_("Please set the Date Of Joining for employee {0}").format(frappe.bold(employee.employee)))
for d in self.get(component_type): for d in self.get(component_type):
if ((cint(d.depends_on_lwp) == 1 and not self.salary_slip_based_on_timesheet) or\ if ((cint(d.depends_on_lwp) == 1 and not self.salary_slip_based_on_timesheet) or\
getdate(self.start_date) < joining_date or getdate(self.end_date) > relieving_date): getdate(self.start_date) < joining_date or getdate(self.end_date) > relieving_date):

1
erpnext/hr/doctype/salary_structure/salary_structure.py
View File

@ -33,6 +33,7 @@ class SalaryStructure(Document):
for employee in self.get('employees'): for employee in self.get('employees'):
joining_date, relieving_date = frappe.db.get_value("Employee", employee.employee, joining_date, relieving_date = frappe.db.get_value("Employee", employee.employee,
["date_of_joining", "relieving_date"]) ["date_of_joining", "relieving_date"])
if employee.from_date and joining_date and getdate(employee.from_date) < joining_date: if employee.from_date and joining_date and getdate(employee.from_date) < joining_date:
frappe.throw(_("From Date {0} for Employee {1} cannot be before employee's joining Date {2}") frappe.throw(_("From Date {0} for Employee {1} cannot be before employee's joining Date {2}")
.format(employee.from_date, employee.employee, joining_date)) .format(employee.from_date, employee.employee, joining_date))