mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-30 12:15:43 +00:00
fix(accounts): add transaction time field
(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:
@@ -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",
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user