nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 11:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix merge conflict

Browse Source
This commit is contained in:
marination
2022-06-20 16:59:18 +05:30
parent 642b9c5466
commit 5bcfbbe124
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
View File

@@ -40,7 +40,9 @@ class TestStockLedgerEntry(FrappeTestCase, StockTestMixin):
"delete from `tabBin` where item_code in (%s)" % (", ".join(["%s"] * len(items))), items "delete from `tabBin` where item_code in (%s)" % (", ".join(["%s"] * len(items))), items
) )
<<<<<<< HEAD def tearDown(self):
frappe.db.rollback()
def assertSLEs(self, doc, expected_sles, sle_filters=None): def assertSLEs(self, doc, expected_sles, sle_filters=None):
"""Compare sorted SLEs, useful for vouchers that create multiple SLEs for same line""" """Compare sorted SLEs, useful for vouchers that create multiple SLEs for same line"""
@@ -64,10 +66,6 @@ class TestStockLedgerEntry(FrappeTestCase, StockTestMixin):
continue continue
self.assertEqual(v, act_value, msg=f"{k} doesn't match \n{exp_sle}\n{act_sle}") self.assertEqual(v, act_value, msg=f"{k} doesn't match \n{exp_sle}\n{act_sle}")
=======
def tearDown(self):
frappe.db.rollback()
>>>>>>> d6078aa911 (fix: Respect system precision for user facing balance qty values (#30837))
def test_item_cost_reposting(self): def test_item_cost_reposting(self):
company = "_Test Company" company = "_Test Company"