test: GSTR-1 beta

india_compliance/gst_india/api_classes/public.py

@@ -28,3 +28,8 @@ def get_gstin_info(self, gstin):
             )
 
         return response
+
+    def get_returns_info(self, gstin, fy):
+        return self.get(
+            "returns", params={"action": "RETTRACK", "gstin": gstin, "fy": fy}
+        )

india_compliance/gst_india/api_classes/returns.py

@@ -225,8 +225,10 @@ class ReturnsAPI(ReturnsAuthenticate):
         "RET2B1023": "not_generated",
         "RET2B1016": "no_docs_found",
         "RT-3BAS1009": "no_docs_found",
+        "RET11417": "no_docs_found",  # GSTR-1 Exports
         "RET2B1018": "requested_before_cutoff_date",
         "RTN_24": "queued",
+        "AUTH158": "invalid_otp",  # Invalid OTP
         "AUTH4033": "invalid_otp",  # Invalid Session
         # "AUTH4034": "invalid_otp",  # Invalid OTP
         "AUTH4038": "authorization_failed",  # Session Expired
@@ -396,3 +398,25 @@ def get_data(self, action, return_period, otp=None):
             endpoint="returns/gstr2a",
             otp=otp,
         )
+
+
+class GSTR1API(ReturnsAPI):
+    API_NAME = "GSTR-1"
+
+    def get_gstr_1_data(self, action, return_period, otp=None):
+        return self.get(
+            action,
+            return_period,
+            params={"ret_period": return_period},
+            endpoint="returns/gstr1",
+            otp=otp,
+        )
+
+    def get_einvoice_data(self, section, return_period, otp=None):
+        return self.get(
+            "EINV",
+            return_period,
+            params={"ret_period": return_period, "sec": section},
+            endpoint="returns/einvoice",
+            otp=otp,
+        )

india_compliance/gst_india/doctype/gst_settings/gst_settings.js

@@ -51,35 +51,22 @@ function filter_accounts(frm, account_field) {
 
 function show_ic_api_promo(frm) {
     if (!frm.doc.__onload?.can_show_promo) return;
+    const alert_message = `
+    Looking for API Features?
+    <a href="/app/india-compliance-account" class="alert-link">
+        Get started with the India Compliance API!
+    </a>`;
 
-    const alert = $(`
-        <div
-            class="alert alert-primary alert-dismissable fade show d-flex justify-content-between border-0"
-            role="alert"
-        >
-            <div>
-                Looking for API Features?
-                <a href="/app/india-compliance-account" class="alert-link">
-                    Get started with the India Compliance API!
-                </a>
-            </div>
-            <button
-                type="button"
-                class="close"
-                data-dismiss="alert"
-                aria-label="Close"
-                style="outline: 0px solid black !important"
-            >
-                <span aria-hidden="true">&times;</span>
-            </button>
-        </div>
-    `).prependTo(frm.layout.wrapper);
-
-    alert.on("closed.bs.alert", () => {
-        frappe.xcall(
-            "india_compliance.gst_india.doctype.gst_settings.gst_settings.disable_api_promo"
-        );
-    });
+    india_compliance.show_dismissable_alert(
+        frm.layout.wrapper,
+        alert_message,
+        "primary",
+        () => {
+            frappe.xcall(
+                "india_compliance.gst_india.doctype.gst_settings.gst_settings.disable_api_promo"
+            );
+        }
+    );
 }
 
 function show_update_gst_category_button(frm) {

india_compliance/gst_india/doctype/gst_settings/gst_settings.json

@@ -40,6 +40,12 @@
   "column_break_17",
   "e_invoice_applicable_from",
   "e_invoice_applicable_companies",
+  "gstr_1_section_break",
+  "analyze_filed_data",
+  "filing_frequency",
+  "column_break_cxmn",
+  "restrict_changes_after_gstr_1",
+  "role_allowed_to_modify",
   "other_apis_section",
   "autofill_party_info",
   "archive_party_info_days",
@@ -560,12 +566,49 @@
    "fieldtype": "Check",
    "hidden": 1,
    "label": "Is Retry e-Invoice/e-Waybill Pending"
+  },
+  {
+   "fieldname": "gstr_1_section_break",
+   "fieldtype": "Section Break",
+   "label": "GSTR-1"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval: india_compliance.is_api_enabled(doc)",
+   "description": "Compare Books with GSTR 1 Filed or Invoice data before filing",
+   "fieldname": "analyze_filed_data",
+   "fieldtype": "Check",
+   "label": "Analyze Filed Data"
+  },
+  {
+   "fieldname": "column_break_cxmn",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "filing_frequency",
+   "fieldtype": "Select",
+   "label": "Filing Frequency",
+   "options": "Monthly\nQuarterly"
+  },
+  {
+   "fieldname": "role_allowed_to_modify",
+   "fieldtype": "Link",
+   "label": "Role Allowed to Modify Transactions",
+   "options": "Role"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval: india_compliance.is_api_enabled(doc)",
+   "description": "Ensures restrictions to cancel or create transactions after return is marked as filed",
+   "fieldname": "restrict_changes_after_gstr_1",
+   "fieldtype": "Check",
+   "label": "Restrict changes after GSTR 1 is filed"
   }
  ],
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-03-29 11:54:42.957295",
+ "modified": "2024-05-17 15:46:11.169920",
  "modified_by": "Administrator",
  "module": "GST India",
  "name": "GST Settings",

india_compliance/gst_india/doctype/gst_settings/gst_settings.py

@@ -5,21 +5,21 @@
 from frappe import _
 from frappe.model.document import Document
 from frappe.query_builder.functions import IfNull
