fix: resolve merge conflict

resilient-tech · Oct 21, 2024 · fb1cfac · fb1cfac
1 parent f6a4a9c
commit fb1cfac
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/india_compliance/gst_india/overrides/test_transaction.py b/india_compliance/gst_india/overrides/test_transaction.py
@@ -1153,7 +1153,7 @@ def test_so_and_po_after_item_update(self):
             )
 
 
-class TestPlaceOfSupply(IntegrationTestCase):
+class TestPlaceOfSupply(FrappeTestCase):
     def test_pos_sales_invoice(self):
         doc_args = {
             "doctype": "Sales Invoice",

diff --git a/india_compliance/patches.txt b/india_compliance/patches.txt
@@ -5,13 +5,8 @@ india_compliance.patches.v15.remove_duplicate_web_template
 [post_model_sync]
 india_compliance.patches.v14.set_default_for_overridden_accounts_setting
 execute:from india_compliance.gst_india.setup import create_custom_fields; create_custom_fields() #58
-<<<<<<< HEAD
-execute:from india_compliance.gst_india.setup import create_property_setters; create_property_setters() #8
-execute:from india_compliance.income_tax_india.setup import create_custom_fields; create_custom_fields() #1
-=======
 execute:from india_compliance.gst_india.setup import create_property_setters; create_property_setters() #9
 execute:from india_compliance.income_tax_india.setup import create_custom_fields; create_custom_fields() #2
->>>>>>> aafed021 (fix: pos based on account settings (#2647))
 india_compliance.patches.post_install.remove_old_fields #2
 india_compliance.patches.post_install.set_gst_tax_type
 india_compliance.patches.post_install.set_gst_tax_type_in_journal_entry