From c6b5f7dcae59a1b77a66432096dc76bc06987471 Mon Sep 17 00:00:00 2001 From: ShashaQin Date: Thu, 10 Mar 2016 08:49:38 +0800 Subject: [PATCH 1/3] Update item_prices.py --- .../stock/report/item_prices/item_prices.py | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/erpnext/stock/report/item_prices/item_prices.py b/erpnext/stock/report/item_prices/item_prices.py index ffd128dd02..e722472461 100644 --- a/erpnext/stock/report/item_prices/item_prices.py +++ b/erpnext/stock/report/item_prices/item_prices.py @@ -20,7 +20,7 @@ def execute(filters=None): precision = get_currency_precision() or 2 data = [] for item in sorted(item_map): - data.append([item, item_map[item]["item_name"], + data.append([item, item_map[item]["item_name"],item_map[item]["item_group"], item_map[item]["description"], item_map[item]["stock_uom"], flt(last_purchase_rate.get(item, 0), precision), flt(val_rate_map.get(item, 0), precision), @@ -34,9 +34,9 @@ def execute(filters=None): def get_columns(filters): """return columns based on filters""" - columns = [_("Item") + ":Link/Item:100", _("Item Name") + "::150", _("Description") + "::150", _("UOM") + ":Link/UOM:80", - _("Last Purchase Rate") + ":Currency:90", _("Valuation Rate") + ":Currency:80", _("Sales Price List") + "::80", - _("Purchase Price List") + "::80", _("BOM Rate") + ":Currency:90"] + columns = [_("Item") + ":Link/Item:100", _("Item Name") + "::150",_("Item Group") + ":Link/Item Group:125", _("Description") + "::150", _("UOM") + ":Link/UOM:80", + _("Last Purchase Rate") + ":Currency:90", _("Valuation Rate") + ":Currency:80", _("Sales Price List") + "::180", + _("Purchase Price List") + "::180", _("BOM Rate") + ":Currency:90"] return columns @@ -45,9 +45,10 @@ def get_item_details(): item_map = {} - for i in frappe.db.sql("select name, item_name, description, \ - stock_uom from tabItem \ - order by item_code", as_dict=1): + for i in frappe.db.sql("select it.item_group as item_group, it.name as name, item_name, it.description as description, \ + stock_uom from tabItem it, `tabItem Group` itg \ + where it.item_group = itg.name \ + order by it.item_group, item_code", as_dict=1): item_map.setdefault(i.name, i) return item_map @@ -58,9 +59,9 @@ def get_price_list(): rate = {} price_list = frappe.db.sql("""select ip.item_code, ip.buying, ip.selling, - concat(ip.price_list, " - ", ip.currency, " ", ip.price_list_rate) as price - from `tabItem Price` ip, `tabPrice List` pl - where ip.price_list=pl.name and pl.enabled=1""", as_dict=1) + concat(cu.symbol, " ", round(ip.price_list_rate,2), " - ", ip.price_list) as price + from `tabItem Price` ip, `tabPrice List` pl, `tabCurrency` cu + where ip.price_list=pl.name and pl.currency=cu.name and pl.enabled=1""", as_dict=1) for j in price_list: if j.price: From e8d635827ac49b1493b0aaa02446e0ec097b9ad1 Mon Sep 17 00:00:00 2001 From: ShashaQin Date: Thu, 10 Mar 2016 14:55:06 +0800 Subject: [PATCH 2/3] Update item_prices.py --- erpnext/stock/report/item_prices/item_prices.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/report/item_prices/item_prices.py b/erpnext/stock/report/item_prices/item_prices.py index e722472461..680a5c2ece 100644 --- a/erpnext/stock/report/item_prices/item_prices.py +++ b/erpnext/stock/report/item_prices/item_prices.py @@ -47,7 +47,7 @@ def get_item_details(): for i in frappe.db.sql("select it.item_group as item_group, it.name as name, item_name, it.description as description, \ stock_uom from tabItem it, `tabItem Group` itg \ - where it.item_group = itg.name \ + where it.item_group = itg.name and it.disabled = 0\ order by it.item_group, item_code", as_dict=1): item_map.setdefault(i.name, i) From 769b01e07aeda8c689222a6a91278b4aaf5235b9 Mon Sep 17 00:00:00 2001 From: ShashaQin Date: Wed, 16 Mar 2016 16:37:28 +0800 Subject: [PATCH 3/3] Update item_prices.py --- erpnext/stock/report/item_prices/item_prices.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/erpnext/stock/report/item_prices/item_prices.py b/erpnext/stock/report/item_prices/item_prices.py index 680a5c2ece..ca01d199b1 100644 --- a/erpnext/stock/report/item_prices/item_prices.py +++ b/erpnext/stock/report/item_prices/item_prices.py @@ -45,10 +45,9 @@ def get_item_details(): item_map = {} - for i in frappe.db.sql("select it.item_group as item_group, it.name as name, item_name, it.description as description, \ - stock_uom from tabItem it, `tabItem Group` itg \ - where it.item_group = itg.name and it.disabled = 0\ - order by it.item_group, item_code", as_dict=1): + for i in frappe.db.sql("select name, item_group, item_name, description, \ + stock_uom from tabItem \ + order by item_code, item_group", as_dict=1): item_map.setdefault(i.name, i) return item_map @@ -59,7 +58,7 @@ def get_price_list(): rate = {} price_list = frappe.db.sql("""select ip.item_code, ip.buying, ip.selling, - concat(cu.symbol, " ", round(ip.price_list_rate,2), " - ", ip.price_list) as price + concat(ifnull(cu.symbol,ip.currency), " ", round(ip.price_list_rate,2), " - ", ip.price_list) as price from `tabItem Price` ip, `tabPrice List` pl, `tabCurrency` cu where ip.price_list=pl.name and pl.currency=cu.name and pl.enabled=1""", as_dict=1)