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

[fix] Inactive salary structure validation

Browse Source
This commit is contained in:
Nabin Hait 2015-12-02 14:50:08 +05:30
parent f1f556c0ac
commit 8df5900f98
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,10 +29,15 @@ class SalarySlip(TransactionBase):
def check_sal_struct(self): def check_sal_struct(self):
m = get_month_details(self.fiscal_year, self.month) m = get_month_details(self.fiscal_year, self.month)
joining_date, relieving_date = frappe.db.get_value("Employee", self.employee,
["date_of_joining", "relieving_date"])
struct = frappe.db.sql("""select name from `tabSalary Structure` struct = frappe.db.sql("""select name from `tabSalary Structure`
where employee=%s and is_active = 'Yes' where employee=%s and is_active = 'Yes'
and from_date <= %s and (to_date is null or to_date >= %s)""", and (from_date <= %s or from_date <= %s)
(self.employee, m.month_start_date, m.month_end_date)) and (to_date is null or to_date >= %s or to_date >= %s)""",
(self.employee, m.month_start_date, joining_date, m.month_end_date, relieving_date))
if not struct: if not struct:
msgprint(_("No active Salary Structure found for employee {0} and the month") msgprint(_("No active Salary Structure found for employee {0} and the month")