fix: GSTR-1 Automation enhancements

india_compliance/gst_india/doctype/gst_return_log/generate_gstr_1.py

@@ -682,10 +682,10 @@ def normalize_data(data):
 
 
 class FileGSTR1:
-    def reset_gstr1(self):
-        # reset called after proceed to file
-        verify_request_in_progress(self)
+    def reset_gstr1(self, force):
+        verify_request_in_progress(self, force)
 
+        # reset called after proceed to file
         self.db_set({"filing_status": "Not Filed"})
 
         api = GSTR1API(self)
@@ -721,11 +721,11 @@ def process_reset_gstr1(self):
 
         return response
 
-    def upload_gstr1(self, json_data):
+    def upload_gstr1(self, json_data, force):
         if not json_data:
             return
 
-        verify_request_in_progress(self)
+        verify_request_in_progress(self, force)
 
         keys = {category.value for category in GovJsonKey}
         if all(key not in json_data for key in keys):
@@ -782,8 +782,8 @@ def process_upload_gstr1(self):
 
         return response
 
-    def proceed_to_file_gstr1(self):
-        verify_request_in_progress(self)
+    def proceed_to_file_gstr1(self, force):
+        verify_request_in_progress(self, force)
 
         api = GSTR1API(self)
         response = api.proceed_to_file("GSTR1", self.return_period)
@@ -854,8 +854,8 @@ def fetch_and_compare_summary(self, api, response=None):
 
         return response
 
-    def file_gstr1(self, pan, otp):
-        verify_request_in_progress(self)
+    def file_gstr1(self, pan, otp, force):
+        verify_request_in_progress(self, force)
 
         summary = self.get_json_for("authenticated_summary")
         api = GSTR1API(self)
@@ -879,8 +879,6 @@ def file_gstr1(self, pan, otp):
 
             self.remove_json_for("upload_error")
 
-        # TODO: 2nd phase Accounting Entry.
-
         return response
 
     def get_amendment_data(self):
@@ -915,7 +913,10 @@ def get_amendment_data(self):
         }
 
 
-def verify_request_in_progress(return_log):
+def verify_request_in_progress(return_log, force):
+    if force == "true":
+        return
+
     for row in return_log.actions:
         if not row.status:
             frappe.throw(

india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.js

@@ -2224,8 +2224,8 @@ class FileGSTR1Dialog {
         this.filing_dialog = null;
     }
 
-    file_gstr1_data() {
-        if (this.is_request_in_progress()) return;
+    async file_gstr1_data() {
+        if (await this.is_request_in_progress()) return;
 
         // TODO: EVC Generation, Resend, and Filing
         this.filing_dialog = new frappe.ui.Dialog({
@@ -2465,8 +2465,8 @@ class GSTR1Action extends FileGSTR1Dialog {
         });
     }
 
-    upload_gstr1_data() {
-        if (this.is_request_in_progress()) return;
+    async upload_gstr1_data() {
+        if (await this.is_request_in_progress()) return;
 
         const action = "upload";
 
@@ -2480,8 +2480,8 @@ class GSTR1Action extends FileGSTR1Dialog {
         });
     }
 
-    reset_gstr1_data() {
-        if (this.is_request_in_progress()) return;
+    async reset_gstr1_data() {
+        if (await this.is_request_in_progress()) return;
 
         const action = "reset";
 
@@ -2507,8 +2507,8 @@ class GSTR1Action extends FileGSTR1Dialog {
         });
     }
 
-    previous_action_handler() {
-        if (this.is_request_in_progress()) return;
+    async previous_action_handler() {
+        if (await this.is_request_in_progress()) return;
 
         const { company, company_gstin, month_or_quarter, year } = this.frm.doc;
         const filters = {
@@ -2559,6 +2559,7 @@ class GSTR1Action extends FileGSTR1Dialog {
             ...this.defaults,
             ...additional_args,
             action: `${action}_gstr1`,
+            force: this.frm.force_action ? this.frm.force_action : false,
         };
 
         taxpayer_api.call({
@@ -2695,15 +2696,35 @@ class GSTR1Action extends FileGSTR1Dialog {
 
     is_request_in_progress() {
         let in_progress = this.frm.__action_performed;
+
         if (!in_progress) return false;
         else if (in_progress == "proceed_to_file") in_progress = "upload";
 
-        frappe.show_alert({
-            message: __('Already ' + in_progress + 'ing'),
-            indicator: "red",
+        const in_progress_action = in_progress.charAt(0).toUpperCase() + in_progress.slice(1)
+
+        return new Promise((resolve) => {
+            const d = frappe.msgprint({
+                message: __(`<b>${in_progress_action} is in progress. Do you still want to continue?<b>`),
+                indicator: "red",
+                title: __("Process in Progress"),
+                primary_action: {
+                    label: __("Yes"),
+                    action: () => {
+                        this.toggle_actions(true, in_progress);
+                        this.frm.force_action = true;
+                        resolve(false);
+                        d.hide();
+                    },
+                },
+                secondary_action: {
+                    label: __("No"),
+                    action: () => {
+                        resolve(true)
+                        d.hide();
+                    },
+                }
+            });
         });
-
-        return true;
     }
 
     toggle_actions(show, action) {

india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.py

@@ -170,7 +170,7 @@ def on_generate(self, filters=None):
 @frappe.whitelist()
 @otp_handler
 def handle_gstr1_action(action, month_or_quarter, year, company_gstin, **kwargs):
-    frappe.has_permission("GSTR-1 Beta", "write", throw=True)
+    frappe.has_permission("GST Return Log", "write", throw=True)
 
     gstr_1_log = frappe.get_doc(
         "GST Return Log",
@@ -197,6 +197,8 @@ def handle_gstr1_action(action, month_or_quarter, year, company_gstin, **kwargs)
 @frappe.whitelist()
 @otp_handler
 def process_gstr1_request(month_or_quarter, year, company_gstin, action):
+    frappe.has_permission("GST Return Log", "write", throw=True)
+
     gstr_1_log = frappe.get_doc(
         "GST Return Log",
         f"GSTR1-{get_period(month_or_quarter, year)}-{company_gstin}",