Merge pull request #22569 from rohitwaghchaure/fixed-travis-failing-due-to-loan-issue
fix: travis
diff --git a/erpnext/loan_management/doctype/loan/test_loan.py b/erpnext/loan_management/doctype/loan/test_loan.py
index 1f771c2..c65996e 100644
--- a/erpnext/loan_management/doctype/loan/test_loan.py
+++ b/erpnext/loan_management/doctype/loan/test_loan.py
@@ -79,10 +79,12 @@
"qty": 4000.00,
}]
- loan_application = create_loan_application('_Test Company', self.applicant2, 'Stock Loan', pledge, "Repay Over Number of Periods", 12)
+ loan_application = create_loan_application('_Test Company', self.applicant2,
+ 'Stock Loan', pledge, "Repay Over Number of Periods", 12)
create_pledge(loan_application)
- loan = create_loan_with_security(self.applicant2, "Stock Loan", "Repay Over Number of Periods", 12, loan_application)
+ loan = create_loan_with_security(self.applicant2, "Stock Loan", "Repay Over Number of Periods",
+ 12, loan_application)
self.assertEquals(loan.loan_amount, 1000000)
def test_loan_disbursement(self):
@@ -92,6 +94,7 @@
}]
loan_application = create_loan_application('_Test Company', self.applicant2, 'Stock Loan', pledge, "Repay Over Number of Periods", 12)
+
create_pledge(loan_application)
loan = create_loan_with_security(self.applicant2, "Stock Loan", "Repay Over Number of Periods", 12, loan_application)
@@ -217,7 +220,8 @@
"qty": 2000.00
}]
- loan_application = create_loan_application('_Test Company', self.applicant2, 'Stock Loan', pledges)
+ loan_application = create_loan_application('_Test Company', self.applicant2, 'Stock Loan', pledges,
+ "Repay Over Number of Periods", 12)
create_pledge(loan_application)
loan = create_loan_with_security(self.applicant2, "Stock Loan", "Repay Over Number of Periods", 12, loan_application,
@@ -247,7 +251,9 @@
"haircut": 50,
}]
- loan_application = create_loan_application('_Test Company', self.applicant2, 'Stock Loan', pledges)
+ loan_application = create_loan_application('_Test Company', self.applicant2,
+ 'Stock Loan', pledges, "Repay Over Number of Periods", 12)
+
create_pledge(loan_application)
loan = create_loan_with_security(self.applicant2, "Stock Loan", "Repay Over Number of Periods", 12, loan_application)
diff --git a/erpnext/payroll/doctype/salary_slip/test_salary_slip.py b/erpnext/payroll/doctype/salary_slip/test_salary_slip.py
index be9a2d3..37cd89a 100644
--- a/erpnext/payroll/doctype/salary_slip/test_salary_slip.py
+++ b/erpnext/payroll/doctype/salary_slip/test_salary_slip.py
@@ -105,7 +105,7 @@
#Gross pay calculation based on attendances
gross_pay = 78000 - ((78000 / (days_in_month - no_of_holidays)) * flt(ss.leave_without_pay))
- self.assertEqual(ss.gross_pay, gross_pay)
+ self.assertEqual(flt(ss.gross_pay, 2), flt(gross_pay, 2))
frappe.db.set_value("Payroll Settings", None, "payroll_based_on", "Leave")