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

Salary Structure Employee custom field can be used in Formula and Condition (#7615)

Browse Source
This commit is contained in:
KanchanChauhan 2017-02-01 18:05:57 +05:30 committed by Rushabh Mehta
parent 3dc96cf71e
commit 0e995adc44
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,8 +89,8 @@ class SalarySlip(TransactionBase):
frappe.throw(_("Name error: {0}".format(err))) frappe.throw(_("Name error: {0}".format(err)))
except SyntaxError as err: except SyntaxError as err:
frappe.throw(_("Syntax error in formula or condition: {0}".format(err))) frappe.throw(_("Syntax error in formula or condition: {0}".format(err)))
except: except Exception, e:
frappe.throw(_("Error in formula or condition")) frappe.throw(_("Error in formula or condition: {0}".format(e)))
raise raise
def get_data_for_eval(self): def get_data_for_eval(self):
@ -99,7 +99,7 @@ class SalarySlip(TransactionBase):
for d in self._salary_structure_doc.employees: for d in self._salary_structure_doc.employees:
if d.employee == self.employee: if d.employee == self.employee:
data.base, data.variable = d.base, d.variable data.update(frappe.get_doc("Salary Structure Employee", {"employee": self.employee}).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())
@ -108,7 +108,6 @@ class SalarySlip(TransactionBase):
salary_components = frappe.get_all("Salary Component", fields=["salary_component_abbr"]) salary_components = frappe.get_all("Salary Component", fields=["salary_component_abbr"])
for salary_component in salary_components: for salary_component in salary_components:
data[salary_component.salary_component_abbr] = 0 data[salary_component.salary_component_abbr] = 0
return data return data