mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-27 17:04:47 +00:00
Merge pull request #53086 from frappe/mergify/bp/version-16-hotfix/pr-53072
fix(accounts): set posting time to get incoming rate (backport #53072)
This commit is contained in:
@@ -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,7 @@
|
|||||||
"idx": 105,
|
"idx": 105,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2026-02-23 14:22:33.323946",
|
"modified": "2026-03-02 00:40:47.119584",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Buying",
|
"module": "Buying",
|
||||||
"name": "Purchase Order",
|
"name": "Purchase Order",
|
||||||
|
|||||||
@@ -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):
|
||||||
|
|||||||
@@ -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,7 @@
|
|||||||
"idx": 105,
|
"idx": 105,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2026-02-10 11:55:52.796522",
|
"modified": "2026-03-02 00:42:18.834823",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Selling",
|
"module": "Selling",
|
||||||
"name": "Sales Order",
|
"name": "Sales Order",
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -341,6 +341,7 @@ class TransactionBase(StatusUpdater):
|
|||||||
args.update(
|
args.update(
|
||||||
{
|
{
|
||||||
"posting_date": self.transaction_date,
|
"posting_date": self.transaction_date,
|
||||||
|
"posting_time": self.transaction_time,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user