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

Merge pull request #16470 from netchampfaris/fix-jinja-unicode-formatting

Browse Source 
fix: Don't use .format in jinja templates
This commit is contained in:
Nabin Hait 2019-01-25 09:57:37 +05:30 committed by GitHub
commit 05f1c0e1b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/templates/includes/cart/cart_items.html
View File

@ -21,12 +21,11 @@
+</button>
</span>
</div>
</span>
</span>
</div>
<div class="col-sm-2 col-xs-3 text-right col-amount">
{{ d.get_formatted("amount") }}
<p class="text-muted small item-rate">{{
_("Rate: {0}").format(d.get_formatted("rate")) }}</p>
<p class="text-muted small item-rate">{{ _("Rate") }}&nbsp;{{ d.get_formatted("rate") }}</p>
</div>
</div>
{% endfor %}

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

@ -73,14 +73,12 @@
<div class="col-sm-3 col-xs-3 text-right">
{{ d.qty }}
{% if d.delivered_qty is defined and d.delivered_qty != None %}
<p class="text-muted small">{{
_("Delivered: {0}").format(d.delivered_qty) }}</p>
<p class="text-muted small">{{ _("Delivered") }}&nbsp;{{ d.delivered_qty }}</p>
{% endif %}
</div>
<div class="col-sm-3 col-xs-3 text-right">
{{ d.get_formatted("amount") }}
<p class="text-muted small">{{
_("@ {0}").format(d.get_formatted("rate")) }}</p>
<p class="text-muted small">{{ _("Rate:") }}&nbsp;{{ d.get_formatted("rate") }}</p>
</div>
</div>
{% endfor %}