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

fixes issue #9013: Salary calculation Error. (#9044)

Browse Source 
* fixes issue #9013:
Salary calculation Error.

* adds test case for scenario as in #9013
This commit is contained in:
tundebabzy 2017-06-07 07:35:00 +01:00 committed by Nabin Hait
parent d2be55b2e0
commit f981eee221
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ 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 Exception, e: except Exception as e:
frappe.throw(_("Error in formula or condition: {0}".format(e))) frappe.throw(_("Error in formula or condition: {0}".format(e)))
raise raise
@ -330,11 +330,18 @@ class SalarySlip(TransactionBase):
frappe.throw(_("Please set the Date Of Joining for employee {0}").format(frappe.bold(self.employee_name))) frappe.throw(_("Please set the Date Of Joining for employee {0}").format(frappe.bold(self.employee_name)))
for d in self.get(component_type): for d in self.get(component_type):
if self.salary_structure and ((cint(d.depends_on_lwp) == 1 and not self.salary_slip_based_on_timesheet) or\ if (self.salary_structure and
getdate(self.start_date) < joining_date or getdate(self.end_date) > relieving_date): cint(d.depends_on_lwp) and
(not
self.salary_slip_based_on_timesheet or
getdate(self.start_date) < joining_date or
getdate(self.end_date) > relieving_date
)):
d.amount = rounded((flt(d.default_amount) * flt(self.payment_days) d.amount = rounded(
/ cint(self.total_working_days)), self.precision("amount", component_type)) (flt(d.default_amount) * flt(self.payment_days)
/ cint(self.total_working_days)), self.precision("amount", component_type)
)
elif not self.payment_days and not self.salary_slip_based_on_timesheet: elif not self.payment_days and not self.salary_slip_based_on_timesheet:
d.amount = 0 d.amount = 0
elif not d.amount: elif not d.amount: