diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 3072dcdee2b..1596721667e 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -323,6 +323,9 @@ if ($modecompta == 'BOOKKEEPING')
print '
| '.$langs->trans("NoRecordFound").' |
';
}
} else dol_print_error($db);
+
+ $total_ht_income += $total_ht;
+ $total_ttc_income += $total_ttc;
} else {
/*
* Factures clients
@@ -446,6 +449,7 @@ if ($modecompta == 'BOOKKEEPING')
$total_ht_income += $total_ht;
$total_ttc_income += $total_ttc;
+
print '';
if ($modecompta == 'CREANCES-DETTES')
print '| '.price($total_ht).' | ';
@@ -525,11 +529,12 @@ if ($modecompta == 'BOOKKEEPING')
$total_ht_income += $subtotal_ht;
$total_ttc_income += $subtotal_ttc;
+
print '
';
if ($modecompta == 'CREANCES-DETTES')
print '| '.price($subtotal_ht).' | ';
- print ''.price($subtotal_ttc).' | ';
- print '
';
+ print ''.price($subtotal_ttc).' | ';
+ print '';
}
/*
@@ -609,6 +614,7 @@ if ($modecompta == 'BOOKKEEPING')
$total_ht_outcome += $subtotal_ht;
$total_ttc_outcome += $subtotal_ttc;
+
print '';
if ($modecompta == 'CREANCES-DETTES')
print '| '.price(-$subtotal_ht).' | ';
@@ -686,6 +692,7 @@ if ($modecompta == 'BOOKKEEPING')
$total_ht_outcome += $subtotal_ht;
$total_ttc_outcome += $subtotal_ttc;
+
print '
';
if ($modecompta == 'CREANCES-DETTES')
print '| '.price(-$subtotal_ht).' | ';
@@ -764,6 +771,7 @@ if ($modecompta == 'BOOKKEEPING')
$total_ht_outcome += $subtotal_ht;
$total_ttc_outcome += $subtotal_ttc;
+
print '
';
if ($modecompta == 'CREANCES-DETTES')
print '| '.price(-$subtotal_ht).' | ';
@@ -841,6 +849,7 @@ if ($modecompta == 'BOOKKEEPING')
$total_ht_outcome += $subtotal_ht;
$total_ttc_outcome += $subtotal_ttc;
+
print '
';
if ($modecompta == 'CREANCES-DETTES')
print '| '.price(-$subtotal_ht).' | ';
@@ -926,6 +935,7 @@ if ($modecompta == 'BOOKKEEPING')
$total_ht_outcome += $subtotal_ht;
$total_ttc_outcome += $subtotal_ttc;
+
print '
';
if ($modecompta == 'CREANCES-DETTES') print '| '.price(-$subtotal_ht).' | ';
print ''.price(-$subtotal_ttc).' | ';
@@ -963,6 +973,7 @@ if ($modecompta == 'BOOKKEEPING')
{
$subtotal_ht += -$obj->amount;
$subtotal_ttc += -$obj->amount;
+
$total_ht_outcome += $obj->amount;
$total_ttc_outcome += $obj->amount;
}
@@ -978,6 +989,7 @@ if ($modecompta == 'BOOKKEEPING')
{
$subtotal_ht += $obj->amount;
$subtotal_ttc += $obj->amount;
+
$total_ht_income += $obj->amount;
$total_ttc_income += $obj->amount;
}
@@ -1038,8 +1050,10 @@ if ($modecompta == 'BOOKKEEPING')
}
$total_ht += $subtotal_ht;
$total_ttc += $subtotal_ttc;
+
$total_ht_income += $subtotal_ht;
$total_ttc_income += $subtotal_ttc;
+
print '
';
if ($modecompta == 'CREANCES-DETTES')
print '| '.price($subtotal_ht).' | ';
@@ -1101,8 +1115,10 @@ if ($modecompta == 'BOOKKEEPING')
} else {
dol_print_error($db);
}
+
$total_ht_outcome -= 0;
$total_ttc_outcome -= $amount;
+
print '
| | ';
print "".$langs->trans("VATToPay")." | \n";
print ' | '."\n";
@@ -1151,6 +1167,7 @@ if ($modecompta == 'BOOKKEEPING')
} else {
dol_print_error($db);
}
+
$total_ht_income += 0;
$total_ttc_income += $amount;
@@ -1197,8 +1214,10 @@ if ($modecompta == 'BOOKKEEPING')
} else {
dol_print_error($db);
}
+
$total_ht_outcome -= 0;
$total_ttc_outcome -= $amount;
+
print '
| | ';
print "".$langs->trans("VATPaid")." | \n";
if ($modecompta == 'CREANCES-DETTES')
@@ -1243,8 +1262,10 @@ if ($modecompta == 'BOOKKEEPING')
} else {
dol_print_error($db);
}
+
$total_ht_income += 0;
$total_ttc_income += $amount;
+
print '
| | ';
print "".$langs->trans("VATCollected")." | \n";
if ($modecompta == 'CREANCES-DETTES')