From a9043a4d46ff9dc459a05beb66db157819dcdf97 Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Mon, 8 Apr 2024 15:28:22 +0530 Subject: [PATCH 1/2] fix: group tax values and amounts for invoice print formats (cherry picked from commit e78d3cf9e1dd3df9d8f66c718ca65a7e288cf17f) --- india_compliance/gst_india/overrides/transaction.py | 3 --- india_compliance/hooks.py | 9 +++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/india_compliance/gst_india/overrides/transaction.py b/india_compliance/gst_india/overrides/transaction.py index 6740669686..1601a02ecc 100644 --- a/india_compliance/gst_india/overrides/transaction.py +++ b/india_compliance/gst_india/overrides/transaction.py @@ -1433,9 +1433,6 @@ def before_print(doc, method=None, print_settings=None): ): return - if doc.get("group_same_items"): - ItemGSTDetails().update(doc) - set_gst_breakup(doc) diff --git a/india_compliance/hooks.py b/india_compliance/hooks.py index 1b2703b40f..6c25714349 100644 --- a/india_compliance/hooks.py +++ b/india_compliance/hooks.py @@ -406,6 +406,15 @@ } } +fields_for_group_similar_items = [ + "taxable_value", + "cgst_amount", + "sgst_amount", + "igst_amount", + "cess_amount", + "cess_non_advol_amount", +] + # Includes in # ------------------ From 90e7bdd1bb9ef2a2f00e386d752166c2ff8fffd2 Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Mon, 8 Apr 2024 19:07:12 +0530 Subject: [PATCH 2/2] chore: update compatible version (cherry picked from commit 119bb5830d32b29e9f10665c841aa7d3e26e61e6) --- india_compliance/patches/check_version_compatibility.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/india_compliance/patches/check_version_compatibility.py b/india_compliance/patches/check_version_compatibility.py index 4cd0e323d2..deede46cbe 100644 --- a/india_compliance/patches/check_version_compatibility.py +++ b/india_compliance/patches/check_version_compatibility.py @@ -18,7 +18,7 @@ { "app_name": "ERPNext", "current_version": version.parse(erpnext.__version__), - "required_versions": {"version-14": "14.64.0", "version-15": "15.15.0"}, + "required_versions": {"version-14": "14.66.5", "version-15": "15.19.3"}, }, ]