nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 00:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enabled feature in Price List

Browse Source
This commit is contained in:
Akhilesh Darjee
2014-01-20 16:09:45 +05:30
parent 8a4111fe0e dbb4955483
commit e82eee512b
22 changed files with 133 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
stock/report/item_prices/item_prices.py
View File

@@ -16,7 +16,6 @@ def execute(filters=None):
val_rate_map = get_valuation_rate()
precision = get_currency_precision() or 2
data = []
for item in sorted(item_map):
data.append([item, item_map[item]["item_name"],
@@ -65,9 +64,10 @@ def get_price_list():
rate = {}
price_list = webnotes.conn.sql("""select item_code, buying, selling,
concat(price_list, " - ", currency, " ", ref_rate) as price
from `tabItem Price`""", as_dict=1)
price_list = webnotes.conn.sql("""select ip.item_code, ip.buying, ip.selling,
concat(ip.price_list, " - ", ip.currency, " ", ip.ref_rate) as price
from `tabItem Price` ip, `tabPrice List` pl
where ip.price_list=pl.name and pl.enabled=1""", as_dict=1)
for j in price_list:
if j.price: