diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 3dd4d927255..4746ebf700f 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -17,6 +17,7 @@ "order_confirmation_date", "column_break_7", "transaction_date", + "transaction_time", "schedule_date", "column_break1", "company", @@ -1311,6 +1312,14 @@ { "fieldname": "section_break_tnkm", "fieldtype": "Section Break" + }, + { + "default": "Now", + "depends_on": "is_internal_supplier", + "fieldname": "transaction_time", + "fieldtype": "Time", + "label": "Time", + "mandatory_depends_on": "is_internal_supplier" } ], "grid_page_length": 50, @@ -1318,7 +1327,11 @@ "idx": 105, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2026-02-23 14:22:33.323946", +======= + "modified": "2026-03-02 00:40:47.119584", +>>>>>>> 9538a9870c (fix(accounts): add transaction time field) "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index 1f945da1682..aaace54db63 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -166,6 +166,7 @@ class PurchaseOrder(BuyingController): total_qty: DF.Float total_taxes_and_charges: DF.Currency transaction_date: DF.Date + transaction_time: DF.Time | None # end: auto-generated types def __init__(self, *args, **kwargs): diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 00a8f8d3b12..22ad9300529 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -18,6 +18,7 @@ "column_break_7", "order_type", "transaction_date", + "transaction_time", "delivery_date", "column_break1", "tax_id", @@ -1724,6 +1725,14 @@ "fieldname": "utm_analytics_section", "fieldtype": "Section Break", "label": "UTM Analytics" + }, + { + "default": "Now", + "depends_on": "is_internal_customer", + "fieldname": "transaction_time", + "fieldtype": "Time", + "label": "Time", + "mandatory_depends_on": "is_internal_customer" } ], "grid_page_length": 50, @@ -1731,7 +1740,11 @@ "idx": 105, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2026-02-10 11:55:52.796522", +======= + "modified": "2026-03-02 00:42:18.834823", +>>>>>>> 9538a9870c (fix(accounts): add transaction time field) "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 9d39c38505d..1759356c63d 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -186,6 +186,7 @@ class SalesOrder(SellingController): total_qty: DF.Float total_taxes_and_charges: DF.Currency transaction_date: DF.Date + transaction_time: DF.Time | None utm_campaign: DF.Link | None utm_content: DF.Data | None utm_medium: DF.Link | None