nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-09-27 10:02:40 +05:30
committed by GitHub
parent 15f0c28cda
commit c26ed80d67
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
View File

@@ -422,9 +422,6 @@ class TestSubcontractingReceipt(FrappeTestCase):
self.assertEqual(expected_values[gle.account][0], gle.debit) self.assertEqual(expected_values[gle.account][0], gle.debit)
self.assertEqual(expected_values[gle.account][1], gle.credit) self.assertEqual(expected_values[gle.account][1], gle.credit)
<<<<<<< HEAD
@change_settings("Stock Settings", {"use_serial_batch_fields": 0})
=======
def test_subcontracting_receipt_for_service_expense_account(self): def test_subcontracting_receipt_for_service_expense_account(self):
service_expense_account = ( service_expense_account = (
frappe.get_doc( frappe.get_doc(
@@ -498,8 +495,7 @@ class TestSubcontractingReceipt(FrappeTestCase):
self.assertEqual(expected_values[gle.account][0], gle.debit) self.assertEqual(expected_values[gle.account][0], gle.debit)
self.assertEqual(expected_values[gle.account][1], gle.credit) self.assertEqual(expected_values[gle.account][1], gle.credit)
@IntegrationTestCase.change_settings("Stock Settings", {"use_serial_batch_fields": 0}) @change_settings("Stock Settings", {"use_serial_batch_fields": 0})
>>>>>>> 6e597b9c42 (feat: service expense account in the subcontracting receipt)
def test_subcontracting_receipt_with_zero_service_cost(self): def test_subcontracting_receipt_with_zero_service_cost(self):
warehouse = "Stores - TCP1" warehouse = "Stores - TCP1"
service_items = [ service_items = [