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

Mises jours mineures

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2003-07-12 10:33:55 +00:00
parent 070c38d6eb
commit 39c7157126
1 changed files with 70 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
htdocs/compta/facture.php3
View File

@ -348,7 +348,11 @@ else
/* *************************************************************************** */ /* *************************************************************************** */
{ {
if ($facid > 0) { if ($facid > 0)
{
$fac = New Facture($db);
$fac->fetch($facid);
$sql = "SELECT s.nom as socnom, s.idp as socidp, f.facnumber, f.amount, f.total, ".$db->pdate("f.datef")." as df, f.paye, f.fk_statut as statut, f.fk_user_author, f.note"; $sql = "SELECT s.nom as socnom, s.idp as socidp, f.facnumber, f.amount, f.total, ".$db->pdate("f.datef")." as df, f.paye, f.fk_statut as statut, f.fk_user_author, f.note";
$sql .= " FROM llx_societe as s,llx_facture as f WHERE f.fk_soc = s.idp AND f.rowid = $facid"; $sql .= " FROM llx_societe as s,llx_facture as f WHERE f.fk_soc = s.idp AND f.rowid = $facid";
@ -400,11 +404,11 @@ else
print "<tr><td>Auteur</td><td colspan=\"3\">$author->fullname</td>"; print "<tr><td>Auteur</td><td colspan=\"3\">$author->fullname</td>";
print '<tr><td>Montant</td>'; print '<tr><td>Montant</td>';
print '<td align="right" colspan="2"><b>'.price($obj->amount).'</b></td>'; print '<td align="right" colspan="2"><b>'.price($fac->total_ht).'</b></td>';
print '<td>euros HT</td></tr>'; print '<td>euros HT</td></tr>';
print '<tr><td>TVA</td><td align="right" colspan="2">'.tva($obj->amount).'</td>'; print '<tr><td>TVA</td><td align="right" colspan="2">'.price($fac->total_tva).'</td>';
print '<td>euros</td></tr>'; print '<td>euros</td></tr>';
print '<tr><td>Total</td><td align="right" colspan="2">'.price($obj->total).'</td>'; print '<tr><td>Total</td><td align="right" colspan="2">'.price($fac->total_ttc).'</td>';
print '<td>euros TTC</td></tr>'; print '<td>euros TTC</td></tr>';
print "</table>"; print "</table>";
@ -854,7 +858,7 @@ else
$sql .= " AND date_format(f.datef, '%Y') = $year"; $sql .= " AND date_format(f.datef, '%Y') = $year";
} }
$sql .= " ORDER BY $sortfield $sortorder "; $sql .= " ORDER BY $sortfield $sortorder, rowid DESC ";
$sql .= $db->plimit($limit + 1,$offset); $sql .= $db->plimit($limit + 1,$offset);
$result = $db->query($sql); $result = $db->query($sql);
@ -875,9 +879,11 @@ else
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print "</TR>\n"; print "</TR>\n";
if ($num > 0) { if ($num > 0)
{
$var=True; $var=True;
while ($i < $num) { while ($i < min($num,$limit))
{
$objp = $db->fetch_object( $i); $objp = $db->fetch_object( $i);
$var=!$var; $var=!$var;
@ -894,7 +900,8 @@ else
print "</a></TD>\n"; print "</a></TD>\n";
print "<TD><a href=\"fiche.php3?socid=$objp->idp\">$objp->nom</a></TD>\n"; print "<TD><a href=\"fiche.php3?socid=$objp->idp\">$objp->nom</a></TD>\n";
if ($objp->df > 0 ) { if ($objp->df > 0 )
{
print "<TD align=\"right\">"; print "<TD align=\"right\">";
$y = strftime("%Y",$objp->df); $y = strftime("%Y",$objp->df);
$m = strftime("%m",$objp->df); $m = strftime("%m",$objp->df);
@ -904,7 +911,9 @@ else
print strftime("%B",$objp->df)."</a>\n"; print strftime("%B",$objp->df)."</a>\n";
print " <a href=\"facture.php3?year=$y\">"; print " <a href=\"facture.php3?year=$y\">";
print strftime("%Y",$objp->df)."</a></TD>\n"; print strftime("%Y",$objp->df)."</a></TD>\n";
} else { }
else
{
print "<TD align=\"right\"><b>!!!</b></TD>\n"; print "<TD align=\"right\"><b>!!!</b></TD>\n";
} }
@ -929,7 +938,9 @@ else
print "</TABLE>"; print "</TABLE>";
$db->free(); $db->free();
} else { }
else
{
print $db->error(); print $db->error();
} }