Quelques améliorations et traduction sur les rapports bilans recette-dépenses et CA
Ajout d'un cartouche commun Utilisation du style liste_total pour les totaux.
This commit is contained in:
parent
7a31971c32
commit
459e1a60c2
@ -243,7 +243,7 @@ if ($result) {
|
|||||||
} else {
|
} else {
|
||||||
dolibarr_print_error($db);
|
dolibarr_print_error($db);
|
||||||
}
|
}
|
||||||
print '<tr>';
|
print '<tr class="liste_total">';
|
||||||
if ($modecompta == 'CREANCES-DETTES') print '<td colspan="3" align="right">'.price($subtotal_ht).'</td>';
|
if ($modecompta == 'CREANCES-DETTES') print '<td colspan="3" align="right">'.price($subtotal_ht).'</td>';
|
||||||
print '<td colspan="3" align="right">'.price($subtotal_ttc).'</td>';
|
print '<td colspan="3" align="right">'.price($subtotal_ttc).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
@ -306,7 +306,7 @@ if ($result) {
|
|||||||
} else {
|
} else {
|
||||||
dolibarr_print_error($db);
|
dolibarr_print_error($db);
|
||||||
}
|
}
|
||||||
print '<tr>';
|
print '<tr class="liste_total">';
|
||||||
if ($modecompta == 'CREANCES-DETTES') print '<td colspan="3" align="right">'.price($subtotal_ht).'</td>';
|
if ($modecompta == 'CREANCES-DETTES') print '<td colspan="3" align="right">'.price($subtotal_ht).'</td>';
|
||||||
print '<td colspan="3" align="right">'.price($subtotal_ttc).'</td>';
|
print '<td colspan="3" align="right">'.price($subtotal_ttc).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
@ -369,7 +369,7 @@ if ($result) {
|
|||||||
} else {
|
} else {
|
||||||
dolibarr_print_error($db);
|
dolibarr_print_error($db);
|
||||||
}
|
}
|
||||||
print '<tr>';
|
print '<tr class="liste_total">';
|
||||||
if ($modecompta == 'CREANCES-DETTES') print '<td colspan="3" align="right">'.price($subtotal_ht).'</td>';
|
if ($modecompta == 'CREANCES-DETTES') print '<td colspan="3" align="right">'.price($subtotal_ht).'</td>';
|
||||||
print '<td colspan="3" align="right">'.price($subtotal_ttc).'</td>';
|
print '<td colspan="3" align="right">'.price($subtotal_ttc).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
@ -377,11 +377,11 @@ print '</tr>';
|
|||||||
|
|
||||||
// Total
|
// Total
|
||||||
|
|
||||||
print "<tr>";
|
print '<tr>';
|
||||||
print '<td colspan="4"> </td>';
|
print '<td colspan="4"> </td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
print '<tr><td align="right" colspan="2">Résultat</td>';
|
print '<tr class="liste_total"><td align="right" colspan="2">Résultat</td>';
|
||||||
if ($modecompta == 'CREANCES-DETTES') print '<td class="border" align="right">'.price($total_ht).'</td>';
|
if ($modecompta == 'CREANCES-DETTES') print '<td class="border" align="right">'.price($total_ht).'</td>';
|
||||||
print '<td class="border" align="right">'.price($total_ttc).'</td>';
|
print '<td class="border" align="right">'.price($total_ttc).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
@ -393,5 +393,5 @@ print '<br>';
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter("<em>Dernière modification $Date$ révision $Revision$</em>");
|
llxFooter('$Date$ - $Revision$');
|
||||||
?>
|
?>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user