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

Merge pull request #33088 from rohitwaghchaure/fixed-ux-for-valuation-rate

Browse Source 
fix: Valuation Rate column UX in stock ledger report
This commit is contained in:
rohitwaghchaure 2022-11-23 17:29:51 +05:30 committed by GitHub
commit bbfa644475
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/stock/report/stock_ledger/stock_ledger.py
View File

@ -58,6 +58,12 @@ def execute(filters=None):
if sle.serial_no: if sle.serial_no:
update_available_serial_nos(available_serial_nos, sle) 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) data.append(sle)
if include_uom: if include_uom:
@ -185,10 +191,18 @@ def get_columns(filters):
"convertible": "rate", "convertible": "rate",
}, },
{ {
"label": _("Valuation Rate"), "label": _("Avg Rate (Balance Stock)"),
"fieldname": "valuation_rate", "fieldname": "valuation_rate",
"fieldtype": "Currency", "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", "options": "Company:company:default_currency",
"convertible": "rate", "convertible": "rate",
}, },