mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-22 14:39:19 +00:00
refactor(test): fix broken test cases in Sales Invoice
(cherry picked from commit 8ebe5733ac)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
This commit is contained in:
@@ -49,6 +49,7 @@ class TestSalesInvoice(FrappeTestCase):
|
|||||||
create_items(["_Test Internal Transfer Item"], uoms=[{"uom": "Box", "conversion_factor": 10}])
|
create_items(["_Test Internal Transfer Item"], uoms=[{"uom": "Box", "conversion_factor": 10}])
|
||||||
create_internal_parties()
|
create_internal_parties()
|
||||||
setup_accounts()
|
setup_accounts()
|
||||||
|
frappe.db.set_single_value("Accounts Settings", "acc_frozen_upto", None)
|
||||||
|
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
frappe.db.rollback()
|
frappe.db.rollback()
|
||||||
@@ -3205,6 +3206,7 @@ class TestSalesInvoice(FrappeTestCase):
|
|||||||
self.assertEqual(expected_gle[i][2], gle.debit)
|
self.assertEqual(expected_gle[i][2], gle.debit)
|
||||||
self.assertEqual(getdate(expected_gle[i][3]), gle.posting_date)
|
self.assertEqual(getdate(expected_gle[i][3]), gle.posting_date)
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
acc_settings = frappe.get_single("Accounts Settings")
|
acc_settings = frappe.get_single("Accounts Settings")
|
||||||
acc_settings.book_deferred_entries_via_journal_entry = 0
|
acc_settings.book_deferred_entries_via_journal_entry = 0
|
||||||
@@ -3216,6 +3218,8 @@ class TestSalesInvoice(FrappeTestCase):
|
|||||||
frappe.db.set_single_value("Accounts Settings", "acc_frozen_upto", None)
|
frappe.db.set_single_value("Accounts Settings", "acc_frozen_upto", None)
|
||||||
>>>>>>> 58065f31b1 (refactor(test): use @change_settings in sales invoice)
|
>>>>>>> 58065f31b1 (refactor(test): use @change_settings in sales invoice)
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> 8ebe5733ac (refactor(test): fix broken test cases in Sales Invoice)
|
||||||
def test_standalone_serial_no_return(self):
|
def test_standalone_serial_no_return(self):
|
||||||
si = create_sales_invoice(
|
si = create_sales_invoice(
|
||||||
item_code="_Test Serialized Item With Series", update_stock=True, is_return=True, qty=-1
|
item_code="_Test Serialized Item With Series", update_stock=True, is_return=True, qty=-1
|
||||||
|
|||||||
Reference in New Issue
Block a user