Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] value returned by frappe._ will always be unicode

Browse Source
This commit is contained in:
Anand Doshi 2016-01-18 12:30:31 +05:30
parent b46069d44b
commit 0bcd9efa88
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/templates/pages/order.html
View File

@ -63,9 +63,8 @@
</div> </div>
<div class="col-sm-2 col-xs-3 text-right"> <div class="col-sm-2 col-xs-3 text-right">
{{ d.get_formatted("amount") }} {{ d.get_formatted("amount") }}
{# output of get_formatted("rate") is unicode, to replace unicode use _("text {0}").decode("utf8").format(val) #}
<p class="text-muted small">{{ <p class="text-muted small">{{
_("Rate: {0}").decode("utf8").format(d.get_formatted("rate")) }}</p> _("Rate: {0}").format(d.get_formatted("rate")) }}</p>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
@ -83,7 +82,7 @@
<div class="cart-taxes row small"> <div class="cart-taxes row small">
<div class="col-sm-8"><!-- empty --></div> <div class="col-sm-8"><!-- empty --></div>
<div class="col-sm-4"> <div class="col-sm-4">
{% 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) %} or (doc.doctype=="Sales Invoice" and doc.outstanding_amount > 0) %}
<div class="page-header-actions-block" data-html-block="header-actions"> <div class="page-header-actions-block" data-html-block="header-actions">
<p> <p>