fix: changes as per review

Sanket322 · May 21, 2024 · b7053e8 · b7053e8
1 parent dafce77
commit b7053e8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/india_compliance/gst_india/utils/gstr_2/__init__.py b/india_compliance/gst_india/utils/gstr_2/__init__.py
@@ -83,7 +83,9 @@ def download_gstr_2a(gstin, return_periods, otp=None, gst_categories=None):
                 return response
 
             if response.error_type == "not_generated":
-                frappe.msgprint("No data has found for {0}".format(return_period))
+                frappe.msgprint(
+                    "Either you do not have any records in GSTR-2B or the generation is still in progress."
+                )
                 continue
 
             if response.error_type == "no_docs_found":
@@ -155,7 +157,9 @@ def download_gstr_2b(gstin, return_periods, otp=None):
             return response
 
         if response.error_type == "not_generated":
-            frappe.msgprint("No data has found for {0}".format(return_period))
+            frappe.msgprint(
+                "Either you do not have any records in GSTR-2B or the generation is still in progress."
+            )
             continue
 
         if response.error_type == "no_docs_found":

diff --git a/india_compliance/patches/v14/delete_gstr_import_log_with_error_type_RET2B1023.py b/india_compliance/patches/v14/delete_gstr_import_log_with_error_type_RET2B1023.py
@@ -4,23 +4,25 @@
 
 
 def execute():
-    requests = frappe.get_list(
+    requests = frappe.get_all(
         "Integration Request",
-        filters={"url": ("like", "%gstr2b%"), "data": ("!=", ""), "output": ("!=", "")},
+        filters={
+            "url": ("like", "%gstr2b%"),
+            "data": ("!=", ""),
+            "output": ("like", "%RET2B1023%"),
+        },
         fields=["data", "output"],
     )
 
     for request in requests:
         request_data = json.loads(request.data)
-        response = json.loads(request.output)
 
-        error = response.get("error", {})
-        if error.get("error_cd", "") == "RET2B1023":
-            frappe.db.delete(
-                "GSTR Import Log",
-                filters={
-                    "data_not_found": 1,
-                    "gstin": request_data.get("gstin", ""),
-                    "return_period": request_data.get("rtnprd", ""),
-                },
-            )
+        frappe.db.delete(
+            "GSTR Import Log",
+            filters={
+                "data_not_found": 1,
+                "return_type": "GSTR2b",
+                "gstin": request_data.get("gstin", ""),
+                "return_period": request_data.get("rtnprd", ""),
+            },
+        )