Merge pull request #1503 from resilient-tech/version-15-hotfix

chore: release v15
resilient-tech · Dec 29, 2023 · 3e200aa · 3e200aa
2 parents b5e7d81 + cdd12d2
commit 3e200aa
Show file tree

Hide file tree

Showing 11 changed files with 204 additions and 105 deletions.
diff --git a/india_compliance/gst_india/client_scripts/payment_entry.js b/india_compliance/gst_india/client_scripts/payment_entry.js
@@ -45,7 +45,7 @@ function override_get_outstanding_documents(frm) {
     const new_fn = function () {
         old_fn(...arguments);
         frappe.after_ajax(() => {
-            response = frappe?.last_response?.message || [];
+            const response = frappe?.last_response?.message || [];
 
             const reconciliation_status_dict = response.reduce((acc, d) => {
                 acc[d.voucher_no] = d.reconciliation_status;

diff --git a/india_compliance/gst_india/data/test_e_invoice.json b/india_compliance/gst_india/data/test_e_invoice.json
@@ -27,30 +27,30 @@
             },
             "ItemList": [
                 {
-                    "AssAmt": 100000,
+                    "AssAmt": 100000.0,
                     "CesAmt": 0,
                     "CesNonAdvlAmt": 0,
                     "CesRt": 0,
-                    "CgstAmt": 0,
+                    "CgstAmt": 9000.0,
                     "Discount": 0,
-                    "GstRt": 0,
+                    "GstRt": 18,
                     "HsnCd": "61149090",
                     "IgstAmt": 0,
                     "IsServc": "N",
                     "PrdDesc": "Test Trading Goods 1",
-                    "Qty": 1000,
-                    "SgstAmt": 0,
+                    "Qty": 1000.0,
+                    "SgstAmt": 9000.0,
                     "SlNo": "1",
-                    "TotAmt": 100000,
-                    "TotItemVal": 100000,
+                    "TotAmt": 100000.0,
+                    "TotItemVal": 118000.0  ,
                     "Unit": "NOS",
-                    "UnitPrice": 100
+                    "UnitPrice": 100.0
                 }
             ],
             "PayDtls": {
                 "CrDay": 0,
                 "PaidAmt": 0,
-                "PaymtDue": 100000
+                "PaymtDue": 118000.0
             },
             "SellerDtls": {
                 "Addr1": "Test Address - 1",
@@ -67,15 +67,15 @@
                 "TaxSch": "GST"
             },
             "ValDtls": {
-                "AssVal": 100000,
+                "AssVal": 100000.0,
                 "CesVal": 0,
-                "CgstVal": 0,
+                "CgstVal": 9000.0,
                 "Discount": 0,
                 "IgstVal": 0,
-                "OthChrg": 0,
-                "RndOffAmt": 0,
-                "SgstVal": 0,
-                "TotInvVal": 100000
+                "OthChrg": 0.0,
+                "RndOffAmt": 0.0,
+                "SgstVal": 9000.0,
+                "TotInvVal": 118000.0
             },
             "Version": "1.1"
         },
@@ -131,26 +131,26 @@
                     "CesAmt": 0,
                     "CesNonAdvlAmt": 0,
                     "CesRt": 0,
-                    "CgstAmt": 0,
+                    "CgstAmt": 9.0,
                     "Discount": 0,
-                    "GstRt": 0.0,
+                    "GstRt": 18.0,
                     "HsnCd": "999900",
                     "IgstAmt": 0,
                     "IsServc": "Y",
                     "PrdDesc": "Test Service Item",
                     "Qty": 1.0,
-                    "SgstAmt": 0,
+                    "SgstAmt": 9.0,
                     "SlNo": "1",
                     "TotAmt": 100.0,
-                    "TotItemVal": 100.0,
+                    "TotItemVal": 118.0,
                     "Unit": "NOS",
                     "UnitPrice": 100.0
                 }
             ],
             "PayDtls": {
                 "CrDay": 0,
                 "PaidAmt": 0,
-                "PaymtDue": 100.0
+                "PaymtDue": 118.0
             },
             "SellerDtls": {
                 "Addr1": "Test Address - 1",
@@ -169,13 +169,13 @@
             "ValDtls": {
                 "AssVal": 100.0,
                 "CesVal": 0,
-                "CgstVal": 0,
+                "CgstVal": 9.0,
                 "Discount": 0,
                 "IgstVal": 0,
                 "OthChrg": 0.0,
                 "RndOffAmt": 0.0,
-                "SgstVal": 0,
-                "TotInvVal": 100.0
+                "SgstVal": 9.0,
+                "TotInvVal": 118.0
             },
             "Version": "1.1"
         },
@@ -474,26 +474,26 @@
                     "CesAmt": 0,
                     "CesNonAdvlAmt": 0,
                     "CesRt": 0,
-                    "CgstAmt": 0,
+                    "CgstAmt": 9.0,
                     "Discount": 0,
-                    "GstRt": 0.0,
+                    "GstRt": 18.0,
                     "HsnCd": "61149090",
                     "IgstAmt": 0,
                     "IsServc": "N",
                     "PrdDesc": "Test Trading Goods 1",
                     "Qty": 0.0,
-                    "SgstAmt": 0,
+                    "SgstAmt": 9.0,
                     "SlNo": "1",
                     "TotAmt": 100.0,
-                    "TotItemVal": 100.0,
+                    "TotItemVal": 118.0,
                     "Unit": "NOS",
                     "UnitPrice": 100.0
                 }
             ],
             "PayDtls": {
                 "CrDay": 0,
                 "PaidAmt": 0,
-                "PaymtDue": 100.0
+                "PaymtDue": 118.0
             },
             "SellerDtls": {
                 "Addr1": "Test Address - 1",
@@ -512,13 +512,13 @@
             "ValDtls": {
                 "AssVal": 100.0,
                 "CesVal": 0,
-                "CgstVal": 0,
+                "CgstVal": 9.0,
                 "Discount": 0,
                 "IgstVal": 0,
                 "OthChrg": 0.0,
                 "RndOffAmt": 0.0,
-                "SgstVal": 0,
-                "TotInvVal": 100.0
+                "SgstVal": 9.0,
+                "TotInvVal": 118.0
             },
             "Version": "1.1"
         },

