nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 13:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into develop

Browse Source
This commit is contained in:
Ameya Shenoy
2018-11-28 08:28:37 +00:00
parent 0090b1aa16 5780e865b7
commit fe1f532bc0
51 changed files with 1344 additions and 1309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/templates/includes/fee/fee_row.html
View File

@@ -5,13 +5,13 @@
{{ doc.program }}
</div>
<div class="col-xs-2">
{{ doc.get_formatted("total_amount") }}
{{ frappe.utils.fmt_money(doc.grand_total, currency=doc.currency) }}
</div>
<div class="col-xs-2">
{{ doc.get_formatted("paid_amount") }}
{{ frappe.utils.fmt_money(doc.paid_amount, currency=doc.currency) }}
</div>
<div class="col-xs-2">
{{ doc.get_formatted("outstanding_amount") }}
{{ frappe.utils.fmt_money(doc.outstanding_amount, currency=doc.currency) }}
</div>
</div>
</a>