From b5a8cab8df98cd008647a92150fc8329efd697bc Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Thu, 15 May 2014 11:50:46 +0530
Subject: [PATCH] Valuation Rate column in Stock Ledger report. Fixed #1633

---
 .../stock/report/stock_ledger/stock_ledger.py | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index 298e971373c..5068326af06 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -8,32 +8,32 @@ def execute(filters=None):
 	columns = get_columns()
 	sl_entries = get_stock_ledger_entries(filters)
 	item_details = get_item_details(filters)
-	
+
 	data = []
 	for sle in sl_entries:
 		item_detail = item_details[sle.item_code]
-		voucher_link_icon = """<a href="%s"><i class="icon icon-share" 
+		voucher_link_icon = """<a href="%s"><i class="icon icon-share"
 			style="cursor: pointer;"></i></a>""" \
 			% ("/".join(["#Form", sle.voucher_type, sle.voucher_no]),)
-			
-		data.append([sle.date, sle.item_code, item_detail.item_name, item_detail.item_group, 
-			item_detail.brand, item_detail.description, sle.warehouse, item_detail.stock_uom, 
-			sle.actual_qty, sle.qty_after_transaction, sle.stock_value, sle.voucher_type, 
-			sle.voucher_no, voucher_link_icon, sle.batch_no, sle.serial_no, sle.company])
-	
+
+		data.append([sle.date, sle.item_code, item_detail.item_name, item_detail.item_group,
+			item_detail.brand, item_detail.description, sle.warehouse, item_detail.stock_uom,
+			sle.actual_qty, sle.qty_after_transaction, sle.valuation_rate, sle.stock_value,
+			sle.voucher_type, sle.voucher_no, voucher_link_icon, sle.batch_no, sle.serial_no, sle.company])
+
 	return columns, data
-	
+
 def get_columns():
-	return ["Date:Datetime:95", "Item:Link/Item:100", "Item Name::100", 
+	return ["Date:Datetime:95", "Item:Link/Item:130", "Item Name::100",
 		"Item Group:Link/Item Group:100", "Brand:Link/Brand:100",
 		"Description::200", "Warehouse:Link/Warehouse:100",
-		"Stock UOM:Link/UOM:100", "Qty:Float:50", "Balance Qty:Float:80", 
-		"Balance Value:Currency:100", "Voucher Type::100", "Voucher #::100", "Link::30", 
+		"Stock UOM:Link/UOM:100", "Qty:Float:50", "Balance Qty:Float:100", "Valuation Rate:Currency:110",
+		"Balance Value:Currency:110", "Voucher Type::110", "Voucher #::100", "Link::30",
 		"Batch:Link/Batch:100", "Serial #:Link/Serial No:100", "Company:Link/Company:100"]
-	
+
 def get_stock_ledger_entries(filters):
 	return frappe.db.sql("""select concat_ws(" ", posting_date, posting_time) as date,
-			item_code, warehouse, actual_qty, qty_after_transaction, 
+			item_code, warehouse, actual_qty, qty_after_transaction, valuation_rate,
 			stock_value, voucher_type, voucher_no, batch_no, serial_no, company
 		from `tabStock Ledger Entry`
 		where company = %(company)s and
@@ -44,31 +44,31 @@ def get_stock_ledger_entries(filters):
 
 def get_item_details(filters):
 	item_details = {}
-	for item in frappe.db.sql("""select name, item_name, description, item_group, 
+	for item in frappe.db.sql("""select name, item_name, description, item_group,
 			brand, stock_uom from `tabItem` {item_conditions}"""\
 			.format(item_conditions=get_item_conditions(filters)), filters, as_dict=1):
 		item_details.setdefault(item.name, item)
-		
+
 	return item_details
-	
+
 def get_item_conditions(filters):
 	conditions = []
 	if filters.get("item_code"):
 		conditions.append("name=%(item_code)s")
 	if filters.get("brand"):
 		conditions.append("brand=%(brand)s")
-	
+
 	return "where {}".format(" and ".join(conditions)) if conditions else ""
-	
+
 def get_sle_conditions(filters):
 	conditions = []
 	item_conditions=get_item_conditions(filters)
 	if item_conditions:
-		conditions.append("""item_code in (select name from tabItem 
+		conditions.append("""item_code in (select name from tabItem
 			{item_conditions})""".format(item_conditions=item_conditions))
 	if filters.get("warehouse"):
 		conditions.append("warehouse=%(warehouse)s")
 	if filters.get("voucher_no"):
 		conditions.append("voucher_no=%(voucher_no)s")
-	
-	return "and {}".format(" and ".join(conditions)) if conditions else ""
\ No newline at end of file
+
+	return "and {}".format(" and ".join(conditions)) if conditions else ""