lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: pgsql compatibility

Browse Source
This commit is contained in:
Laurent Destailleur 2011-03-09 10:31:38 +00:00
parent fabca5db8c
commit 2984326b0b
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/compta/tva/clients.php
View File

@ -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 "<tr $bc[$var]>";
print "<td nowrap>".$i."</td>";
$company_static->id=$coll[5];
$company_static->nom=$coll[0];
$company_static->id=$coll->socid;
$company_static->nom=$coll->nom;
print '<td nowrap>'.$company_static->getNomUrl(1).'</td>';
$find = array(' ','.');
$replace = array('','');
print "<td nowrap>".$intra."</td>";
print "<td nowrap align=\"right\">".price($coll[2])."</td>";
print "<td nowrap align=\"right\">".price($coll[3])."</td>";
$total = $total + $coll[3];
print "<td nowrap align=\"right\">".price($coll->amount)."</td>";
print "<td nowrap align=\"right\">".price($coll->tva)."</td>";
$total = $total + $coll->tva;
print "</tr>\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 "<tr $bc[$var]>";
print "<td nowrap>".$i."</td>";
$company_static->id=$coll[5];
$company_static->nom=$coll[0];
$company_static->id=$coll->socid;
$company_static->nom=$coll->nom;
print '<td nowrap>'.$company_static->getNomUrl(1).'</td>';
$find = array(' ','.');
$replace = array('','');
print "<td nowrap>".$intra."</td>";
print "<td nowrap align=\"right\">".price($coll[2])."</td>";
print "<td nowrap align=\"right\">".price($coll[3])."</td>";
$total = $total + $coll[3];
print "<td nowrap align=\"right\">".price($coll->amount)."</td>";
print "<td nowrap align=\"right\">".price($coll->tva)."</td>";
$total = $total + $coll->tva;
print "</tr>\n";
$i++;
}

2
htdocs/lib/tax.lib.php
View File

@ -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;
}