nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 23:52:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-07-15 14:34:30 +05:30
parent 43eec001ee
commit cc09d0d218
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/report/gross_profit/test_gross_profit.py
View File

@@ -557,10 +557,7 @@ class TestGrossProfit(FrappeTestCase):
"gross_profit_%": 12.5, "gross_profit_%": 12.5,
} }
gp_entry = [x for x in data if x.parent_invoice == sinv.name] gp_entry = [x for x in data if x.parent_invoice == sinv.name]
<<<<<<< HEAD
self.assertDictContainsSubset(expected_entry, gp_entry[0]) self.assertDictContainsSubset(expected_entry, gp_entry[0])
=======
self.assertEqual(gp_entry[0], gp_entry[0] | expected_entry)
def test_valuation_rate_without_previous_sle(self): def test_valuation_rate_without_previous_sle(self):
""" """
@@ -608,4 +605,3 @@ class TestGrossProfit(FrappeTestCase):
item_from_sinv2 = [x for x in data if x.parent_invoice == sinv2.name] item_from_sinv2 = [x for x in data if x.parent_invoice == sinv2.name]
self.assertEqual(len(item_from_sinv2), 1) self.assertEqual(len(item_from_sinv2), 1)
self.assertEqual(1800, item_from_sinv2[0].valuation_rate) self.assertEqual(1800, item_from_sinv2[0].valuation_rate)
>>>>>>> 577ce5ccd4 (test(gross profit): valuation rate from different warehouse)