diff --git a/erpnext/accounts/doctype/advance_payment_ledger_entry/test_advance_payment_ledger_entry.py b/erpnext/accounts/doctype/advance_payment_ledger_entry/test_advance_payment_ledger_entry.py index c355c160eb7..20f08f46930 100644 --- a/erpnext/accounts/doctype/advance_payment_ledger_entry/test_advance_payment_ledger_entry.py +++ b/erpnext/accounts/doctype/advance_payment_ledger_entry/test_advance_payment_ledger_entry.py @@ -29,7 +29,6 @@ class TestAdvancePaymentLedgerEntry(ERPNextTestSuite, AccountsTestMixin): self.cash = "Cash - _TC" self.debtors_usd = "_Test Receivable USD - _TC" self.creditors_usd = "_Test Payable USD - _TC" - self.clear_old_entries() def create_sales_order(self, qty=1, rate=100, currency="INR", do_not_submit=False): """ diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/test_bank_reconciliation_tool.py b/erpnext/accounts/doctype/bank_reconciliation_tool/test_bank_reconciliation_tool.py index f47d9aec98c..1be8c5177c6 100644 --- a/erpnext/accounts/doctype/bank_reconciliation_tool/test_bank_reconciliation_tool.py +++ b/erpnext/accounts/doctype/bank_reconciliation_tool/test_bank_reconciliation_tool.py @@ -21,7 +21,6 @@ class TestBankReconciliationTool(ERPNextTestSuite, AccountsTestMixin): self.customer = "_Test Customer" self.bank = "HDFC - _TC" self.debit_to = "Debtors - _TC" - self.clear_old_entries() bank_dt = qb.DocType("Bank") qb.from_(bank_dt).delete().where(bank_dt.name == "HDFC").run() self.create_bank_account() diff --git a/erpnext/accounts/doctype/bank_statement_import_log/test_bank_statement_import_log.py b/erpnext/accounts/doctype/bank_statement_import_log/test_bank_statement_import_log.py index a4240b3cbd9..5d2c02ec305 100644 --- a/erpnext/accounts/doctype/bank_statement_import_log/test_bank_statement_import_log.py +++ b/erpnext/accounts/doctype/bank_statement_import_log/test_bank_statement_import_log.py @@ -29,7 +29,6 @@ class TestBankStatementImportLog(ERPNextTestSuite, AccountsTestMixin): self.company = "_Test Company" self.customer = "_Test Customer" self.bank = "HDFC - _TC" - self.clear_old_entries() bank_dt = qb.DocType("Bank") qb.from_(bank_dt).delete().where(bank_dt.name == "HDFC").run() self.create_bank_account() diff --git a/erpnext/accounts/doctype/bank_transaction_rule/test_bank_transaction_rule.py b/erpnext/accounts/doctype/bank_transaction_rule/test_bank_transaction_rule.py index c8dc91baa72..4cb7e266c39 100644 --- a/erpnext/accounts/doctype/bank_transaction_rule/test_bank_transaction_rule.py +++ b/erpnext/accounts/doctype/bank_transaction_rule/test_bank_transaction_rule.py @@ -16,7 +16,6 @@ class TestBankTransactionRule(ERPNextTestSuite, AccountsTestMixin): self.bank = "HDFC - _TC" self.debit_to = "Debtors - _TC" self.cash = "Cash - _TC" - self.clear_old_entries() bank_dt = qb.DocType("Bank") qb.from_(bank_dt).delete().where(bank_dt.name == "HDFC").run() self.create_bank_account() diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py b/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py index 57af5a51329..77c8d8ec845 100644 --- a/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py +++ b/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py @@ -20,7 +20,6 @@ class TestExchangeRateRevaluation(ERPNextTestSuite, AccountsTestMixin): self.customer = "_Test Customer" self.cost_center = "Main - _TC" self.debtors_usd = "_Test Receivable USD - _TC" - self.clear_old_entries() self.set_system_and_company_settings() def set_system_and_company_settings(self): diff --git a/erpnext/accounts/doctype/ledger_health/test_ledger_health.py b/erpnext/accounts/doctype/ledger_health/test_ledger_health.py index 9536f2be29b..800581b91ea 100644 --- a/erpnext/accounts/doctype/ledger_health/test_ledger_health.py +++ b/erpnext/accounts/doctype/ledger_health/test_ledger_health.py @@ -17,7 +17,6 @@ class TestLedgerHealth(ERPNextTestSuite, AccountsTestMixin): self.debit_to = "Debtors - _TC" self.income_account = "Sales - _TC" self.configure_monitoring_tool() - self.clear_old_entries() def configure_monitoring_tool(self): monitor_settings = frappe.get_doc("Ledger Health Monitor") diff --git a/erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py b/erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py index dbc5d9e146a..6ea63fd6c24 100644 --- a/erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py +++ b/erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py @@ -20,7 +20,6 @@ class TestPaymentLedgerEntry(ERPNextTestSuite): self.create_company() self.create_item() self.create_customer() - self.clear_old_entries() def create_company(self): company_name = "_Test Payment Ledger" diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py b/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py index b430d67e83f..61dc7686b45 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py +++ b/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py @@ -23,7 +23,6 @@ class TestProcessStatementOfAccounts(ERPNextTestSuite, AccountsTestMixin): self.company = "_Test Company" self.create_customer(customer_name="Other Customer") - self.clear_old_entries() self.si = create_sales_invoice() create_sales_invoice(customer="Other Customer") diff --git a/erpnext/accounts/doctype/unreconcile_payment/test_unreconcile_payment.py b/erpnext/accounts/doctype/unreconcile_payment/test_unreconcile_payment.py index 56d1f793222..ac622353cbb 100644 --- a/erpnext/accounts/doctype/unreconcile_payment/test_unreconcile_payment.py +++ b/erpnext/accounts/doctype/unreconcile_payment/test_unreconcile_payment.py @@ -24,7 +24,6 @@ class TestUnreconcilePayment(ERPNextTestSuite, AccountsTestMixin): self.cost_center = "Main - _TC" self.cash = "Cash - _TC" self.debtors_usd = "_Test Receivable USD - _TC" - self.clear_old_entries() def create_sales_invoice(self, do_not_submit=False): si = create_sales_invoice( @@ -375,7 +374,6 @@ class TestUnreconcilePayment(ERPNextTestSuite, AccountsTestMixin): self.assertEqual(so.advance_paid, 0) def test_06_unreconcile_advance_from_payment_entry(self): - self.enable_advance_as_liability() so1 = self.create_sales_order() so2 = self.create_sales_order() @@ -426,7 +424,11 @@ class TestUnreconcilePayment(ERPNextTestSuite, AccountsTestMixin): self.disable_advance_as_liability() def test_07_adv_from_so_to_invoice(self): - self.enable_advance_as_liability() + frappe.db.set_value("Company", self.company, "book_advance_payments_in_separate_party_account", True) + frappe.db.set_value( + "Company", self.company, "default_advance_received_account", "Advance Received - _TC" + ) + so = self.create_sales_order() pe = self.create_payment_entry() pe.paid_amount = 1000 diff --git a/erpnext/accounts/report/accounts_payable/test_accounts_payable.py b/erpnext/accounts/report/accounts_payable/test_accounts_payable.py index d041451ae94..cced8318dec 100644 --- a/erpnext/accounts/report/accounts_payable/test_accounts_payable.py +++ b/erpnext/accounts/report/accounts_payable/test_accounts_payable.py @@ -11,7 +11,7 @@ class TestAccountsPayable(ERPNextTestSuite, AccountsTestMixin): def setUp(self): self.company = "_Test Company" self.item = "_Test Item" - self.supplier = "_Test Supplier USD" + self.supplier = "_Test Supplier 2" self.creditors_usd = "_Test Payable USD - _TC" def test_accounts_payable_for_foreign_currency_supplier(self): diff --git a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py index f2a5a497943..1eeef329fe4 100644 --- a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py @@ -23,7 +23,6 @@ class TestAccountsReceivable(ERPNextTestSuite, AccountsTestMixin): self.debit_to = "Debtors - _TC" self.cash = "Cash - _TC" self.debtors_usd = "_Test Receivable USD - _TC" - self.clear_old_entries() def create_sales_invoice(self, no_payment_schedule=False, do_not_submit=False, **args): frappe.set_user("Administrator") diff --git a/erpnext/accounts/report/accounts_receivable_summary/test_accounts_receivable_summary.py b/erpnext/accounts/report/accounts_receivable_summary/test_accounts_receivable_summary.py index 42444f75885..7fe81ae0efd 100644 --- a/erpnext/accounts/report/accounts_receivable_summary/test_accounts_receivable_summary.py +++ b/erpnext/accounts/report/accounts_receivable_summary/test_accounts_receivable_summary.py @@ -16,7 +16,6 @@ class TestAccountsReceivable(ERPNextTestSuite, AccountsTestMixin): self.item = "_Test Item" self.debit_to = "Debtors - _TC" self.cost_center = "Main - _TC" - self.clear_old_entries() def test_01_receivable_summary_output(self): """ diff --git a/erpnext/accounts/report/customer_ledger_summary/test_customer_ledger_summary.py b/erpnext/accounts/report/customer_ledger_summary/test_customer_ledger_summary.py index a378b7b1be4..46a7628422e 100644 --- a/erpnext/accounts/report/customer_ledger_summary/test_customer_ledger_summary.py +++ b/erpnext/accounts/report/customer_ledger_summary/test_customer_ledger_summary.py @@ -18,7 +18,6 @@ class TestCustomerLedgerSummary(ERPNextTestSuite, AccountsTestMixin): self.debit_to = "Debtors - _TC" self.cost_center = "Main - _TC" self.cash = "Cash - _TC" - self.clear_old_entries() def create_sales_invoice(self, do_not_submit=False, **args): si = create_sales_invoice( diff --git a/erpnext/accounts/report/deferred_revenue_and_expense/test_deferred_revenue_and_expense.py b/erpnext/accounts/report/deferred_revenue_and_expense/test_deferred_revenue_and_expense.py index 497498b8ac3..abc1052ba24 100644 --- a/erpnext/accounts/report/deferred_revenue_and_expense/test_deferred_revenue_and_expense.py +++ b/erpnext/accounts/report/deferred_revenue_and_expense/test_deferred_revenue_and_expense.py @@ -71,7 +71,6 @@ class TestDeferredRevenueAndExpense(ERPNextTestSuite, AccountsTestMixin): self.income_account = "Sales - _TC" self.expense_account = "Cost of Goods Sold - _TC" self.setup_deferred_accounts_and_items() - self.clear_old_entries() @ERPNextTestSuite.change_settings("Accounts Settings", {"book_deferred_entries_based_on": "Months"}) def test_deferred_revenue(self): diff --git a/erpnext/accounts/report/general_ledger/test_general_ledger.py b/erpnext/accounts/report/general_ledger/test_general_ledger.py index 8f558467192..e88f4fa8560 100644 --- a/erpnext/accounts/report/general_ledger/test_general_ledger.py +++ b/erpnext/accounts/report/general_ledger/test_general_ledger.py @@ -14,7 +14,6 @@ from erpnext.tests.utils import ERPNextTestSuite class TestGeneralLedger(ERPNextTestSuite): def setUp(self): self.company = "_Test Company" - self.clear_old_entries() def clear_old_entries(self): doctype_list = [ diff --git a/erpnext/accounts/report/gross_profit/test_gross_profit.py b/erpnext/accounts/report/gross_profit/test_gross_profit.py index 74f4a0eba6b..72fef842849 100644 --- a/erpnext/accounts/report/gross_profit/test_gross_profit.py +++ b/erpnext/accounts/report/gross_profit/test_gross_profit.py @@ -18,8 +18,6 @@ class TestGrossProfit(ERPNextTestSuite): self.create_item() self.create_bundle() self.create_customer() - self.create_sales_invoice() - self.clear_old_entries() def create_company(self): company_name = "_Test Gross Profit" diff --git a/erpnext/accounts/report/supplier_ledger_summary/test_supplier_ledger_summary.py b/erpnext/accounts/report/supplier_ledger_summary/test_supplier_ledger_summary.py index d4be56bfd69..620a1fb2fb1 100644 --- a/erpnext/accounts/report/supplier_ledger_summary/test_supplier_ledger_summary.py +++ b/erpnext/accounts/report/supplier_ledger_summary/test_supplier_ledger_summary.py @@ -12,7 +12,6 @@ class TestSupplierLedgerSummary(ERPNextTestSuite, AccountsTestMixin): self.company = "_Test Company" self.supplier = "_Test Supplier" self.item = "_Test Item" - self.clear_old_entries() def create_purchase_invoice(self, do_not_submit=False): frappe.set_user("Administrator") diff --git a/erpnext/accounts/report/tax_withholding_details/test_tax_withholding_details.py b/erpnext/accounts/report/tax_withholding_details/test_tax_withholding_details.py index d55773f5189..67dcfeadcca 100644 --- a/erpnext/accounts/report/tax_withholding_details/test_tax_withholding_details.py +++ b/erpnext/accounts/report/tax_withholding_details/test_tax_withholding_details.py @@ -21,7 +21,6 @@ from erpnext.tests.utils import ERPNextTestSuite class TestTaxWithholdingDetails(ERPNextTestSuite, AccountsTestMixin): def setUp(self): self.company = "_Test Company" - self.clear_old_entries() create_records() def test_tax_withholding_for_customers(self):