[website] [number_format] [fix] moved js function & added amount to order list
diff --git a/selling/doctype/sales_order/sales_order.py b/selling/doctype/sales_order/sales_order.py
index 67dcb1d..6a52e5a 100644
--- a/selling/doctype/sales_order/sales_order.py
+++ b/selling/doctype/sales_order/sales_order.py
@@ -372,7 +372,7 @@
""", 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 b1a3c7e..3bb7bd4 100644
--- a/website/templates/pages/orders.html
+++ b/website/templates/pages/orders.html
@@ -44,19 +44,21 @@
// 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);