Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: mismatch between warehouse tree value and warehouse based stock balance report value #18877

Merged
merged 4 commits into from
Sep 5, 2019
Merged

fix: mismatch between warehouse tree value and warehouse based stock balance report value #18877

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
021ef31
fix: mismatch between warehouse tree value and warehouse based stock …
rohitwaghchaure Aug 30, 2019
568376d
Merge branch 'version-11-hotfix' into warehouse_tree_value_and_stock_…
nabinhait Sep 3, 2019
fb98162
Merge branch 'version-11-hotfix' into warehouse_tree_value_and_stock_…
nabinhait Sep 3, 2019
1365c90
Merge branch 'version-11-hotfix' into warehouse_tree_value_and_stock_…
nabinhait Sep 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions erpnext/stock/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def get_stock_value_from_bin(warehouse=None, item_code=None):
values = {}
conditions = ""
if warehouse:
conditions += """ and warehouse in (
conditions += """ and `tabBin`.warehouse in (
select w2.name from `tabWarehouse` w1
join `tabWarehouse` w2 on
w1.name = %(warehouse)s
Expand All @@ -25,11 +25,12 @@ def get_stock_value_from_bin(warehouse=None, item_code=None):
values['warehouse'] = warehouse

if item_code:
conditions += " and item_code = %(item_code)s"
conditions += " and `tabBin`.item_code = %(item_code)s"

values['item_code'] = item_code

query = "select sum(stock_value) from `tabBin` where 1 = 1 %s" % conditions
query = """select sum(stock_value) from `tabBin`, `tabItem` where 1 = 1
and `tabItem`.name = `tabBin`.item_code and ifnull(`tabItem`.disabled, 0) = 0 %s""" % conditions

stock_value = frappe.db.sql(query, values)

Expand Down