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

Made join_table query optional based on item group filter

Browse Source
This commit is contained in:
Nabin Hait 2017-03-29 17:50:47 +05:30
parent 41bf1ba7b3
commit e2fef16d78
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/stock/report/stock_balance/stock_balance.py
View File

@ -84,12 +84,16 @@ def get_conditions(filters):
def get_stock_ledger_entries(filters): def get_stock_ledger_entries(filters):
conditions = get_conditions(filters) conditions = get_conditions(filters)
join_table_query = ""
if filters.get("item_group"):
join_table_query = "inner join `tabItem` item on item.name = sle.item_code"
return frappe.db.sql("""select sle.item_code, warehouse, sle.posting_date, sle.actual_qty, sle.valuation_rate, return frappe.db.sql("""select sle.item_code, warehouse, sle.posting_date, sle.actual_qty, sle.valuation_rate,
sle.company, sle.voucher_type, sle.qty_after_transaction, sle.stock_value_difference sle.company, sle.voucher_type, sle.qty_after_transaction, sle.stock_value_difference
from `tabStock Ledger Entry` sle force index (posting_sort_index) from `tabStock Ledger Entry` sle force index (posting_sort_index) %s
inner join `tabItem` item on item.name = sle.item_code
where sle.docstatus < 2 %s order by sle.posting_date, sle.posting_time, sle.name""" % where sle.docstatus < 2 %s order by sle.posting_date, sle.posting_time, sle.name""" %
conditions, as_dict=1) (join_table_query, conditions), as_dict=1)
def get_item_warehouse_map(filters): def get_item_warehouse_map(filters):
iwb_map = {} iwb_map = {}