nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 15:42:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes in stock projected qty report

Browse Source
This commit is contained in:
Nabin Hait
2013-12-20 12:18:37 +05:30
parent 2a9e4e9a32
commit a888e29b0a
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stock/report/stock_projected_qty/stock_projected_qty.js
View File

@@ -7,9 +7,7 @@ wn.query_reports["Stock Projected Qty"] = {
"fieldname":"company",
"label": wn._("Company"),
"fieldtype": "Link",
"options": "Company",
"default": wn.defaults.get_user_default("company"),
"reqd": 1
"options": "Company"
},
{
"fieldname":"warehouse",

10
stock/report/stock_projected_qty/stock_projected_qty.py
View File

@@ -13,7 +13,7 @@ def execute(filters=None):
projected_qty, item.re_order_level, item.re_order_qty
from `tabBin` bin,
(select name, company from tabWarehouse
where company=%(company)s {warehouse_conditions}) wh,
{warehouse_conditions}) wh,
(select name, item_name, description, stock_uom, item_group,
brand, re_order_level, re_order_qty
from `tabItem` {item_conditions}) item
@@ -41,4 +41,10 @@ def get_item_conditions(filters):
return "where {}".format(" and ".join(conditions)) if conditions else ""
def get_warehouse_conditions(filters):
return " and name=%(warehouse)s" if filters.get("warehouse") else ""
conditions = []
if filters.get("company"):
conditions.append("company=%(company)s")
if filters.get("warehouse"):
conditions.append("name=%(warehouse)s")
return "where {}".format(" and ".join(conditions)) if conditions else ""