From 372c5e51d5a8871972036a58985726ff3badb571 Mon Sep 17 00:00:00 2001 From: marination Date: Tue, 28 Jan 2020 16:04:49 +0530 Subject: [PATCH 1/2] fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger --- erpnext/stock/report/stock_ledger/stock_ledger.js | 3 +++ erpnext/stock/report/stock_ledger/stock_ledger.py | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.js b/erpnext/stock/report/stock_ledger/stock_ledger.js index df3bba5e40..3d5cfdc274 100644 --- a/erpnext/stock/report/stock_ledger/stock_ledger.js +++ b/erpnext/stock/report/stock_ledger/stock_ledger.js @@ -83,6 +83,9 @@ frappe.query_reports["Stock Ledger"] = { if (column.fieldname == "out_qty" && data.out_qty < 0) { value = "" + value + ""; } + else if (column.fieldname == "in_qty" && data.in_qty > 0) { + value = "" + value + ""; + } return value; }, diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py index fc49db5088..670a0e2fc8 100644 --- a/erpnext/stock/report/stock_ledger/stock_ledger.py +++ b/erpnext/stock/report/stock_ledger/stock_ledger.py @@ -39,10 +39,13 @@ def execute(filters=None): sle.update({ "qty_after_transaction": actual_qty, "stock_value": stock_value, - "in_qty": max(sle.actual_qty, 0), - "out_qty": min(sle.actual_qty, 0) }) + sle.update({ + "in_qty": max(sle.actual_qty, 0), + "out_qty": min(sle.actual_qty, 0) + }) + # get the name of the item that was produced using this item if sle.voucher_type == "Stock Entry": purpose, work_order, fg_completed_qty = frappe.db.get_value(sle.voucher_type, sle.voucher_no, ["purpose", "work_order", "fg_completed_qty"]) From b61b8d7ced11fb36cfa12c6b678da36ab3736240 Mon Sep 17 00:00:00 2001 From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Date: Wed, 29 Jan 2020 09:49:26 +0530 Subject: [PATCH 2/2] fix: Remove comma --- erpnext/stock/report/stock_ledger/stock_ledger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py index 670a0e2fc8..28d72084de 100644 --- a/erpnext/stock/report/stock_ledger/stock_ledger.py +++ b/erpnext/stock/report/stock_ledger/stock_ledger.py @@ -38,7 +38,7 @@ def execute(filters=None): sle.update({ "qty_after_transaction": actual_qty, - "stock_value": stock_value, + "stock_value": stock_value }) sle.update({