fix: primary action to reset on change of is_nil if already uploade…

…d info
resilient-tech · Jan 13, 2025 · ac77cce · ac77cce
1 parent a35a098
commit ac77cce
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/india_compliance/gst_india/doctype/gst_return_log/generate_gstr_1.py b/india_compliance/gst_india/doctype/gst_return_log/generate_gstr_1.py
@@ -728,11 +728,13 @@ def normalize_data(data):
 
 
 class FileGSTR1:
-    def reset_gstr1(self, force):
+
+    def reset_gstr1(self, is_nil_return, force):
         verify_request_in_progress(self, force)
 
         # reset called after proceed to file
         self.db_set({"filing_status": "Not Filed"})
+        self.db_set({"is_nil": sbool(is_nil_return)})
 
         api = GSTR1API(self)
         response = api.reset_gstr_1_data(self.return_period)

diff --git a/india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.js b/india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.js
@@ -229,7 +229,7 @@ frappe.ui.form.on(DOCTYPE, {
         const data = frm.doc.__gst_data;
         if (!data?.status) return;
 
-        frm.doc.file_nil_gstr1 = data.is_nil
+        frm.doc.file_nil_gstr1 = data.is_nil;
 
         // Toggle HTML fields
         frm.refresh();
@@ -486,26 +486,32 @@ class GSTR1 {
 
         // Primary Button
         const actions = {
+            Reset: this.gstr1_action.reset_gstr1_data,
             Generate: this.gstr1_action.generate_gstr1_data,
             Upload: this.gstr1_action.upload_gstr1_data,
             "Proceed to File": this.gstr1_action.proceed_to_file,
             File: this.gstr1_action.file_gstr1_data,
         };
 
-        // No need to upload if nil gstr1
-        const status =
-            this.frm.doc.file_nil_gstr1 && this.status == "Not Filed"
-                ? "Uploaded"
-                : this.status;
-
         let primary_button_label =
             {
                 "Not Filed": "Upload",
                 Uploaded: "Proceed to File",
                 "Ready to File": "File",
-            }[status] || "Generate";
+            }[this.status] || "Generate";
+
+        // No need to upload if nil gstr1
+        if (this.frm.doc.__gst_data) {
+            if (this.frm.doc.file_nil_gstr1 != this.frm.doc.__gst_data.is_nil)
+                primary_button_label = "Reset";
+
+            if (this.status == "Not Filed")
+                if (this.frm.doc.file_nil_gstr1) primary_button_label = "Proceed to File";
+                else primary_button_label = "Upload";
+
+        }
 
-        if (status === "Ready to File") {
+        if (this.status === "Ready to File") {
             this.frm.add_custom_button(__("Mark as Unfiled"), () => {
                 this.gstr1_action.mark_as_unfiled();
             });
@@ -2151,8 +2157,7 @@ class FiledTab extends GSTR1_TabManager {
         if (this.instance.data?.is_nil)
             if (this.status === "Filed")
                 return __("You have filed a Nil GSTR-1 for this period");
-            else
-                return __("You are filing a Nil GSTR-1 for this period");
+            else return __("You are filing a Nil GSTR-1 for this period");
 
         return this.DEFAULT_NO_DATA_MESSAGE;
     }
@@ -2674,8 +2679,10 @@ class GSTR1Action extends FileGSTR1Dialog {
             ),
             () => {
                 frappe.show_alert(__("Resetting GSTR-1 data"));
-                this.perform_gstr1_action(action, () =>
-                    this.check_action_status_with_retry(action)
+                this.perform_gstr1_action(
+                    action,
+                    () => this.check_action_status_with_retry(action),
+                    { is_nil_return: this.frm.doc.file_nil_gstr1 }
                 );
             }
         );