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

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2018-08-29 13:34:58 +05:30
parent 6b539d65d7 d982e8fcda
commit a804d6d487
34 changed files with 584 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/stock/utils.py
View File

@@ -11,8 +11,7 @@ from six import string_types
class InvalidWarehouseCompany(frappe.ValidationError): pass
def get_stock_value_from_bin (warehouse=None, item_code=None):
def get_stock_value_from_bin(warehouse=None, item_code=None):
values = {}
conditions = ""
if warehouse:
@@ -28,14 +27,13 @@ def get_stock_value_from_bin (warehouse=None, item_code=None):
if item_code:
conditions += " and item_code = %(item_code)s"
values['item_code'] = item_code
query = "select sum(stock_value) from `tabBin` where 1 = 1" + conditions
query = "select sum(stock_value) from `tabBin` where 1 = 1 %s" % conditions
stock_value = frappe.db.sql(query, values)
return stock_value;
return stock_value
def get_stock_value_on(warehouse=None, posting_date=None, item_code=None):
if not posting_date: posting_date = nowdate()