From d4bcf3be5e5ba416e81b34a71702448c3ac552ab Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Wed, 8 Jan 2025 14:05:37 +0530 Subject: [PATCH] chore: resolve conflicts --- .../purchase_reconciliation_tool/__init__.py | 15 +-------------- 1 file changed, 1 insertion(+), 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 index eff9104f9..86af6c52a 100644 --- 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)