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

Merge pull request #15701 from shreyashah115/item-stock

Browse Source 
Add column for Item Name in Item Price Stock report
This commit is contained in:
Shreya Shah 2018-10-16 14:22:46 +05:30 committed by GitHub
commit bfb88f7839
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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": _("Brand"), "label": _("Brand"),
"fieldname": "brand", "fieldname": "brand",
@ -76,7 +82,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,
a.brand as brand, b.warehouse as warehouse, b.actual_qty as actual_qty a.brand as brand, 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
@ -92,6 +98,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,
'brand': item_dict.brand, 'brand': item_dict.brand,
'warehouse': item_dict.warehouse, 'warehouse': item_dict.warehouse,