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

Merge pull request #7685 from KanchanChauhan/employee-details-in-salary-preview

Browse Source 
[Fix] Employee Details in Salary Slip preview
This commit is contained in:
Nabin Hait 2017-02-07 13:27:24 +05:30 committed by GitHub
commit ddcb514b65
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/hr/doctype/salary_structure/salary_structure.py
View File

@ -33,8 +33,13 @@ class SalaryStructure(Document):
def make_salary_slip(source_name, target_doc = None, employee = None, as_print = False, print_format = None):
def postprocess(source, target):
if employee:
employee_details = frappe.db.get_value("Employee", employee,
["employee_name", "branch", "designation", "department"], as_dict=1)
target.employee = employee
target.employee_name = frappe.get_value("Employee",employee, "employee_name")
target.employee_name = employee_details.employee_name
target.branch = employee_details.branch
target.designation = employee_details.designation
target.department = employee_details.department
target.run_method('process_salary_structure')
doc = get_mapped_doc("Salary Structure", source_name, {