Merge branch 'staging' into develop

This commit is contained in:
Frappe Bot
2018-12-21 05:46:23 +00:00
25 changed files with 733 additions and 580 deletions

2
erpnext/public/js/utils.js Normal file → Executable file
View File

@@ -126,7 +126,7 @@ $.extend(erpnext.utils, {
'</div><div class="col-xs-6 small" style="margin-bottom:10px">Annual Billing: <b>'
+format_currency(company_wise_info[0].billing_this_year, company_wise_info[0].currency)+'</b></div>' +
'<div class="col-xs-6 small" style="margin-bottom:10px">Total Unpaid: <b>'
+format_currency(company_wise_info[0].billing_this_year, company_wise_info[0].currency)+'</b></div>'
+format_currency(company_wise_info[0].total_unpaid, company_wise_info[0].currency)+'</b></div>'
);
}
}