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

Fix: affichage correct du nombre total de factures dans le rsum

Browse Source
This commit is contained in:
marc_ocebo 2005-12-05 18:49:35 +00:00
parent da5bbd1dc9
commit aeb020f192
1 changed files with 44 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
htdocs/fourn/fiche.php
View File

@ -256,16 +256,12 @@ if ( $societe->fetch($socid) )
/* /*
* Liste des factures associées * Liste des factures associées
*/ */
$langs->load("bills"); $langs->load('bills');
$max=5; $max=5;
$sql = 'SELECT p.rowid,p.libelle,p.facnumber,p.fk_statut,'.$db->pdate('p.datef').' as df, total_ttc as amount, paye';
$sql = "SELECT p.rowid,p.libelle,p.facnumber,p.fk_statut,".$db->pdate("p.datef")." as df, total_ttc as amount, paye"; $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as p';
$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as p"; $sql.= ' WHERE p.fk_soc = '.$societe->id;
$sql.= " WHERE p.fk_soc = ".$societe->id; $sql.= ' ORDER BY p.datef DESC';
$sql.= " ORDER BY p.datef DESC";
$sql.= " ".$db->plimit($max+1);
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
@ -275,30 +271,29 @@ if ( $societe->fetch($socid) )
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print "<td colspan=\"4\">"; print '<td colspan="4">';
print "<table class=\"noborder\" width=\"100%\"><tr><td>".$langs->trans("LastSuppliersBills",min($num,$max))."</td><td align=\"right\"><a href=\"facture/index.php?socid=$societe->id\">".$langs->trans("AllBills")." (".$num.")</td></tr></table>"; print '<table class="noborder" width="100%"><tr><td>'.$langs->trans('LastSuppliersBills',min($num,$max)).'</td><td align="right"><a href="facture/index.php?socid='.$societe->id.'">'.$langs->trans('AllBills').' ('.$num.')</td></tr></table>';
print "</td></tr>"; print '</td></tr>';
} }
$facturestatic = new FactureFournisseur($db); $facturestatic = new FactureFournisseur($db);
while ($i < min($num,$max)) while ($i < min($num,$max))
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'>';
print "<tr $bc[$var]>";
print '<td>'; print '<td>';
print '<a href="facture/fiche.php?facid='.$obj->rowid.'">'; print '<a href="facture/fiche.php?facid='.$obj->rowid.'">';
print img_object($langs->trans("ShowBill"),"bill")." ".$obj->facnumber.'</a> '.dolibarr_trunc($obj->libelle,14).'</td>'; print img_object($langs->trans('ShowBill'),'bill').' '.$obj->facnumber.'</a> '.dolibarr_trunc($obj->libelle,14).'</td>';
print '<td align="right" width="80">'.dolibarr_print_date($obj->df).'</td>'; print '<td align="right" width="80">'.dolibarr_print_date($obj->df).'</td>';
print '<td align="right">'.price($obj->amount).'</td>'; print '<td align="right">'.price($obj->amount).'</td>';
print '<td align="center">'.$facturestatic->LibStatutShort($obj->paye,$obj->fk_statut).'</td>'; print '<td align="center">'.$facturestatic->LibStatutShort($obj->paye,$obj->fk_statut).'</td>';
print "</tr>"; print '</tr>';
$i++; $i++;
} }
$db->free($resql); $db->free($resql);
if ($num > 0) if ($num > 0)
{ {
print "</table><br>"; print '</table><br>';
} }
} }
else else