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

fix(report): Add column for Item Name (#15702)

Browse Source
This commit is contained in:
Shreya Shah 2018-10-16 14:36:49 +05:30 committed by Nabin Hait
parent ff0deedca9
commit 8e71074e1c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/stock/report/item_price_stock/item_price_stock.py
View File

@ -13,12 +13,18 @@ def execute(filters=None):
def get_columns(): def get_columns():
return [ return [
{ {
"label": _("Item Name"), "label": _("Item Code"),
"fieldname": "item_name", "fieldname": "item_code",
"fieldtype": "Link", "fieldtype": "Link",
"options": "Item", "options": "Item",
"width": 120 "width": 120
}, },
{
"label": _("Item Name"),
"fieldname": "item_name",
"fieldtype": "Data",
"width": 120
},
{ {
"label": _("Warehouse"), "label": _("Warehouse"),
"fieldname": "warehouse", "fieldname": "warehouse",
@ -70,7 +76,7 @@ def get_item_price_qty_data(filters):
if filters.get("item_code"): if filters.get("item_code"):
conditions += "where a.item_code=%(item_code)s" conditions += "where a.item_code=%(item_code)s"
item_results = frappe.db.sql("""select a.item_code as item_name, a.name as price_list_name, item_results = frappe.db.sql("""select a.item_code, a.item_name, a.name as price_list_name,
b.warehouse as warehouse, b.actual_qty as actual_qty b.warehouse as warehouse, b.actual_qty as actual_qty
from `tabItem Price` a left join `tabBin` b from `tabItem Price` a left join `tabBin` b
ON a.item_code = b.item_code ON a.item_code = b.item_code
@ -86,6 +92,7 @@ def get_item_price_qty_data(filters):
if item_results: if item_results:
for item_dict in item_results: for item_dict in item_results:
data = { data = {
'item_code': item_dict.item_code,
'item_name': item_dict.item_name, 'item_name': item_dict.item_name,
'warehouse': item_dict.warehouse, 'warehouse': item_dict.warehouse,
'stock_available': item_dict.actual_qty or 0, 'stock_available': item_dict.actual_qty or 0,