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

[Fix] From Date and To Date not to be auto calculated for Timesheet Salary

Browse Source
This commit is contained in:
Kanchan Chauhan 2017-03-30 08:32:50 +05:30 committed by Nabin Hait
parent 3528d08178
commit 5ac740b3cb
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,9 @@ class SalarySlip(TransactionBase):
self.status = self.get_status()
self.validate_dates()
self.check_existing()
self.get_date_details()
if not self.salary_slip_based_on_timesheet:
self.get_date_details()
if not (len(self.get("earnings")) or len(self.get("deductions"))):
# get details from salary structure
self.get_emp_and_leave_details()
@ -121,7 +123,8 @@ class SalarySlip(TransactionBase):
self.set("earnings", [])
self.set("deductions", [])
self.get_date_details()
if not self.salary_slip_based_on_timesheet:
self.get_date_details()
self.validate_dates()
joining_date, relieving_date = frappe.db.get_value("Employee", self.employee,
["date_of_joining", "relieving_date"])
@ -189,7 +192,8 @@ class SalarySlip(TransactionBase):
def process_salary_structure(self):
'''Calculate salary after salary structure details have been updated'''
self.get_date_details()
if not self.salary_slip_based_on_timesheet:
self.get_date_details()
self.pull_emp_details()
self.get_leave_details()
self.calculate_net_pay()