diff --git a/india_compliance/gst_india/overrides/test_transaction_data.py b/india_compliance/gst_india/overrides/test_transaction_data.py
@@ -140,7 +140,10 @@ def test_validate_transaction(self):
 
     def test_set_transaction_details(self):
         """Check transaction data"""
-        doc = create_sales_invoice(do_not_submit=True)
+        doc = create_sales_invoice(
+            do_not_submit=True,
+            is_in_state=True,
+        )
 
         gst_transaction_data = GSTTransactionData(doc)
         gst_transaction_data.set_transaction_details()
@@ -155,13 +158,13 @@ def test_set_transaction_details(self):
                 "total_taxable_value": 100.0,
                 "total_non_taxable_value": 0.0,
                 "rounding_adjustment": 0.0,
-                "grand_total": 100.0,
+                "grand_total": 118.0,
                 "grand_total_in_foreign_currency": "",
                 "discount_amount": 0,
                 "company_gstin": "24AAQCA8719H1ZC",
                 "name": doc.name,
-                "total_cgst_amount": 0,
-                "total_sgst_amount": 0,
+                "total_cgst_amount": 9.0,
+                "total_sgst_amount": 9.0,
                 "total_igst_amount": 0,
                 "total_cess_amount": 0,
                 "total_cess_non_advol_amount": 0,
@@ -259,7 +262,7 @@ def test_get_all_item_details(self):
                     "cess_non_advol_rate": 0,
                     "tax_rate": 0.0,
                     "total_value": 100.0,
-                    "gst_treatment": "Taxable",
+                    "gst_treatment": "Nil-Rated",
                 }
             ],
         )