chore: resolve conflicts

resilient-tech · Jan 8, 2025 · d4bcf3b · d4bcf3b
1 parent e4108a4
commit d4bcf3b
Showing 1 changed file with 1 addition and 14 deletions.
diff --git a/india_compliance/gst_india/doctype/purchase_reconciliation_tool/__init__.py b/india_compliance/gst_india/doctype/purchase_reconciliation_tool/__init__.py
@@ -376,16 +376,7 @@ def get_all(self, additional_fields=None, names=None, only_names=False):
 
     def get_unmatched(self, category):
         gst_category = (
-<<<<<<< HEAD
-            ("Registered Regular", "Tax Deductor")
-=======
-            (
-                "Registered Regular",
-                "Tax Deductor",
-                "Tax Collector",
-                "Input Service Distributor",
-            )
->>>>>>> fc9e366f (fix: support purchases from tax collector in purchae reco tool)
+            ("Registered Regular", "Tax Deductor", "Tax Collector")
             if category in ("B2B", "CDNR", "ISD")
             else ("SEZ", "Overseas", "UIN Holders")
         )
@@ -1235,11 +1226,7 @@ def guess_classification(doc):
             "Overseas": "IMPG",
             "UIN Holders": "B2B",
             "Tax Deductor": "B2B",
-<<<<<<< HEAD
-=======
             "Tax Collector": "B2B",
-            "Input Service Distributor": "B2B",
->>>>>>> fc9e366f (fix: support purchases from tax collector in purchae reco tool)
         }
 
         classification = GST_CATEGORIES.get(doc.gst_category)