nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 09:54:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4338 from anandpdoshi/fix/salary-slip-earning-deduction

Browse Source 
[fix] pull earning and deduction on change of employee
This commit is contained in:
Nabin Hait
2015-11-19 12:06:37 +05:30
parent 5f0b93ed71 7763bb5c15
commit 0f72750fc8
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,25 +23,27 @@ class SalarySlip(TransactionBase):
self.get_leave_details() self.get_leave_details()
struct = self.check_sal_struct() struct = self.check_sal_struct()
if struct: if struct:
self.set("earnings", [])
self.set("deduction", [])
self.pull_sal_struct(struct) self.pull_sal_struct(struct)
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)
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 and (to_date is null or to_date >= %s)""",
(self.employee, m.month_start_date, m.month_end_date)) (self.employee, m.month_start_date, m.month_end_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")
.format(self.employee)) .format(self.employee))
self.employee = None self.employee = None
return struct and struct[0][0] or '' return struct and struct[0][0] or ''
def pull_sal_struct(self, struct): def pull_sal_struct(self, struct):
from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
self.update(make_salary_slip(struct, self).as_dict()) make_salary_slip(struct, self)
def pull_emp_details(self): def pull_emp_details(self):
emp = frappe.db.get_value("Employee", self.employee, emp = frappe.db.get_value("Employee", self.employee,