nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Linting issues and test case fixes

Browse Source
This commit is contained in:
Deepesh Garg
2022-08-30 10:24:31 +05:30
parent e64e812679
commit 8217c6dd9f
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.py
View File

@@ -75,10 +75,8 @@ def term_loan_accrual_pending(date, loan=None):
filters = {"payment_date": ("<=", date), "is_accrued": 0} filters = {"payment_date": ("<=", date), "is_accrued": 0}
if loan: if loan:
filters.update({'parent': loan}) filters.update({"parent": loan})
pending_accrual = frappe.db.get_value( pending_accrual = frappe.db.get_value("Repayment Schedule", filters)
"Repayment Schedule", filters
)
return pending_accrual return pending_accrual

2
erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py
View File

@@ -330,13 +330,13 @@ class TestPayrollEntry(FrappeTestCase):
) )
salary_slip = frappe.get_doc("Salary Slip", name) salary_slip = frappe.get_doc("Salary Slip", name)
for row in salary_slip.loans: for row in salary_slip.loans:
if row.loan == loan.name: if row.loan == loan.name:
interest_amount = (280000 * 8.4) / (12 * 100) interest_amount = (280000 * 8.4) / (12 * 100)
principal_amount = loan.monthly_repayment_amount - interest_amount principal_amount = loan.monthly_repayment_amount - interest_amount
self.assertEqual(row.interest_amount, interest_amount) self.assertEqual(row.interest_amount, interest_amount)
self.assertEqual(row.principal_amount, principal_amount) self.assertEqual(row.principal_amount, principal_amount)
self.assertEqual(row.total_payment, interest_amount + principal_amount)
if salary_slip.docstatus == 0: if salary_slip.docstatus == 0:
frappe.delete_doc("Salary Slip", name) frappe.delete_doc("Salary Slip", name)

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

@@ -1379,10 +1379,11 @@ class SalarySlip(TransactionBase):
for loan in self.get_loan_details(): for loan in self.get_loan_details():
amounts = calculate_amounts(loan.name, self.posting_date, "Regular Payment") amounts = calculate_amounts(loan.name, self.posting_date, "Regular Payment")
if (amounts["interest_amount"] or amounts["payable_principal_amount"]) \ if (amounts["interest_amount"] or amounts["payable_principal_amount"]) and (
and (amounts["payable_principal_amount"] + amounts["interest_amount"] > amounts["written_off_amount"]): amounts["payable_principal_amount"] + amounts["interest_amount"]
> amounts["written_off_amount"]
):
print("Ininininin")
if amounts["interest_amount"] > amounts["written_off_amount"]: if amounts["interest_amount"] > amounts["written_off_amount"]:
amounts["interest_amount"] -= amounts["written_off_amount"] amounts["interest_amount"] -= amounts["written_off_amount"]
amounts["written_off_amount"] = 0 amounts["written_off_amount"] = 0

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

@@ -670,9 +670,10 @@ class TestSalarySlip(FrappeTestCase):
ss = make_employee_salary_slip( ss = make_employee_salary_slip(
"test_loan_repayment_salary_slip@salary.com", "Monthly", "Test Loan Repayment Salary Structure" "test_loan_repayment_salary_slip@salary.com", "Monthly", "Test Loan Repayment Salary Structure"
) )
ss.loans[0].total_payment = 592
ss.submit() ss.submit()
self.assertEqual(ss.total_loan_repayment, 592)
self.assertEqual( self.assertEqual(
ss.net_pay, (flt(ss.gross_pay) - (flt(ss.total_deduction) + flt(ss.total_loan_repayment))) ss.net_pay, (flt(ss.gross_pay) - (flt(ss.total_deduction) + flt(ss.total_loan_repayment)))
) )