From fb988ba8349a0e1954e9e511d838aea22f596c41 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 30 May 2014 15:46:50 +0530 Subject: [PATCH] Salary Slip: pull details from salary struture. fixes #1719 --- erpnext/hr/doctype/salary_slip/salary_slip.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index 9ae394b97c..232d6a9840 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -33,8 +33,8 @@ class SalarySlip(TransactionBase): return struct and struct[0][0] or '' def pull_sal_struct(self, struct): - from erpnext.hr.doctype.salary_structure.salary_structure import get_mapped_doc - self.update(get_mapped_doc(struct, self)) + from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip + self.update(make_salary_slip(struct, self).as_dict()) def pull_emp_details(self): emp = frappe.db.get_value("Employee", self.employee,