chore: resolve conflicts

Author: ljain112

india_compliance/gst_india/report/gst_purchase_register_beta/gst_purchase_register_beta.py

@@ -3,7 +3,7 @@
 import frappe
 from frappe import _
 
-from india_compliance.gst_india.utils.gstr3b.gstr3b_data import GSTR3BInvoices
+from india_compliance.gst_india.utils.gstr3b.gstr3b_inward_data import GSTR3BInwardInvoices
 
 SECTION_MAPPING = {
     "4": {
@@ -279,7 +279,7 @@ def get_tax_columns():
 
 def get_data(filters):
     data = []
-    gstr3b_invoices = GSTR3BInvoices(filters)
+    gstr3b_invoices = GSTR3BInwardInvoices(filters)
     is_grouped_by_invoice = filters.summary_by != "Summary by Item"
     sub_section = filters.sub_section
 

india_compliance/gst_india/utils/gstr3b/gstr3b_outward_data.py

@@ -3,11 +3,11 @@
 
 import frappe
 
+from india_compliance.gst_india.report.gstr_1.gstr_1 import GSTR11A11BData
 from india_compliance.gst_india.utils import get_gst_accounts_by_type
 from india_compliance.gst_india.utils.gstr3b.gstr3b_inward_data import GSTR3BInwardQuery
 from india_compliance.gst_india.utils.gstr_1.gstr_1_data import (
     GSTR1Query,
-    GSTR11A11BData,
 )
 
 # GST categories that need to be reported in section 3.2 (inter-state supplies)