lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3420 from aspangaro/3.7-4

Browse Source 
Fix #3289 Salaries module shows amounts with currency symbol unlike t…
This commit is contained in:
Juanjo Menent 2015-08-28 16:12:36 +02:00
commit a7d1a35a56
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/salaries/index.php
View File

@ -168,7 +168,7 @@ if ($result)
// Type // Type
print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>'; print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
// Amount // Amount
print "<td align=\"right\">".price($obj->amount,0,$outputlangs,1,-1,-1,$conf->currency)."</td>"; print "<td align=\"right\">".price($obj->amount)."</td>";
print "<td>&nbsp;</td>"; print "<td>&nbsp;</td>";
print "</tr>\n"; print "</tr>\n";
@ -177,7 +177,7 @@ if ($result)
$i++; $i++;
} }
print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td>'; print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td>';
print '<td class="liste_total" align="right">'.price($total,0,$outputlangs,1,-1,-1,$conf->currency)."</td>"; print '<td class="liste_total" align="right">'.price($total)."</td>";
print "<td>&nbsp;</td></tr>"; print "<td>&nbsp;</td></tr>";
print "</table>"; print "</table>";