fix: added posting date column for export

(cherry picked from commit 20f6e44)
resilient-tech · Jan 24, 2025 · 894eab4 · 894eab4
1 parent 58399cf
commit 894eab4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/india_compliance/gst_india/doctype/gst_invoice_management_system/__init__.py b/india_compliance/gst_india/doctype/gst_invoice_management_system/__init__.py
@@ -149,7 +149,7 @@ def __init__(self):
         self.PI_ITEM = frappe.qb.DocType("Purchase Invoice Item")
 
     def get_all(self, names=None, filters=None):
-        query = self.get_query(filters=filters)
+        query = self.get_query(filters=filters, additional_fields=["posting_date"])
 
         if names:
             query = query.where(self.PI.name.isin(names))

diff --git a/...mpliance/gst_india/doctype/gst_invoice_management_system/gst_invoice_management_system.py b/...mpliance/gst_india/doctype/gst_invoice_management_system/gst_invoice_management_system.py
@@ -4,6 +4,7 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
+from frappe.utils import format_date
 
 from india_compliance.gst_india.api_classes.taxpayer_base import (
     TaxpayerBaseAPI,
@@ -96,6 +97,8 @@ def get_invoice_data(self, inward_supply=None, purchase=None, filters=None):
 
         invoice_data = []
         for doc in inward_supplies:
+            _purchase_invoice = purchases.pop(doc.link_name, frappe._dict())
+
             invoice_data.append(
                 frappe._dict(
                     {
@@ -105,10 +108,11 @@ def get_invoice_data(self, inward_supply=None, purchase=None, filters=None):
                         "is_pending_action_allowed": doc.is_pending_action_allowed,
                         "is_supplier_return_filed": doc.is_supplier_return_filed,
                         "doc_type": doc.doc_type,
-                        "_inward_supply": doc,
-                        "_purchase_invoice": purchases.pop(
-                            doc.link_name, frappe._dict()
+                        "posting_date": format_date(
+                            _purchase_invoice.pop("posting_date", None)
                         ),
+                        "_inward_supply": doc,
+                        "_purchase_invoice": _purchase_invoice,
                     }
                 )
             )
@@ -503,6 +507,10 @@ def get_invoice_columns(self):
                 "label": "Linked Voucher",
                 "fieldname": "purchase_invoice_name",
             },
+            {
+                "label": "Posting Date",
+                "fieldname": "posting_date",
+            },
             {
                 "label": "Taxable Amount Diff \n 2A/2B - Purchase",
                 "fieldname": "taxable_value_difference",