Merge pull request #107 from 8848digital/oct_1st_to_last_month

Oct 1st to last month

Author: nirali8848

india_compliance/__init__.py

@@ -1 +1 @@
-__version__ = "15.22.1"
+__version__ = "15.23.0"

india_compliance/exceptions.py

@@ -1,11 +1,17 @@
-class GSPServerError(Exception):
-    def __init__(self, message="GSP/GST server is down", *args, **kwargs):
-        super().__init__(message, *args, **kwargs)
+import frappe
+
 
+class GSPServerError(frappe.ValidationError):
+    message = "GSP/GST server is down"
+    title = "GSP/GST Server Error"
+
+class GSPLimitExceededError(GSPServerError):
+    message = "GSP/GST account limit exceeded"
+    http_status_code = 429
 
 class GatewayTimeoutError(GSPServerError):
-    def __init__(self, message="The server took too long to respond", *args, **kwargs):
-        super().__init__(message, *args, **kwargs)
+    message = "The server took too long to respond"
+    http_status_code = 504
 
 
 class OTPRequestedError(Exception):

india_compliance/gst_india/api_classes/base.py

@@ -8,7 +8,11 @@
 from frappe.utils import sbool
 from frappe.utils.scheduler import is_scheduler_disabled
 
-from india_compliance.exceptions import GatewayTimeoutError, GSPServerError
+from india_compliance.exceptions import (
+    GatewayTimeoutError,
+    GSPLimitExceededError,
+    GSPServerError,
+)
 from india_compliance.gst_india.utils import is_api_enabled
 from india_compliance.gst_india.utils.api import enqueue_integration_request
 
@@ -224,18 +228,25 @@ def handle_error_response(self, response_json):
                 title=_("API Request Failed"),
             )
 
-    def handle_server_error(self, error_messages):
-        error_message_list = [
+    ERROR_MESSAGES = {
+        GSPServerError: (
             "GSPGSTDOWN",
             "GSPERR300",
             "Connection reset",
             "No route to host",
-        ]
+        ),
+        GSPLimitExceededError: ("GEN5005",),
+    }
 
-        for message in error_messages:
-            for error in error_message_list:
-                if error in message:
-                    raise GSPServerError
+    def handle_server_error(self, error_messages):
+        for exception, error_message_list in self.ERROR_MESSAGES.items():
+            for error_pattern in error_message_list:
+                if any(error_pattern in msg for msg in error_messages if msg):
+                    frappe.throw(
+                        msg=exception.message,
+                        exc=exception,
+                        title=exception.title,
+                    )
 
     def is_ignored_error(self, response_json):
         # Override in subclass, return truthy value to stop frappe.throw

india_compliance/gst_india/data/gstr3b_excel_utility_v5.7.xlsx

@@ -238,6 +238,13 @@ def default_subcategory_summary(self, subcategory):
 
     @staticmethod
     def count_doc_issue_summary(summary_row, data_row):
+        if data_row.get(inv_f.DOC_TYPE) in (
+            "Excluded from Report (Invalid Invoice Number)",
+            "Excluded from Report (Same GSTIN Billing)",
+            "Excluded from Report (Is Opening Entry)",
+        ):
+            return
+        
         summary_row["no_of_records"] += (
             data_row.get(inv_f.TOTAL_COUNT, 0)
             - data_row.get(inv_f.CANCELLED_COUNT, 0)

india_compliance/gst_india/doctype/gst_return_log/generate_gstr_1.py

@@ -25,7 +25,7 @@ frappe.ui.form.on("GSTR 3B Report", {
         frm.set_intro(__("Please save the report again to rebuild or update"));
         frm.doc.__unsaved = 1;
 
-        // Download Button
+        // Download JSON Button
         frm.add_custom_button(__("Download JSON"), function () {
             var w = window.open(
                 frappe.urllib.get_full_url(
@@ -41,6 +41,22 @@ frappe.ui.form.on("GSTR 3B Report", {
             }
         });
 
+         // Download Excel Button
+        frm.add_custom_button(__("Download Excel"), function () {
+            var w = window.open(
+                frappe.urllib.get_full_url(
+                    "/api/method/india_compliance.gst_india.doctype.gstr_3b_report.gstr_3b_report.download_gstr3b_as_excel?" +
+                        "name=" +
+                        encodeURIComponent(frm.doc.name)
+                )
+            );
+
+            if (!w) {
+                frappe.msgprint(__("Please enable pop-ups"));
+                return;
+            }
+        });
+
         // View Form Button
         frm.add_custom_button(__("View Form"), function () {
             frappe.call({