diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 1e7af4b1f1d..fea0d14f3c2 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -179,13 +179,13 @@ if (is_array($coll_list)) $i = 1; foreach($coll_list as $coll) { - if($min == 0 or ($min>0 and $coll[2]>$min)) + if($min == 0 or ($min > 0 && $coll->amount > $min)) { $var=!$var; - $intra = str_replace($find,$replace,$coll[1]); + $intra = str_replace($find,$replace,$coll->tva_intra); if(empty($intra)) { - if($coll[4] == '1') + if($coll->assuj == '1') { $intra = $langs->trans('Unknown'); } @@ -196,15 +196,15 @@ if (is_array($coll_list)) } print ""; print "".$i.""; - $company_static->id=$coll[5]; - $company_static->nom=$coll[0]; + $company_static->id=$coll->socid; + $company_static->nom=$coll->nom; print ''.$company_static->getNomUrl(1).''; $find = array(' ','.'); $replace = array('',''); print "".$intra.""; - print "".price($coll[2]).""; - print "".price($coll[3]).""; - $total = $total + $coll[3]; + print "".price($coll->amount).""; + print "".price($coll->tva).""; + $total = $total + $coll->tva; print "\n"; $i++; } @@ -251,13 +251,13 @@ if (is_array($coll_list)) $i = 1; foreach($coll_list as $coll) { - if($min == 0 or ($min>0 and $coll[2]>$min)) + if($min == 0 or ($min > 0 && $coll->amount > $min)) { $var=!$var; - $intra = str_replace($find,$replace,$coll[1]); + $intra = str_replace($find,$replace,$coll->tva_intra); if(empty($intra)) { - if($coll[4] == '1') + if($coll->assuj == '1') { $intra = $langs->trans('Unknown'); } @@ -268,15 +268,15 @@ if (is_array($coll_list)) } print ""; print "".$i.""; - $company_static->id=$coll[5]; - $company_static->nom=$coll[0]; + $company_static->id=$coll->socid; + $company_static->nom=$coll->nom; print ''.$company_static->getNomUrl(1).''; $find = array(' ','.'); $replace = array('',''); print "".$intra.""; - print "".price($coll[2]).""; - print "".price($coll[3]).""; - $total = $total + $coll[3]; + print "".price($coll->amount).""; + print "".price($coll->tva).""; + $total = $total + $coll->tva; print "\n"; $i++; } diff --git a/htdocs/lib/tax.lib.php b/htdocs/lib/tax.lib.php index c5e68e03d8e..8104025baeb 100644 --- a/htdocs/lib/tax.lib.php +++ b/htdocs/lib/tax.lib.php @@ -148,7 +148,7 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction $resql = $db->query($sql); if ($resql) { - while($assoc = $db->fetch_array($resql)) + while($assoc = $db->fetch_object($resql)) { $list[] = $assoc; }