schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17558 from rohitwaghchaure/incorrect_stock_balance_showing_in

Browse Source 
fix: incorrect stock balance showing in the warehouse tree view
This commit is contained in:
rohitwaghchaure
2019-05-11 11:30:24 +05:30
committed by GitHub
parent 26bb028ec4 6be1475882
commit ab7570b7e5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/warehouse/warehouse.py
View File

@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe, erpnext
from frappe.utils import cint
from frappe.utils import cint, nowdate
from frappe import throw, _
from frappe.utils.nestedset import NestedSet
from erpnext.stock import get_warehouse_account
@@ -140,7 +140,7 @@ class Warehouse(NestedSet):
@frappe.whitelist()
def get_children(doctype, parent=None, company=None, is_root=False):
from erpnext.stock.utils import get_stock_value_from_bin
from erpnext.stock.utils import get_stock_value_on
if is_root:
parent = ""
@@ -156,7 +156,7 @@ def get_children(doctype, parent=None, company=None, is_root=False):
# return warehouses
for wh in warehouses:
wh["balance"] = get_stock_value_from_bin(warehouse=wh.value)
wh["balance"] = get_stock_value_on(warehouse=wh.value, posting_date=nowdate())
if company:
wh["company_currency"] = frappe.db.get_value('Company', company, 'default_currency')
return warehouses