fix: add filing period selection in gstr-1 beta

india_compliance/gst_india/api_classes/taxpayer_base.py

@@ -7,7 +7,7 @@
 
 import frappe
 import frappe.utils
-from frappe import _
+from frappe import _, request_cache
 from frappe.utils import add_to_date, cint, now_datetime
 
 from india_compliance.exceptions import (
@@ -465,16 +465,18 @@ def validate_auth_token(self):
 
         return
 
-    def get_filing_preference(self):
+    @request_cache
+    def get_filing_preference(self, date=None):
         return self.get(
-            action="GETPREF", params={"fy": self.get_fy()}, endpoint="returns"
+            action="GETPREF", params={"fy": self.get_fy(date)}, endpoint="returns"
         )
 
     @staticmethod
-    def get_fy():
-        date = frappe.utils.getdate()
-
+    def get_fy(date=None):
         # Standard for India as per GST
+        if not date:
+            date = frappe.utils.getdate()
+
         if date.month < 4:
             return f"{date.year - 1}-{str(date.year)[2:]}"
 

india_compliance/gst_india/doctype/gst_return_log/generate_gstr_1.py

@@ -6,6 +6,7 @@
 from frappe import unscrub
 from frappe.utils import flt
 
+from india_compliance.gst_india.utils.__init__ import get_month_or_quarter_dict
 from india_compliance.gst_india.utils.gstr_1 import GSTR1_SubCategory
 from india_compliance.gst_india.utils.gstr_1.__init__ import (
     CATEGORY_SUB_CATEGORY_MAPPING,
@@ -21,6 +22,9 @@
     summarize_retsum_data,
 )
 
+MONTH = list(get_month_or_quarter_dict().keys())[4:]
+QUARTER = ["Jan-Mar", "Apr-Jun", "Jul-Sep", "Oct-Dec"]
+
 
 class SummarizeGSTR1:
     AMOUNT_FIELDS = {
@@ -504,6 +508,14 @@ def generate_gstr1_data(self, filters, callback=None):
         # APIs Enabled
         status = self.get_return_status()
 
+        from india_compliance.gst_india.utils.gstin_info import get_filing_preference
+
+        filing_preference = get_filing_preference(self.gstin, self.return_period)
+
+        if filing_preference and self.filing_preference is None:
+            self.db_set({"filing_preference": filing_preference})
+            update_filters(filters, filing_preference)
+
         if status == "Filed":
             gov_data_field = "filed"
         else:
@@ -577,7 +589,7 @@ def get_books_gstr1_data(self, filters, aggregate=False):
                 return books_data
 
         from_date, to_date = get_gstr_1_from_and_to_date(
-            filters.month_or_quarter, filters.year
+            filters.month_or_quarter, filters.year, filters.is_quarterly
         )
 
         _filters = frappe._dict(
@@ -659,3 +671,18 @@ def normalize_data(data):
                 data[subcategory] = [*subcategory_data.values()]
 
         return data
+
+
+def update_filters(filters, filing_preference):
+    is_quarterly = 1 if filing_preference == "Quarterly" else 0
+
+    if filters.is_quarterly == is_quarterly:
+        return
+
+    filters.is_quarterly = is_quarterly
+    if filters.is_quarterly == 1:
+        quarter = MONTH.index(filters.month_or_quarter) // 3
+        filters.month_or_quarter = QUARTER[quarter]
+    else:
+        quarter_idx = QUARTER.index(filters.month_or_quarter)
+        filters.month_or_quarter = MONTH[(quarter_idx * 3) + 2]

india_compliance/gst_india/doctype/gst_return_log/gst_return_log.js

@@ -4,7 +4,7 @@
 frappe.ui.form.on("GST Return Log", {
     refresh(frm) {
         const [month_or_quarter, year] = india_compliance.get_month_year_from_period(
-            frm.doc.return_period
+            frm.doc.return_period, frm.doc.filing_preference === "Monthly" ? 0 : 1
         );
 
         frm.add_custom_button(__("View GSTR-1"), () => {
@@ -17,13 +17,14 @@ frappe.ui.form.on("GST Return Log", {
                         clearInterval(interval);
                         resolve();
                     }
-                }, 100);
+                }, 200);
             }).then(async () => {
                 await cur_frm.set_value({
                     company: frm.doc.company,
                     company_gstin: frm.doc.gstin,
                     year: year,
                     month_or_quarter: month_or_quarter,
+                    is_quarterly : frm.doc.filing_preference == "Monthly" ? 0 : 1,
                 });
                 cur_frm.save();
             });

india_compliance/gst_india/doctype/gst_return_log/gst_return_log.json

@@ -12,6 +12,7 @@
   "return_period",
   "company",
   "return_type",
+  "filing_preference",
   "column_break_sqwh",
   "filing_date",
   "acknowledgement_number",
@@ -187,6 +188,12 @@
    "label": "Return Type",
    "read_only": 1,
    "reqd": 1
+  },
+  {
+   "fieldname": "filing_preference",
+   "fieldtype": "Data",
+   "label": "Filing Preference",
+   "read_only": 1
   }
  ],
  "in_create": 1,
@@ -197,7 +204,7 @@
    "link_fieldname": "reference_docname"
   }
  ],
