fix: resolve merge conflict

resilient-tech · Oct 21, 2024 · 2c46b70 · 2c46b70
1 parent 0a87708
commit 2c46b70
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 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/gst_india/utils/__init__.py b/india_compliance/gst_india/utils/__init__.py
@@ -414,19 +414,13 @@ def get_place_of_supply(party_details, doctype):
             if gst_state_number and gst_state:
                 return f"{gst_state_number}-{gst_state}"
 
-<<<<<<< HEAD
-        party_gstin = party_details.billing_address_gstin or party_details.company_gstin
-    else:
-        party_gstin = party_details.company_gstin or party_details.supplier_gstin
-=======
         pos_gstin = party_details.billing_address_gstin or party_details.company_gstin
 
     elif doctype == "Stock Entry":
         pos_gstin = party_details.bill_to_gstin or party_details.bill_from_gstin
     else:
         # for purchase, subcontracting order and receipt
         pos_gstin = party_details.company_gstin or party_details.supplier_gstin
->>>>>>> aafed021 (fix: pos based on account settings (#2647))
 
     if not pos_gstin:
         return

diff --git a/india_compliance/patches.txt b/india_compliance/patches.txt
@@ -4,13 +4,8 @@ execute:import frappe; frappe.delete_doc_if_exists("DocType", "GSTIN")
 [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() #7
-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