From 2932793af02498dd6f8485ec0d04447d1e86ff56 Mon Sep 17 00:00:00 2001 From: Afsal Syed Date: Tue, 8 Sep 2026 18:49:23 +0530 Subject: [PATCH] fix(stock): show actual outgoing rate in ledger preview (#58700) --- erpnext/controllers/stock_controller.py | 32 ++++++++++++++++------- erpnext/public/js/utils/ledger_preview.js | 2 +- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py index 54864b8f8d9..c61b39cd995 100644 --- a/erpnext/controllers/stock_controller.py +++ b/erpnext/controllers/stock_controller.py @@ -2197,7 +2197,7 @@ def show_accounting_ledger_preview(company: str, doctype: str, docname: str): @frappe.whitelist() def show_stock_ledger_preview(company: str, doctype: str, docname: str): - filters = frappe._dict(company=company) + filters = frappe._dict(company=company, valuation_field_type="Currency") doc = frappe.get_lazy_doc(doctype, docname) doc.check_permission("read") doc.run_method("before_sl_preview") @@ -2238,7 +2238,7 @@ def get_accounting_ledger_preview(doc, filters): columns = get_gl_columns(filters) gl_entries = get_gl_entries_for_preview(doc.doctype, doc.name, fields) - gl_columns = get_columns(columns, fields) + gl_columns = get_columns(columns, fields, erpnext.get_company_currency(filters.company)) gl_data = get_data(fields, gl_entries) return gl_columns, gl_data @@ -2280,7 +2280,7 @@ def get_stock_ledger_preview(doc, filters): columns = get_sl_columns(filters) sl_entries = get_sl_entries_for_preview(doc.doctype, doc.name, fields) - sl_columns = get_columns(columns, columns_fields) + sl_columns = get_columns(columns, columns_fields, erpnext.get_company_currency(filters.company)) sl_data = get_data(columns_fields, sl_entries) return sl_columns, sl_data @@ -2299,7 +2299,8 @@ def get_sl_entries_for_preview(doctype, docname, fields): entry["out_qty"] = abs(entry.actual_qty) entry["in_qty"] = 0 - entry["in_out_rate"] = entry["valuation_rate"] + if entry.actual_qty < 0: + entry["in_out_rate"] = entry.stock_value_difference / entry.actual_qty return sl_entries @@ -2308,12 +2309,23 @@ def get_gl_entries_for_preview(doctype, docname, fields): return frappe.get_all("GL Entry", filters={"voucher_type": doctype, "voucher_no": docname}, fields=fields) -def get_columns(raw_columns, fields): - return [ - {"name": d.get("label"), "editable": False, "width": 110, "fieldtype": d.get("fieldtype")} - for d in raw_columns - if not d.get("hidden") and d.get("fieldname") in fields - ] +def get_columns(raw_columns, fields, currency): + columns = [] + for source_column in raw_columns: + if source_column.get("hidden") or source_column.get("fieldname") not in fields: + continue + + column = { + "name": source_column.get("label"), + "editable": False, + "width": 110, + "fieldtype": source_column.get("fieldtype"), + } + if column["fieldtype"] == "Currency": + column["options"] = currency + columns.append(column) + + return columns def get_data(raw_columns, raw_data): diff --git a/erpnext/public/js/utils/ledger_preview.js b/erpnext/public/js/utils/ledger_preview.js index a86e0076629..07862b633b1 100644 --- a/erpnext/public/js/utils/ledger_preview.js +++ b/erpnext/public/js/utils/ledger_preview.js @@ -87,7 +87,7 @@ erpnext.accounts.ledger_preview = { columns.forEach((col) => { if (col.fieldtype === "Currency") { col.format = (value) => { - return format_currency(value); + return format_currency(value, col.options); }; } });