-from frappe.utils import getdate
+from frappe.utils import add_to_date, getdate
 
 from india_compliance.gst_india.constants import GST_ACCOUNT_FIELDS, GST_PARTY_TYPES
 from india_compliance.gst_india.constants.custom_fields import (
     E_INVOICE_FIELDS,
     E_WAYBILL_FIELDS,
     SALES_REVERSE_CHARGE_FIELDS,
 )
+from india_compliance.gst_india.doctype.gstin.gstin import get_gstr_1_filed_upto
 from india_compliance.gst_india.page.india_compliance_account import (
     _disable_api_promo,
     post_login,
 )
 from india_compliance.gst_india.utils import can_enable_api, is_api_enabled
 from india_compliance.gst_india.utils.custom_fields import toggle_custom_fields
-from india_compliance.gst_india.utils.e_invoice import get_e_invoice_applicability_date
 from india_compliance.gst_india.utils.gstin_info import get_gstin_info
 
 E_INVOICE_START_DATE = "2021-01-01"
@@ -270,6 +270,27 @@ def validate_e_invoice_applicable_companies(self):
 
             company_list.append(row.company)
 
+    def is_sek_valid(self, gstin, throw=True, threshold=30):
+        for credential in self.credentials:
+            if credential.service == "Returns" and credential.gstin == gstin:
+                break
+
+        else:
+            if throw:
+                frappe.throw(
+                    _(
+                        "No credential found for the GSTIN {0} in the GST Settings"
+                    ).format(gstin)
+                )
+
+            # TODO: Handle this
+            return False
+
+        if credential.session_expiry and credential.session_expiry > add_to_date(
+            None, minutes=threshold * -1
+        ):
+            return True
+
 
 @frappe.whitelist()
 def disable_api_promo():
@@ -345,6 +366,24 @@ def update_e_invoice_status():
         update_not_applicable_status(e_invoice_applicability_date, company)
 
 
+def get_e_invoice_applicability_date(company, settings=None, throw=True):
+    if not settings:
+        settings = frappe.get_cached_doc("GST Settings")
+
+    e_invoice_applicable_from = settings.e_invoice_applicable_from
+
+    if settings.apply_e_invoice_only_for_selected_companies:
+        for row in settings.e_invoice_applicable_companies:
+            if company == row.company:
+                e_invoice_applicable_from = row.applicable_from
+                break
+
+        else:
+            return
+
+    return e_invoice_applicable_from
+
+
 def update_pending_status(e_invoice_applicability_date, company=None):
     if not e_invoice_applicability_date:
         return
@@ -394,3 +433,60 @@ def update_not_applicable_status(e_invoice_applicability_date=None, company=None
         company = query.where(sales_invoice.company == company)
 
     query.run()
+
+
+def restrict_gstr_1_transaction_for(posting_date, company_gstin, gst_settings=None):
+    """
+    Check if the user is allowed to modify transactions before the GSTR-1 filing date
+    Additionally, update the `is_not_latest_gstr1_data` field in the GSTR-1 Log
+    """
+    posting_date = getdate(posting_date)
+
+    if not gst_settings:
+        gst_settings = frappe.get_cached_doc("GST Settings")
+
+    restrict = True
+
+    if not gst_settings.restrict_changes_after_gstr_1:
+        restrict = False
+
+    gstr_1_filed_upto = get_gstr_1_filed_upto(company_gstin)
+
+    if not gstr_1_filed_upto:
+        return False
+
+    if posting_date > getdate(gstr_1_filed_upto):
+        restrict = False
+
+    if (
+        gst_settings.role_allowed_to_modify in frappe.get_roles()
+        or frappe.session.user == "Administrator"
+    ):
+        restrict = False
+
+    if restrict:
+        return gstr_1_filed_upto
+
+    if restrict is False:
+        return None
+
+    frappe.msgprint(
+        _("You are modifying transaction after the GSTR-1 is filed for the period."),
+        indicator="yellow",
+    )
+
+    update_is_not_latest_gstr1_data(posting_date, company_gstin)
+
+    return None
+
+
+def update_is_not_latest_gstr1_data(posting_date, company_gstin):
+    period = posting_date.strftime("%m%Y")
+
+    frappe.db.set_value("GSTR-1 Log", f"{period}-{company_gstin}", "is_latest_data", 0)
+
+    frappe.publish_realtime(
+        "is_not_latest_data",
+        message={"filters": {"company_gstin": company_gstin, "period": period}},
+        doctype="GSTR-1 Beta",
+    )

india_compliance/gst_india/doctype/gstin/gstin.json

@@ -12,7 +12,9 @@
   "is_blocked",
   "column_break_nrjd",
   "last_updated_on",
-  "cancelled_date"
+  "cancelled_date",
+  "section_break_ttzc",
+  "gstr_1_filed_upto"
  ],
  "fields": [
   {
@@ -59,12 +61,22 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Is Blocked"
+  },
+  {
+   "fieldname": "section_break_ttzc",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "gstr_1_filed_upto",
+   "fieldtype": "Date",
+   "hidden": 1,
+   "label": "GSTR-1 Filed Upto"
   }
  ],
  "in_create": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-03-29 11:54:43.241749",
+ "modified": "2024-05-17 15:38:05.867522",
  "modified_by": "Administrator",
  "module": "GST India",
  "name": "GSTIN",

india_compliance/gst_india/doctype/gstin/gstin.py

@@ -304,3 +304,10 @@ def get_transporter_id_info(transporter_id):
             "status": "Active" if response.transin else "Invalid",
         }
     )
+
+
+def get_gstr_1_filed_upto(gstin):
+    if not gstin:
+        return
+
+    return frappe.db.get_value("GSTIN", gstin, "gstr_1_filed_upto")