nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-24 17:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(accounts): add transaction time field

Browse Source 
(cherry picked from commit 9538a9870c)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/selling/doctype/sales_order/sales_order.json
This commit is contained in:
Sudharsanan11
2026-03-02 01:58:52 +05:30
committed by Mergify
parent fe721f48fc
commit 2526876eaa
4 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@@ -17,6 +17,7 @@
"order_confirmation_date", "order_confirmation_date",
"column_break_7", "column_break_7",
"transaction_date", "transaction_date",
"transaction_time",
"schedule_date", "schedule_date",
"column_break1", "column_break1",
"company", "company",
@@ -1311,6 +1312,14 @@
{ {
"fieldname": "section_break_tnkm", "fieldname": "section_break_tnkm",
"fieldtype": "Section Break" "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, "grid_page_length": 50,
@@ -1318,7 +1327,11 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-02-23 14:22:33.323946", "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", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",

1
erpnext/buying/doctype/purchase_order/purchase_order.py
View File

@@ -166,6 +166,7 @@ class PurchaseOrder(BuyingController):
total_qty: DF.Float total_qty: DF.Float
total_taxes_and_charges: DF.Currency total_taxes_and_charges: DF.Currency
transaction_date: DF.Date transaction_date: DF.Date
transaction_time: DF.Time | None
# end: auto-generated types # end: auto-generated types
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):

13
erpnext/selling/doctype/sales_order/sales_order.json
View File

@@ -18,6 +18,7 @@
"column_break_7", "column_break_7",
"order_type", "order_type",
"transaction_date", "transaction_date",
"transaction_time",
"delivery_date", "delivery_date",
"column_break1", "column_break1",
"tax_id", "tax_id",
@@ -1724,6 +1725,14 @@
"fieldname": "utm_analytics_section", "fieldname": "utm_analytics_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "UTM Analytics" "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, "grid_page_length": 50,
@@ -1731,7 +1740,11 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-02-10 11:55:52.796522", "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", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",

1
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -186,6 +186,7 @@ class SalesOrder(SellingController):
total_qty: DF.Float total_qty: DF.Float
total_taxes_and_charges: DF.Currency total_taxes_and_charges: DF.Currency
transaction_date: DF.Date transaction_date: DF.Date
transaction_time: DF.Time | None
utm_campaign: DF.Link | None utm_campaign: DF.Link | None
utm_content: DF.Data | None utm_content: DF.Data | None
utm_medium: DF.Link | None utm_medium: DF.Link | None