Merge branch 'staging' into develop

This commit is contained in:
Frappe Bot
2018-12-10 13:08:33 +00:00
25 changed files with 630 additions and 406 deletions

View File

@@ -120,7 +120,7 @@ $.extend(erpnext.utils, {
);
});
}
else {
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>'