diff --git a/india_compliance/gst_india/api_classes/taxpayer_returns.py b/india_compliance/gst_india/api_classes/taxpayer_returns.py index 064414e351..d50cc3a526 100644 --- a/india_compliance/gst_india/api_classes/taxpayer_returns.py +++ b/india_compliance/gst_india/api_classes/taxpayer_returns.py @@ -37,7 +37,7 @@ def get_return_status(self, return_period, reference_id, otp=None): otp=otp, ) - def proceed_to_file(self, return_type, return_period, is_nil_rated, otp=None): + def proceed_to_file(self, return_type, return_period, is_nil_return, otp=None): return self.post( return_type=return_type, return_period=return_period, @@ -46,7 +46,7 @@ def proceed_to_file(self, return_type, return_period, is_nil_rated, otp=None): "data": { "gstin": self.company_gstin, "ret_period": return_period, - "isnil": "Y" if is_nil_rated else "N", + "isnil": "Y" if is_nil_return else "N", }, }, endpoint="returns/gstrptf", 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 index d34df0eaf6..53062baad2 100644 --- 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 @@ -747,7 +747,7 @@ def process_reset_gstr1(self): return response - def upload_gstr1(self, json_data, is_nil_rated, force): + def upload_gstr1(self, json_data, is_nil_return, force): if not json_data: return @@ -755,7 +755,7 @@ def upload_gstr1(self, json_data, is_nil_rated, force): keys = {category.value for category in GovJsonKey} if all(key not in json_data for key in keys): - if not cint(is_nil_rated): + if not cint(is_nil_return): frappe.msgprint( _( 'No data to upload.To file Nil Return Select "File Nil GSTR-1" checkbox.' @@ -820,11 +820,11 @@ def process_upload_gstr1(self): return response - def proceed_to_file_gstr1(self, is_nil_rated, force): + def proceed_to_file_gstr1(self, is_nil_return, force): verify_request_in_progress(self, force) api = GSTR1API(self) - response = api.proceed_to_file("GSTR1", self.return_period, is_nil_rated) + response = api.proceed_to_file("GSTR1", self.return_period, is_nil_return) # Return Form already ready to be filed if response.error and response.error.error_cd == "RET00003": 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 index 4ee82f68f3..e1bfc23280 100644 --- 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 @@ -2603,7 +2603,7 @@ class GSTR1Action extends FileGSTR1Dialog { frappe.show_alert(__("Uploading data to GSTN")); this.check_action_status_with_retry(action); }, - { is_nil_rated : this.frm.doc.file_nil_gstr1 }); + { is_nil_return : this.frm.doc.file_nil_gstr1 }); }; // has draft invoices @@ -2649,7 +2649,7 @@ class GSTR1Action extends FileGSTR1Dialog { else this.check_action_status_with_retry(action); // TODO: this.check_for_nil_rated should also go after else condition }, - { is_nil_rated : this.frm.doc.file_nil_gstr1 }); + { is_nil_return : this.frm.doc.file_nil_gstr1 }); } async mark_as_unfiled() {