- "modified": "2024-08-14 17:53:03.509293",
+ "modified": "2024-11-07 23:12:55.966658",
  "modified_by": "Administrator",
  "module": "GST India",
  "name": "GST Return Log",

india_compliance/gst_india/doctype/gst_settings/gst_settings.json

@@ -45,7 +45,6 @@
   "e_invoice_applicable_companies",
   "gstr_1_section_break",
   "compare_gstr_1_data",
-  "filing_frequency",
   "column_break_cxmn",
   "restrict_changes_after_gstr_1",
   "role_allowed_to_modify",
@@ -585,12 +584,6 @@
    "fieldname": "column_break_cxmn",
    "fieldtype": "Column Break"
   },
-  {
-   "fieldname": "filing_frequency",
-   "fieldtype": "Select",
-   "label": "Filing Frequency",
-   "options": "Monthly\nQuarterly"
-  },
   {
    "depends_on": "eval: doc.restrict_changes_after_gstr_1",
    "fieldname": "role_allowed_to_modify",
@@ -633,7 +626,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-07-25 19:16:25.036677",
+ "modified": "2024-10-17 17:30:39.135632",
  "modified_by": "Administrator",
  "module": "GST India",
  "name": "GST Settings",

india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.js

@@ -108,8 +108,6 @@ frappe.ui.form.on(DOCTYPE, {
             frm.trigger("company");
         });
 
-        frm.filing_frequency = gst_settings.filing_frequency;
-
         // Set Default Values
         set_default_company_gstin(frm);
         set_options_for_year(frm);
@@ -122,7 +120,7 @@ frappe.ui.form.on(DOCTYPE, {
             const { filters } = message;
 
             const [month_or_quarter, year] =
-                india_compliance.get_month_year_from_period(filters.period);
+                india_compliance.get_month_year_from_period(filters.period, frm.doc.is_quarterly);
 
             if (
                 frm.doc.company_gstin !== filters.company_gstin ||
@@ -159,11 +157,15 @@ frappe.ui.form.on(DOCTYPE, {
 
             if (
                 frm.doc.company_gstin !== filters.company_gstin ||
-                frm.doc.month_or_quarter != filters.month_or_quarter ||
                 frm.doc.year != filters.year
             )
                 return;
 
+            if(frm.doc.is_quarterly != filters.is_quarterly){
+                frm.set_value("month_or_quarter", filters.month_or_quarter)
+                frm.set_value("is_quarterly", filters.is_quarterly)
+            }
+
             frappe.after_ajax(() => {
                 frm.doc.__gst_data = data ;
                 frm.trigger("load_gstr1_data");
@@ -180,17 +182,26 @@ frappe.ui.form.on(DOCTYPE, {
         frm.set_value("company_gstin", options[0]);
     },
 
-    company_gstin: render_empty_state,
+    company_gstin(frm){
+        render_empty_state(frm);
+        update_fields_based_on_filing_preference(frm);
+    },
 
     month_or_quarter(frm) {
         render_empty_state(frm);
+        update_fields_based_on_filing_preference(frm);
     },
 
     year(frm) {
         render_empty_state(frm);
         set_options_for_month_or_quarter(frm);
     },
 
+    is_quarterly(frm){
+        render_empty_state(frm);
+        set_options_for_month_or_quarter(frm);
+    },
+
     refresh(frm) {
         // Primary Action
         frm.disable_save();
@@ -2117,7 +2128,46 @@ function set_options_for_year(frm) {
     frm.set_value("year", current_year.toString());
 }
 
-function set_options_for_month_or_quarter(frm) {
+async function update_fields_based_on_filing_preference(frm){
+    let {message : preference } = await frappe.call({
+        method: "india_compliance.gst_india.doctype.gstr_1_beta.gstr_1_beta.get_filing_preference_from_log",
+        args: {month_or_quarter: frm.doc.month_or_quarter, year: frm.doc.year, company_gstin: frm.doc.company_gstin},
+    })
+
+    if(preference === undefined){
+        frm.set_df_property("is_quarterly", "read_only", 0);
+        return
+    }
+
+    preference = cint(preference)
+
+    if(preference === frm.doc.is_quarterly){
+        frm.set_df_property("is_quarterly", "read_only", 1);
+        return
+    }
+
+    update_preference(frm, preference)
+}
+
+function update_preference(frm, preference){
+    frm.doc.is_quarterly = preference
+    frm.set_df_property("is_quarterly", "read_only", 1)
+    set_options_for_month_or_quarter(frm, set_only_options=true)
+
+    if(preference === 1){
+        const month_index = india_compliance.MONTH.indexOf(frm.doc.month_or_quarter)
+        const quarter = Math.floor(month_index / 3)
+        frm.doc.month_or_quarter = india_compliance.QUARTER[quarter]
+    }else{
+        const quarter_index = india_compliance.QUARTER.indexOf(frm.doc.month_or_quarter) * 3
+        //  added 2 to set month_or_quarter as last month of that quarter
+        frm.doc.month_or_quarter = india_compliance.MONTH[quarter_index+2]
+    }
+    frm.refresh_field("month_or_quarter")
+    frm.refresh_field("is_quarterly")
+}
+
+function set_options_for_month_or_quarter(frm, set_only_options=false) {
     /**
      * Set options for Month or Quarter based on the year and current date
      * 1. If the year is current year, then options are till current month
@@ -2136,7 +2186,7 @@ function set_options_for_month_or_quarter(frm) {
 
     if (frm.doc.year === current_year) {
         // Options for current year till current month
-        if (frm.filing_frequency === "Monthly")
+        if (frm.doc.is_quarterly === 0)
             options = india_compliance.MONTH.slice(0, current_month_idx + 1);
         else {
             let quarter_idx;
@@ -2149,15 +2199,17 @@ function set_options_for_month_or_quarter(frm) {
         }
     } else if (frm.doc.year === "2017") {
         // Options for 2017 from July to December
-        if (frm.filing_frequency === "Monthly")
+        if (frm.doc.is_quarterly === 0)
             options = india_compliance.MONTH.slice(6);
         else options = india_compliance.QUARTER.slice(2);
     } else {
-        if (frm.filing_frequency === "Monthly") options = india_compliance.MONTH;
+        if (frm.doc.is_quarterly === 0) options = india_compliance.MONTH;
         else options = india_compliance.QUARTER;
     }
 
     set_field_options("month_or_quarter", options);
+    if (set_only_options) return
+
     if (frm.doc.year === current_year)
         // set second last option as default
         frm.set_value("month_or_quarter", options[options.length - 2]);
@@ -2181,6 +2233,7 @@ async function get_net_gst_liability(frm) {
             year: frm.doc.year,
             company_gstin: frm.doc.company_gstin,
             company: frm.doc.company,
+            is_quarterly: frm.doc.is_quarterly,
         },
     });
 

india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.json

@@ -13,6 +13,8 @@
   "year",
   "column_break_qcor",
   "month_or_quarter",
+  "column_break_auof",
+  "is_quarterly",
   "data_section",
   "tabs_html",
   "tabs_empty_state",
@@ -81,13 +83,23 @@
    "fieldtype": "Select",
    "label": "Month/Quarter",
    "reqd": 1
+  },
+  {
+   "fieldname": "column_break_auof",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_quarterly",
+   "fieldtype": "Check",
+   "label": "Is Quarterly"
   }
  ],
  "hide_toolbar": 1,
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-05-27 19:30:01.074149",
+ "modified": "2024-10-17 18:50:23.515301",
  "modified_by": "Administrator",
  "module": "GST India",
  "name": "GSTR-1 Beta",