fix: uom as per gst (#2019)

* fix: uom as per gst

* chore: refactor and wrap original function

---------

(cherry picked from commit 7535221)

india_compliance/gst_india/utils/__init__.py

@@ -677,6 +677,11 @@ def can_enable_api(settings):
     return settings.api_secret or frappe.conf.ic_api_secret
 
 
+def get_full_gst_uom(uom, settings=None):
+    uom = get_gst_uom(uom, settings=settings)
+    return f"{uom}-{UOM_MAP.get(uom)}"
+
+
 def get_gst_uom(uom, settings=None):
     """Returns the GST UOM from ERPNext UOM"""
     settings = settings or frappe.get_cached_doc("GST Settings")

india_compliance/gst_india/utils/gstr/gstr_1.py

@@ -9,6 +9,8 @@
 from frappe.query_builder.functions import Date, IfNull, Sum
 from frappe.utils import getdate
 
+from india_compliance.gst_india.utils import get_full_gst_uom
+
 B2C_LIMIT = 2_50_000
 
 # TODO: Enum for Invoice Type
@@ -453,9 +455,12 @@ def __init__(self, filters=None):
         super().__init__(filters)
 
     def process_invoices(self, invoices):
+        settings = frappe.get_cached_doc("GST Settings")
+
         for invoice in invoices:
             self.invoice_conditions = {}
             self.assign_categories(invoice)
+            invoice["uom"] = get_full_gst_uom(invoice.get("uom"), settings)
 
     def assign_categories(self, invoice):