From be19e4f621261bb08cd05005420a054d63ad3149 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 23 Nov 2022 16:32:23 +0530 Subject: [PATCH] fix: Valuation Rate column UX in stock ledger report --- .../stock/report/stock_ledger/stock_ledger.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py index b725d49de704..8b63c0f99869 100644 --- a/erpnext/stock/report/stock_ledger/stock_ledger.py +++ b/erpnext/stock/report/stock_ledger/stock_ledger.py @@ -58,6 +58,12 @@ def execute(filters=None): if sle.serial_no: update_available_serial_nos(available_serial_nos, sle) + if sle.actual_qty: + sle["in_out_rate"] = flt(sle.stock_value_difference / sle.actual_qty, precision) + + elif sle.voucher_type == "Stock Reconciliation": + sle["in_out_rate"] = sle.valuation_rate + data.append(sle) if include_uom: @@ -185,10 +191,18 @@ def get_columns(filters): "convertible": "rate", }, { - "label": _("Valuation Rate"), + "label": _("Avg Rate (Balance Stock)"), "fieldname": "valuation_rate", "fieldtype": "Currency", - "width": 110, + "width": 180, + "options": "Company:company:default_currency", + "convertible": "rate", + }, + { + "label": _("Valuation Rate"), + "fieldname": "in_out_rate", + "fieldtype": "Currency", + "width": 140, "options": "Company:company:default_currency", "convertible": "rate", },