Merge branch 'staging-fixes' into permission-fixes

This commit is contained in:
Suraj Shetty
2018-12-18 15:41:03 +05:30
committed by GitHub
118 changed files with 4077 additions and 4213 deletions

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

@@ -103,12 +103,32 @@ $.extend(erpnext, {
$.extend(erpnext.utils, {
set_party_dashboard_indicators: function(frm) {
if(frm.doc.__onload && frm.doc.__onload.dashboard_info) {
var info = frm.doc.__onload.dashboard_info;
frm.dashboard.add_indicator(__('Annual Billing: {0}',
[format_currency(info.billing_this_year, info.currency)]), 'blue');
frm.dashboard.add_indicator(__('Total Unpaid: {0}',
[format_currency(info.total_unpaid, info.currency)]),
info.total_unpaid ? 'orange' : 'green');
var company_wise_info = frm.doc.__onload.dashboard_info;
if(company_wise_info.length > 1) {
frm.dashboard.stats_area.removeClass('hidden');
frm.dashboard.stats_area_row.addClass('flex');
frm.dashboard.stats_area_row.css('flex-wrap', 'wrap');
company_wise_info.forEach(function(info) {
frm.dashboard.stats_area_row.append(
'<div class="flex-column col-xs-6">'+
'<div style="margin-bottom:20px"><h6>'+info.company+'</h6></div>'+
'<div class="badge-link small" style="margin-bottom:10px">Annual Billing: '
+format_currency(info.billing_this_year, info.currency)+'</div>'+
'<div class="badge-link small" style="margin-bottom:20px">Total Unpaid: '
+format_currency(info.total_unpaid, info.currency)+'</div>'+
'</div>'
);
});
}
else if (company_wise_info.length === 1) {
frm.dashboard.stats_area.removeClass('hidden');
frm.dashboard.stats_area_row.append(
'</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].total_unpaid, company_wise_info[0].currency)+'</b></div>'
);
}
}
},