diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index 08c4197ef2a..4e825469b14 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -103,26 +103,66 @@ function pt ($db, $sql, $date)
print '| '.$langs->trans("PaidDuringThisPeriod").' | ';
print "\n";
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ $previousmode = '';
while ($i < $num) {
$obj = $db->fetch_object($result);
- print '';
- print '| '.$obj->dm." | \n";
+ if ($obj->mode == 'claimed' && ! empty($previousmode))
+ {
+ print '
';
+ print '| '.$obj->dm." | \n";
+ print ''.price($amountclaimed)." | \n";
+ print ''.price($amountpaid)." | \n";
+ print "
\n";
- $amountclaimed = 0;
- $amountpaid = 0;
- if ($obj->mode == 'claimed') $amountclaimed = $obj->mm;
- if ($obj->mode == 'paid') $amountpaid = $obj->mm;
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ }
- $totalclaimed = $totalclaimed + $amountclaimed;
- $totalpaid = $totalpaid + $amountpaied;
+ if ($obj->mode == 'claimed')
+ {
+ $amountclaimed = $obj->mm;
+ $totalclaimed = $totalclaimed + $amountclaimed;
+ }
+ if ($obj->mode == 'paid')
+ {
+ $amountpaid = $obj->mm;
+ $totalpaid = $totalpaid + $amountpaied;
+ }
- print ''.price($amountclaimed)." | \n";
- print ''.price($amountpaid)." | \n";
- print "\n";
+ if ($obj->mode == 'paid')
+ {
+ print '';
+ print '| '.$obj->dm." | \n";
+ print ''.price($amountclaimed)." | \n";
+ print ''.price($amountpaid)." | \n";
+ print "
\n";
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ $previousmode = '';
+ }
+ else
+ {
+ $previousmode = $obj->mode;
+ }
$i++;
}
+
+ if ($obj->mode == 'claimed' && ! empty($previousmode))
+ {
+ print '';
+ print '| '.$obj->dm." | \n";
+ print ''.price($amountclaimed)." | \n";
+ print ''.price($amountpaid)." | \n";
+ print "
\n";
+
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ }
+
print '';
print '| '.$langs->trans("Total").' | ';
print ''.price($totalclaimed).' | ';
@@ -529,7 +569,8 @@ $sql.= " AND (f.datep >= '".$db->idate($date_start)."' AND f.datep <= '".$db->id
$sql.= " AND localtaxtype=".$localTaxType;
$sql.= " GROUP BY dm";
-$sql.= " ORDER BY dm ASC";
+$sql.= " ORDER BY dm ASC, mode ASC";
+//print $sql;
pt($db, $sql, $langs->trans("Month"));
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index 6a6d7e3a93b..6668e3d61db 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -51,10 +51,10 @@ if ($user->rights->tax->charges->creer)
print load_fiche_titre($langs->transcountry($ltt==2?"LT2Payments":"LT1Payments",$mysoc->country_code), $newcardbutton);
-$sql = "SELECT rowid, amount, label, f.datev as dm";
+$sql = "SELECT rowid, amount, label, f.datev, f.datep";
$sql.= " FROM ".MAIN_DB_PREFIX."localtax as f ";
$sql.= " WHERE f.entity = ".$conf->entity." AND localtaxtype=".$db->escape($ltt);
-$sql.= " ORDER BY dm DESC";
+$sql.= " ORDER BY datev DESC";
$result = $db->query($sql);
if ($result)
@@ -67,6 +67,7 @@ if ($result)
print '
';
print '| '.$langs->trans("Ref").' | ';
print "".$langs->trans("Label")." | ";
+ print "".$langs->trans("PeriodEndDate")." | ";
print ''.$langs->trans("DatePayment").' | ';
print "".$langs->trans("PayedByThisPayment")." | ";
print "
\n";
@@ -81,7 +82,8 @@ if ($result)
$localtax_static->ref=$obj->rowid;
print "".$localtax_static->getNomUrl(1)." | \n";
print "".dol_trunc($obj->label,40)." | \n";
- print ''.dol_print_date($db->jdate($obj->dm),'day')." | \n";
+ print ''.dol_print_date($db->jdate($obj->datev),'day')." | \n";
+ print ''.dol_print_date($db->jdate($obj->datep),'day')." | \n";
$total = $total + $obj->amount;
print "".price($obj->amount)." | ";
@@ -89,8 +91,8 @@ if ($result)
$i++;
}
- print '| '.$langs->trans("Total").' | ';
- print "".price($total)." |
";
+ print '| '.$langs->trans("Total").' | ';
+ print ''.price($total).' |
';
print "";
$db->free($result);
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 425dae6853c..673e697da43 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -103,26 +103,66 @@ function pt ($db, $sql, $date)
print ''.$langs->trans("PaidDuringThisPeriod").' | ';
print "\n";
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ $previousmode = '';
while ($i < $num) {
$obj = $db->fetch_object($result);
- print '';
- print '| '.$obj->dm." | \n";
+ if ($obj->mode == 'claimed' && ! empty($previousmode))
+ {
+ print '
';
+ print '| '.$obj->dm." | \n";
+ print ''.price($amountclaimed)." | \n";
+ print ''.price($amountpaid)." | \n";
+ print "
\n";
- $amountclaimed = 0;
- $amountpaid = 0;
- if ($obj->mode == 'claimed') $amountclaimed = $obj->mm;
- if ($obj->mode == 'paid') $amountpaid = $obj->mm;
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ }
- $totalclaimed = $totalclaimed + $amountclaimed;
- $totalpaid = $totalpaid + $amountpaied;
+ if ($obj->mode == 'claimed')
+ {
+ $amountclaimed = $obj->mm;
+ $totalclaimed = $totalclaimed + $amountclaimed;
+ }
+ if ($obj->mode == 'paid')
+ {
+ $amountpaid = $obj->mm;
+ $totalpaid = $totalpaid + $amountpaied;
+ }
- print ''.price($amountclaimed)." | \n";
- print ''.price($amountpaid)." | \n";
- print "\n";
+ if ($obj->mode == 'paid')
+ {
+ print '';
+ print '| '.$obj->dm." | \n";
+ print ''.price($amountclaimed)." | \n";
+ print ''.price($amountpaid)." | \n";
+ print "
\n";
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ $previousmode = '';
+ }
+ else
+ {
+ $previousmode = $obj->mode;
+ }
$i++;
}
+
+ if ($obj->mode == 'claimed' && ! empty($previousmode))
+ {
+ print '';
+ print '| '.$obj->dm." | \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/list.php b/htdocs/compta/tva/list.php
index 48356972e69..efe436a3704 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -173,7 +173,7 @@ if ($result)
print ' | ';
print ' | ';
print ' | ';
- print '';
+ print ' | ';
print '';
$syear = $year;
$formother->select_year($syear?$syear:-1,'year',1, 20, 5);
@@ -266,7 +266,7 @@ if ($result)
$colspan=5;
if (! empty($conf->banque->enabled)) $colspan++;
print ' |
| '.$langs->trans("Total").' | ';
- print "".price($total)." | ";
+ print ''.price($total).' | ';
print " |
";
print "";