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

Salary Slip: pull details from salary struture. fixes #1719

Browse Source
This commit is contained in:
Nabin Hait
2014-05-30 15:46:50 +05:30
parent e6ddd28067
commit fb988ba834
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,8 +33,8 @@ class SalarySlip(TransactionBase):
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 get_mapped_doc from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
self.update(get_mapped_doc(struct, self)) self.update(make_salary_slip(struct, self).as_dict())
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,