Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: change field to duration and fetch elapsed seconds

Browse Source
This commit is contained in:
ruthra 2021-12-14 19:45:09 +05:30
parent 2813e5ee29
commit 9232f75998
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/report/sales_order_analysis/sales_order_analysis.py
View File

@ -61,7 +61,7 @@ def get_data(conditions, filters):
IF(so.status in ('Completed','To Bill'), 0, (SELECT delay_days)) as delay, IF(so.status in ('Completed','To Bill'), 0, (SELECT delay_days)) as delay,
soi.qty, soi.delivered_qty, soi.qty, soi.delivered_qty,
(soi.qty - soi.delivered_qty) AS pending_qty, (soi.qty - soi.delivered_qty) AS pending_qty,
IF((SELECT pending_qty) = 0, DATEDIFF(Max(dn.posting_date), so.transaction_date), 0) as time_taken_to_deliver, IF((SELECT pending_qty) = 0, (TO_SECONDS(Max(dn.posting_date))-TO_SECONDS(so.transaction_date)), 0) as time_taken_to_deliver,
IFNULL(SUM(sii.qty), 0) as billed_qty, IFNULL(SUM(sii.qty), 0) as billed_qty,
soi.base_amount as amount, soi.base_amount as amount,
(soi.delivered_qty * soi.base_rate) as delivered_qty_amount, (soi.delivered_qty * soi.base_rate) as delivered_qty_amount,
@ -268,7 +268,7 @@ def get_columns(filters):
{ {
"label": _("Time Taken to Deliver"), "label": _("Time Taken to Deliver"),
"fieldname": "time_taken_to_deliver", "fieldname": "time_taken_to_deliver",
"fieldtype": "Data", "fieldtype": "Duration",
"width": 100 "width": 100
} }
]) ])