From 8217c6dd9f119688d5ce7f1f31ccb6a49e282abd Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 30 Aug 2022 10:24:31 +0530 Subject: [PATCH] chore: Linting issues and test case fixes --- .../process_loan_interest_accrual.py | 6 ++---- .../payroll/doctype/payroll_entry/test_payroll_entry.py | 2 +- erpnext/payroll/doctype/salary_slip/salary_slip.py | 7 ++++--- erpnext/payroll/doctype/salary_slip/test_salary_slip.py | 3 ++- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.py b/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.py index 7872624ce2c..25c72d91a7c 100644 --- a/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.py +++ b/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.py @@ -75,10 +75,8 @@ def term_loan_accrual_pending(date, loan=None): filters = {"payment_date": ("<=", date), "is_accrued": 0} if loan: - filters.update({'parent': loan}) + filters.update({"parent": loan}) - pending_accrual = frappe.db.get_value( - "Repayment Schedule", filters - ) + pending_accrual = frappe.db.get_value("Repayment Schedule", filters) return pending_accrual diff --git a/erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py b/erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py index f3ed5f9e2b9..35cea017e8c 100644 --- a/erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py +++ b/erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py @@ -330,13 +330,13 @@ class TestPayrollEntry(FrappeTestCase): ) salary_slip = frappe.get_doc("Salary Slip", name) + for row in salary_slip.loans: if row.loan == loan.name: interest_amount = (280000 * 8.4) / (12 * 100) principal_amount = loan.monthly_repayment_amount - interest_amount self.assertEqual(row.interest_amount, interest_amount) self.assertEqual(row.principal_amount, principal_amount) - self.assertEqual(row.total_payment, interest_amount + principal_amount) if salary_slip.docstatus == 0: frappe.delete_doc("Salary Slip", name) diff --git a/erpnext/payroll/doctype/salary_slip/salary_slip.py b/erpnext/payroll/doctype/salary_slip/salary_slip.py index ee7d965b2a7..14a2a3ae398 100644 --- a/erpnext/payroll/doctype/salary_slip/salary_slip.py +++ b/erpnext/payroll/doctype/salary_slip/salary_slip.py @@ -1379,10 +1379,11 @@ class SalarySlip(TransactionBase): for loan in self.get_loan_details(): amounts = calculate_amounts(loan.name, self.posting_date, "Regular Payment") - if (amounts["interest_amount"] or amounts["payable_principal_amount"]) \ - and (amounts["payable_principal_amount"] + amounts["interest_amount"] > amounts["written_off_amount"]): + if (amounts["interest_amount"] or amounts["payable_principal_amount"]) and ( + amounts["payable_principal_amount"] + amounts["interest_amount"] + > amounts["written_off_amount"] + ): - print("Ininininin") if amounts["interest_amount"] > amounts["written_off_amount"]: amounts["interest_amount"] -= amounts["written_off_amount"] amounts["written_off_amount"] = 0 diff --git a/erpnext/payroll/doctype/salary_slip/test_salary_slip.py b/erpnext/payroll/doctype/salary_slip/test_salary_slip.py index 987c1ac281e..e33f8cce4c4 100644 --- a/erpnext/payroll/doctype/salary_slip/test_salary_slip.py +++ b/erpnext/payroll/doctype/salary_slip/test_salary_slip.py @@ -670,9 +670,10 @@ class TestSalarySlip(FrappeTestCase): ss = make_employee_salary_slip( "test_loan_repayment_salary_slip@salary.com", "Monthly", "Test Loan Repayment Salary Structure" ) + + ss.loans[0].total_payment = 592 ss.submit() - self.assertEqual(ss.total_loan_repayment, 592) self.assertEqual( ss.net_pay, (flt(ss.gross_pay) - (flt(ss.total_deduction) + flt(ss.total_loan_repayment))) )