From 0bcd9efa88dc3bcb7a1fa92f419db9990465aa38 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 18 Jan 2016 12:30:31 +0530 Subject: [PATCH] [fix] value returned by frappe._ will always be unicode --- erpnext/templates/pages/order.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html index 3bd6ad30d0..fae55f3264 100644 --- a/erpnext/templates/pages/order.html +++ b/erpnext/templates/pages/order.html @@ -63,9 +63,8 @@
{{ d.get_formatted("amount") }} - {# output of get_formatted("rate") is unicode, to replace unicode use _("text {0}").decode("utf8").format(val) #}

{{ - _("Rate: {0}").decode("utf8").format(d.get_formatted("rate")) }}

+ _("Rate: {0}").format(d.get_formatted("rate")) }}

{% endfor %} @@ -83,7 +82,7 @@
- {% if (doc.doctype=="Sales Order" and doc.per_billed <= 0) + {% if (doc.doctype=="Sales Order" and doc.per_billed <= 0) or (doc.doctype=="Sales Invoice" and doc.outstanding_amount > 0) %}