From 3f725308e16f92381ec06f861643997b5b970453 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Fri, 22 Mar 2013 14:56:31 +0530
Subject: [PATCH] [website] [number_format] [fix] moved js function & added
 amount to order list

---
 selling/doctype/sales_order/sales_order.py |  2 +-
 website/templates/pages/orders.html        | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/selling/doctype/sales_order/sales_order.py b/selling/doctype/sales_order/sales_order.py
index 67dcb1dd39..6a52e5a0fa 100644
--- a/selling/doctype/sales_order/sales_order.py
+++ b/selling/doctype/sales_order/sales_order.py
@@ -372,7 +372,7 @@ def get_orders():
 			""", customer, as_dict=1)
 		for order in orders:
 			order.items = webnotes.conn.sql("""select 
-				item_name, qty, export_rate, delivered_qty, stock_uom
+				item_name, qty, export_rate, export_amount, delivered_qty, stock_uom
 				from `tabSales Order Item` 
 				where parent=%s 
 				order by idx""", order.name, as_dict=1)
diff --git a/website/templates/pages/orders.html b/website/templates/pages/orders.html
index b1a3c7eb67..3bb7bd4992 100644
--- a/website/templates/pages/orders.html
+++ b/website/templates/pages/orders.html
@@ -44,19 +44,21 @@ $(document).ready(function() {
 				
 				// parent
 				var $order = $(repl('<div class="row">\
-					<div class="span4"><a href="order?name=%(name)s">%(name)s</a></div>\
-					<div class="span8"></div>\
+					<div class="span3"><a href="order?name=%(name)s">%(name)s</a></div>\
+					<div class="span9"></div>\
 				</div>', order)).appendTo($list);
 				
 				// items
 				$.each(order.items || [], function(i, item) {
 					item.export_rate = format_currency(item.export_rate, order.currency);
+					item.export_amount = format_currency(item.export_amount, order.currency);
 					var $item = $(repl('<div class="row">\
-							<div class="span4">%(item_name)s</div>\
-							<div class="span2" style="text-align: right;">%(qty)s %(stock_uom)s</div>\
+							<div class="span3">%(item_name)s</div>\
 							<div class="span2" style="text-align: right;">%(export_rate)s</div>\
+							<div class="span2" style="text-align: right;">%(qty)s %(stock_uom)s</div>\
+							<div class="span2" style="text-align: right;">%(export_amount)s</div>\
 						</div>\
-					</div>', item)).appendTo($order.find(".span8"));
+					</div>', item)).appendTo($order.find(".span9"));
 				});
 				
 				$("<hr>").appendTo($list);