Fixes in stock projected qty report
diff --git a/stock/report/stock_ledger/stock_ledger.py b/stock/report/stock_ledger/stock_ledger.py
index 034884b..b2bc64f 100644
--- a/stock/report/stock_ledger/stock_ledger.py
+++ b/stock/report/stock_ledger/stock_ledger.py
@@ -3,7 +3,6 @@
from __future__ import unicode_literals
import webnotes
-from webnotes import _
def execute(filters=None):
columns = get_columns()
@@ -33,13 +32,6 @@
"Batch:Link/Batch:100", "Serial #:Link/Serial No:100", "Company:Link/Company:100"]
def get_stock_ledger_entries(filters):
- if not filters.get("company"):
- webnotes.throw(_("Company is mandatory"))
- if not filters.get("from_date"):
- webnotes.throw(_("From Date is mandatory"))
- if not filters.get("to_date"):
- webnotes.throw(_("To Date is mandatory"))
-
return webnotes.conn.sql("""select concat_ws(" ", posting_date, posting_time) as date,
item_code, warehouse, actual_qty, qty_after_transaction,
stock_value, voucher_type, voucher_no, batch_no, serial_no, company
diff --git a/stock/report/stock_projected_qty/stock_projected_qty.js b/stock/report/stock_projected_qty/stock_projected_qty.js
index a0ad755..8c25e5d 100644
--- a/stock/report/stock_projected_qty/stock_projected_qty.js
+++ b/stock/report/stock_projected_qty/stock_projected_qty.js
@@ -7,9 +7,7 @@
"fieldname":"company",
"label": wn._("Company"),
"fieldtype": "Link",
- "options": "Company",
- "default": wn.defaults.get_user_default("company"),
- "reqd": 1
+ "options": "Company"
},
{
"fieldname":"warehouse",
diff --git a/stock/report/stock_projected_qty/stock_projected_qty.py b/stock/report/stock_projected_qty/stock_projected_qty.py
index 0572f79..d335ebf 100644
--- a/stock/report/stock_projected_qty/stock_projected_qty.py
+++ b/stock/report/stock_projected_qty/stock_projected_qty.py
@@ -13,7 +13,7 @@
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 @@
return "where {}".format(" and ".join(conditions)) if conditions else ""
def get_warehouse_conditions(filters):
- return " and name=%(warehouse)s" if filters.get("warehouse") else ""
\ No newline at end of file
+ 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 ""
\ No newline at end of file