Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use format_currency only if fieldtype is currency

Browse Source
This commit is contained in:
Nabin Hait 2017-10-05 15:28:43 +05:30
parent f8ad0cbe70
commit 34ad2e6a60
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/hr/report/salary_register/salary_register.html
View File

@ -12,21 +12,21 @@
{% } %}
</tr>
</thead>
<tbody>
<tbody>
{% for(var j=0, k=data.length; j<k; j++) { %}
{%
{%
var row = data[j];
%}
<tr>
{% for(var i=1, l=report.columns.length; i<l; i++) { %}
<td class="text-right">
{% 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] %}
{% } %}
{% } %}
</td>
{% } %}