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

[fix] Shipment in portal. Fixes #4291

Browse Source
This commit is contained in:
Anand Doshi 2015-11-26 18:22:03 +05:30
parent f942d97a18
commit 4b12740e8d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hooks.py
View File

@ -64,7 +64,7 @@ website_route_rules = [
{"from_route": "/shipments", "to_route": "Delivery Note"}, {"from_route": "/shipments", "to_route": "Delivery Note"},
{"from_route": "/shipments/<path:name>", "to_route": "order", {"from_route": "/shipments/<path:name>", "to_route": "order",
"defaults": { "defaults": {
"doctype": "Delivery Notes", "doctype": "Delivery Note",
"parents": [{"title": _("Shipments"), "name": "shipments"}] "parents": [{"title": _("Shipments"), "name": "shipments"}]
} }
} }

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

@ -46,15 +46,14 @@
</div> </div>
<div class="col-sm-2 col-xs-3 text-right"> <div class="col-sm-2 col-xs-3 text-right">
{{ d.qty }} {{ d.qty }}
{% if d.delivered_qty != None %} {% if d.delivered_qty is defined and d.delivered_qty != None %}
<p class="text-muted small">{{ <p class="text-muted small">{{
_("Delivered: {0}").format(d.delivered_qty) }}</p> _("Delivered: {0}").format(d.delivered_qty) }}</p>
{% endif %} {% endif %}
</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 {# output of get_formatted("rate") is unicode, to replace unicode use _("text {0}").decode("utf8").format(val) #}
_("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}").decode("utf8").format(d.get_formatted("rate")) }}</p>
</div> </div>