schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: linter

Browse Source
This commit is contained in:
Saurabh
2023-03-09 12:26:45 +05:30
parent 563f83f0f5
commit 341eab2b2a
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -315,7 +315,7 @@ class SalarySlip(TransactionBase):
) )
working_days = date_diff(self.end_date, self.start_date) + 1 working_days = date_diff(self.end_date, self.start_date) + 1
working_days_list = [add_days(self.start_date)for i in range(working_days)] working_days_list = [add_days(self.start_date, i) for i in range(working_days)]
if for_preview: if for_preview:
self.total_working_days = working_days self.total_working_days = working_days
@@ -324,7 +324,7 @@ class SalarySlip(TransactionBase):
holidays = self.get_holidays_for_employee(self.start_date, self.end_date) holidays = self.get_holidays_for_employee(self.start_date, self.end_date)
joining_date, relieving_date = self.get_joining_and_relieving_date() joining_date, relieving_date = self.get_joining_and_relieving_dates()
if not cint(include_holidays_in_total_working_days): if not cint(include_holidays_in_total_working_days):
working_days -= len(holidays) working_days -= len(holidays)
@@ -337,10 +337,14 @@ class SalarySlip(TransactionBase):
frappe.throw(_("Please set Payroll based on in Payroll settings")) frappe.throw(_("Please set Payroll based on in Payroll settings"))
if payroll_based_on == "Attendance": if payroll_based_on == "Attendance":
actual_lwp, absent = self.calculate_lwp_ppl_and_absent_days_based_on_attendance(holidays, relieving_date) actual_lwp, absent = self.calculate_lwp_ppl_and_absent_days_based_on_attendance(
holidays, relieving_date
)
self.absent_days = absent self.absent_days = absent
else: else:
actual_lwp = self.calculate_lwp_or_ppl_based_on_leave_application(holidays, working_days_list, relieving_date) actual_lwp = self.calculate_lwp_or_ppl_based_on_leave_application(
holidays, working_days_list, relieving_date
)
if not lwp: if not lwp:
lwp = actual_lwp lwp = actual_lwp
@@ -463,7 +467,10 @@ class SalarySlip(TransactionBase):
def get_holidays_for_employee(self, start_date, end_date): def get_holidays_for_employee(self, start_date, end_date):
return get_holiday_dates_for_employee(self.employee, start_date, end_date) return get_holiday_dates_for_employee(self.employee, start_date, end_date)
def calculate_lwp_or_ppl_based_on_leave_application(self, holidays, working_days_list, relieving_date=None): def calculate_lwp_or_ppl_based_on_leave_application(
self, holidays, working_days_list, relieving_date=None
):
lwp = 0 lwp = 0
daily_wages_fraction_for_half_day = ( daily_wages_fraction_for_half_day = (

2
erpnext/payroll/doctype/salary_slip/test_salary_slip.py
View File

@@ -1128,7 +1128,6 @@ class TestSalarySlip(FrappeTestCase):
if deduction.salary_component == "TDS": if deduction.salary_component == "TDS":
self.assertEqual(deduction.amount, rounded(monthly_tax_amount)) self.assertEqual(deduction.amount, rounded(monthly_tax_amount))
@change_settings("Payroll Settings", {"payroll_based_on": "Leave"}) @change_settings("Payroll Settings", {"payroll_based_on": "Leave"})
def test_lwp_calculation_based_on_relieving_date(self): def test_lwp_calculation_based_on_relieving_date(self):
emp_id = make_employee("test_lwp_based_on_relieving_date@salary.com") emp_id = make_employee("test_lwp_based_on_relieving_date@salary.com")
@@ -1158,6 +1157,7 @@ class TestSalarySlip(FrappeTestCase):
self.assertEqual(ss.payment_days, (days_between_start_and_relieving - len(holidays))) self.assertEqual(ss.payment_days, (days_between_start_and_relieving - len(holidays)))
def get_no_of_days(): def get_no_of_days():
no_of_days_in_month = calendar.monthrange(getdate(nowdate()).year, getdate(nowdate()).month) no_of_days_in_month = calendar.monthrange(getdate(nowdate()).year, getdate(nowdate()).month)
no_of_holidays_in_month = len( no_of_holidays_in_month = len(