fix: changes as per review

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

Hide file tree

Showing 4 changed files with 39 additions and 29 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,12 @@ 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(
+                    _(
+                        "No record is found in GSTR-2B or generation is still in progress"
+                    ),
+                    title=_("Not Generated"),
+                )
                 continue
 
             if response.error_type == "no_docs_found":
@@ -155,7 +160,10 @@ 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(
+                _("No record is found in GSTR-2B or generation is still in progress"),
+                title=_("Not Generated"),
+            )
             continue
 
         if response.error_type == "no_docs_found":

diff --git a/india_compliance/patches.txt b/india_compliance/patches.txt
@@ -47,4 +47,4 @@ execute:from erpnext.stock.doctype.repost_item_valuation.repost_item_valuation i
 india_compliance.patches.v14.set_item_details_from_purchase_invoice_to_bill_of_entry
 india_compliance.patches.v14.update_item_gst_details_and_gst_trearment_in_bill_of_entry
 india_compliance.patches.v14.update_default_auto_reconciliation_settings
-india_compliance.patches.v14.delete_gstr_import_log_with_error_type_RET2B1023
+india_compliance.patches.v14.delete_not_generated_gstr_import_log
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
diff --git a/india_compliance/patches/v14/delete_not_generated_gstr_import_log.py b/india_compliance/patches/v14/delete_not_generated_gstr_import_log.py
@@ -0,0 +1,28 @@
+import json
+
+import frappe
+
+
+def execute():
+    requests = frappe.get_all(
+        "Integration Request",
+        filters={
+            "url": ("like", "%gstr2b%"),
+            "data": ("!=", ""),
+            "output": ("like", "%RET2B1023%"),
+        },
+        fields=["data", "output"],
+    )
+
+    for request in requests:
+        request_data = json.loads(request.data)
+
+        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", ""),
+            },
+        )