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

Merge pull request #20454 from marination/stock-ledger-qty-column

Browse Source 
fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger
This commit is contained in:
Deepesh Garg 2020-01-29 09:49:55 +05:30 committed by GitHub
commit 565a810bf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/stock/report/stock_ledger/stock_ledger.js
View File

@ -83,6 +83,9 @@ frappe.query_reports["Stock Ledger"] = {
if (column.fieldname == "out_qty" && data.out_qty < 0) { if (column.fieldname == "out_qty" && data.out_qty < 0) {
value = "<span style='color:red'>" + value + "</span>"; value = "<span style='color:red'>" + value + "</span>";
} }
else if (column.fieldname == "in_qty" && data.in_qty > 0) {
value = "<span style='color:green'>" + value + "</span>";
}
return value; return value;
}, },

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

@ -38,7 +38,10 @@ def execute(filters=None):
sle.update({ sle.update({
"qty_after_transaction": actual_qty, "qty_after_transaction": actual_qty,
"stock_value": stock_value, "stock_value": stock_value
})
sle.update({
"in_qty": max(sle.actual_qty, 0), "in_qty": max(sle.actual_qty, 0),
"out_qty": min(sle.actual_qty, 0) "out_qty": min(sle.actual_qty, 0)
}) })