diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php index 2829739fe81..a0c5bd7709d 100644 --- a/htdocs/compta/localtax/index.php +++ b/htdocs/compta/localtax/index.php @@ -87,7 +87,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges'); * @param string $date Date * @return void */ -function pt ($db, $sql, $date) +function pt($db, $sql, $date) { global $conf, $bc,$langs; @@ -104,12 +104,19 @@ function pt ($db, $sql, $date) print ''.$langs->trans("PaidDuringThisPeriod").''; print "\n"; + $totalclaimed = 0; + $totalpaid = 0; $amountclaimed = 0; $amountpaid = 0; + $previousmonth = ''; $previousmode = ''; + $mode = ''; + while ($i < $num) { $obj = $db->fetch_object($result); + $mode = $obj->mode; + //print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode; if ($obj->mode == 'claimed' && ! empty($previousmode)) { print ''; @@ -143,27 +150,29 @@ function pt ($db, $sql, $date) $amountclaimed = 0; $amountpaid = 0; $previousmode = ''; + $previousmonth = ''; } else { $previousmode = $obj->mode; + $previousmonth = $obj->dm; } $i++; } - - if ($obj->mode == 'claimed' && ! empty($previousmode)) + + if ($mode == 'claimed' && ! empty($previousmode)) { print ''; - print ''.$obj->dm."\n"; + print ''.$previousmonth."\n"; print ''.price($amountclaimed)."\n"; print ''.price($amountpaid)."\n"; print "\n"; - + $amountclaimed = 0; $amountpaid = 0; } - + print ''; print ''.$langs->trans("Total").''; print ''.price($totalclaimed).''; diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 528bf7ef09a..7c4912411f6 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -87,7 +87,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges'); * @param string $date Date * @return void */ -function pt ($db, $sql, $date) +function pt($db, $sql, $date) { global $conf, $bc,$langs; @@ -104,6 +104,8 @@ function pt ($db, $sql, $date) print ''.$langs->trans("PaidDuringThisPeriod").''; print "\n"; + $totalclaimed = 0; + $totalpaid = 0; $amountclaimed = 0; $amountpaid = 0; $previousmonth = '';