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

fix: choose correct Salary Structure Assignment when getting data for formula eval

Browse Source
This commit is contained in:
Sagar Vora 2021-05-28 21:28:42 +05:30
parent d4398fd84a
commit 447c978757
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/payroll/doctype/salary_slip/salary_slip.py
View File

@ -493,8 +493,28 @@ class SalarySlip(TransactionBase):
'''Returns data for evaluating formula''' '''Returns data for evaluating formula'''
data = frappe._dict() data = frappe._dict()
salary_structure_assignment = frappe.get_value(
"Salary Structure Assignment",
{
"employee": self.employee,
"salary_structure": self.salary_structure,
"from_date": ("<=", self.start_date),
"docstatus": 1,
},
order_by="from_date desc",
)
if not salary_structure_assignment:
frappe.throw(
_("Please assign a Salary Structure for Employee {0} "
"applicable from or before {1} first").format(
frappe.bold(self.employee_name),
frappe.bold(self.start_date)
)
)
data.update(frappe.get_doc("Salary Structure Assignment", data.update(frappe.get_doc("Salary Structure Assignment",
{"employee": self.employee, "salary_structure": self.salary_structure}).as_dict()) salary_structure_assignment).as_dict())
data.update(frappe.get_doc("Employee", self.employee).as_dict()) data.update(frappe.get_doc("Employee", self.employee).as_dict())
data.update(self.as_dict()) data.update(self.as_dict())