diff --git a/erpnext/hr/report/salary_register/salary_register.html b/erpnext/hr/report/salary_register/salary_register.html index 6c372b75012..4c7e1d1d3af 100644 --- a/erpnext/hr/report/salary_register/salary_register.html +++ b/erpnext/hr/report/salary_register/salary_register.html @@ -12,21 +12,21 @@ {% } %} - + {% for(var j=0, k=data.length; j {% for(var i=1, l=report.columns.length; i {% var fieldname = report.columns[i].field; %} - {% if (!isNaN(row[fieldname])) { %} - {%= format_currency(row[fieldname]) %} - {% } else { %} - {% if (!is_null(row[fieldname])) { %} - {%= row[fieldname] %} - {% } %} + {% if (report.columns[i].fieldtype=='Currency' && !isNaN(row[fieldname])) { %} + {%= format_currency(row[fieldname]) %} + {% } else { %} + {% if (!is_null(row[fieldname])) { %} + {%= row[fieldname] %} + {% } %} {% } %} {% } %}