diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php index c62034ee65c..0c96f728fd6 100644 --- a/htdocs/compta/localtax/index.php +++ b/htdocs/compta/localtax/index.php @@ -120,7 +120,7 @@ function pt($db, $sql, $date) if ($obj->mode == 'claimed' && ! empty($previousmode)) { print ''; - print ''.$obj->dm."\n"; + print ''.$previousmonth."\n"; print ''.price($amountclaimed)."\n"; print ''.price($amountpaid)."\n"; print "\n"; @@ -270,7 +270,7 @@ $mend = $tmp['mon']; $total=0; $subtotalcoll=0; $subtotalpaye=0; $subtotal=0; $i=0; $mcursor=0; -while ((($y < $yend) || ($y == $yend && $m < $mend)) && $mcursor < 1000) // $mcursor is to avoid too large loop +while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) // $mcursor is to avoid too large loop { //$m = $conf->global->SOCIETE_FISCAL_MONTH_START + ($mcursor % 12); if ($m == 13) $y++; @@ -535,7 +535,7 @@ while ((($y < $yend) || ($y == $yend && $m < $mend)) && $mcursor < 1000) // $mcu if ($i > 2) { print ''; - print ''.$langs->trans("SubTotal").':'; + print ''.$langs->trans("SubTotal").':'; print ''.price(price2num($subtotalcoll,'MT')).''; print ''.price(price2num($subtotalpaye,'MT')).''; print ''.price(price2num($subtotal,'MT')).''; diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 5c346ca9ced..6b0c2875d42 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -504,7 +504,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) // $mc if ($i > 2) { print ''; - print ''.$langs->trans("SubTotal").':'; + print ''.$langs->trans("SubTotal").':'; print ''.price(price2num($subtotalcoll,'MT')).''; print ''.price(price2num($subtotalpaye,'MT')).''; print ''.price(price2num($subtotal,'MT')).'';