nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 04:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55323 from aerele/fix/support-#68170

Browse Source 
fix(stock): change valuation rate column label in stock ledger entry/report
This commit is contained in:
rohitwaghchaure
2026-05-28 16:46:09 +05:30
committed by GitHub
parent e7c695e0ac 373696d470
commit feee40b30a
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
View File

@@ -1,12 +1,12 @@
{ {
"actions": [], "actions": [],
"allow_bulk_edit": 1,
"allow_copy": 1, "allow_copy": 1,
"autoname": "MAT-SLE-.YYYY.-.#####", "autoname": "MAT-SLE-.YYYY.-.#####",
"creation": "2013-01-29 19:25:42", "creation": "2013-01-29 19:25:42",
"doctype": "DocType", "doctype": "DocType",
"document_type": "Other", "document_type": "Other",
"engine": "InnoDB", "engine": "InnoDB",
"is_submittable": 1,
"field_order": [ "field_order": [
"item_code", "item_code",
"warehouse", "warehouse",
@@ -205,7 +205,7 @@
{ {
"fieldname": "valuation_rate", "fieldname": "valuation_rate",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Valuation Rate", "label": "Average Rate",
"oldfieldname": "valuation_rate", "oldfieldname": "valuation_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
@@ -361,12 +361,13 @@
"idx": 1, "idx": 1,
"in_create": 1, "in_create": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [], "links": [],
"modified": "2025-10-04 09:59:15.546556", "modified": "2026-05-26 19:07:43.537450",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Ledger Entry", "name": "Stock Ledger Entry",
"naming_rule": "Expression (old style)", "naming_rule": "Expression",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {

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

@@ -108,10 +108,11 @@ 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: if sle.actual_qty < 0:
sle["in_out_rate"] = flt(sle.stock_value_difference / sle.actual_qty, precision) sle["in_out_rate"] = flt(sle.stock_value_difference / sle.actual_qty, precision)
sle["incoming_rate"] = 0
elif sle.voucher_type == "Stock Reconciliation": elif sle.voucher_type == "Stock Reconciliation" and sle.actual_qty < 0:
sle["in_out_rate"] = sle.valuation_rate sle["in_out_rate"] = sle.valuation_rate
if ( if (
@@ -192,7 +193,7 @@ def get_segregated_bundle_entries(sle, bundle_details, batch_balance_dict, filte
new_sle.update(row) new_sle.update(row)
new_sle.update( new_sle.update(
{ {
"in_out_rate": flt(new_sle.stock_value_difference / row.qty) if row.qty else 0, "in_out_rate": flt(new_sle.stock_value_difference / row.qty) if row.qty < 0 else 0,
"in_qty": row.qty if row.qty > 0 else 0, "in_qty": row.qty if row.qty > 0 else 0,
"out_qty": row.qty if row.qty < 0 else 0, "out_qty": row.qty if row.qty < 0 else 0,
"qty_after_transaction": qty_before_transaction + row.qty, "qty_after_transaction": qty_before_transaction + row.qty,
@@ -374,7 +375,7 @@ def get_columns(filters):
"convertible": "rate", "convertible": "rate",
}, },
{ {
"label": _("Valuation Rate"), "label": _("Outgoing Rate"),
"fieldname": "in_out_rate", "fieldname": "in_out_rate",
"fieldtype": filters.valuation_field_type, "fieldtype": filters.valuation_field_type,
"width": 140, "width": 140,