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

Update salary_slip.py

Browse Source
This commit is contained in:
Nabin Hait 2016-09-21 12:55:16 +05:30 committed by GitHub
parent e5057c8c35
commit 081eab147f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@ class SalarySlip(TransactionBase):
for struct_row in self._salary_structure_doc.get(key): for struct_row in self._salary_structure_doc.get(key):
amount = self.eval_condition_and_formula(struct_row, data) amount = self.eval_condition_and_formula(struct_row, data)
if amount: if amount:
self.update_component_row(struct_row, amount, key) self.update_component_row(struct_row, amount, key)
def update_component_row(self, struct_row, amount, key): def update_component_row(self, struct_row, amount, key):
@ -365,4 +365,4 @@ class SalarySlip(TransactionBase):
timesheet.salary_slip = salary_slip timesheet.salary_slip = salary_slip
timesheet.flags.ignore_validate_update_after_submit = True timesheet.flags.ignore_validate_update_after_submit = True
timesheet.set_status() timesheet.set_status()
timesheet.save() timesheet.save()