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

Fix: Tri des dernires facture tait l'envers

Browse Source
This commit is contained in:
Laurent Destailleur 2005-10-15 13:52:16 +00:00
parent c3c86a6b9e
commit d1a45ad24d
1 changed files with 106 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

203
htdocs/fourn/fiche.php
View File

@ -19,14 +19,13 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
*
*/ */
/** /**
\file htdocs/fourn/fiche.php \file htdocs/fourn/fiche.php
\ingroup fournisseur, facture \ingroup fournisseur, facture
\brief Page de fiche fournisseur \brief Page de fiche fournisseur
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -193,106 +192,113 @@ if ( $societe->fetch($socid) )
print '</a></td></tr></table><br>'; print '</a></td></tr></table><br>';
} }
/* /*
* * Liste des commandes associées
* Liste des commandes associées */
* $max=4;
*/
$sql = "SELECT p.rowid,p.ref,".$db->pdate("p.date_commande")." as dc, p.fk_statut"; $sql = "SELECT p.rowid,p.ref,".$db->pdate("p.date_commande")." as dc, p.fk_statut";
$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p "; $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p ";
$sql .= " WHERE p.fk_soc =".$societe->id; $sql.= " WHERE p.fk_soc =".$societe->id;
$sql .= " ORDER BY p.rowid DESC LIMIT 4"; $sql.= " ORDER BY p.rowid";
if ( $db->query($sql) ) $sql.= " ".$db->plimit($max);
$resql=$db->query($sql);
if ($resql)
{ {
$i = 0 ; $i = 0 ;
$num = $db->num_rows(); $num = $db->num_rows($resql);
if ($num > 0) if ($num > 0)
{ {
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=\"2\"><a href=\"commande/liste.php?socid=$societe->id\">".$langs->trans("LastOrders",$num)."</td></tr>"; print '<td colspan="3">';
} print '<table class="noborder" width="100%"><tr><td>'.$langs->trans("LastOrders",min($num,$max)).'</td>';
while ($i < $num && $i < 5) print '<td align="right"><a href="commande/liste.php?socid='.$societe->id.'">'.$langs->trans("AllOrders").' ('.$num.')</td></tr></table>';
{ print '</td></tr>';
$obj = $db->fetch_object(); }
$var=!$var; while ($i < $num && $i <= $max)
{
print "<tr $bc[$var]>"; $obj = $db->fetch_object($resql);
print '<td>'; $var=!$var;
print '<img src="commande/statut'.$obj->fk_statut.'.png">&nbsp;';
print '<a href="commande/fiche.php?id='.$obj->rowid.'">'; print "<tr $bc[$var]>";
print $obj->ref.'</a></td>'; print '<td><a href="commande/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowOrder"),"order")." ".$obj->ref.'</a></td>';
print "<td align=\"right\" width=\"100\">"; print '<td align="center" width="80">';
if ($obj->dc) if ($obj->dc)
{ {
print dolibarr_print_date($obj->dc); print dolibarr_print_date($obj->dc);
} }
else else
{ {
print "-"; print "-";
} }
print "</td></tr>"; print '</td>';
$i++; print '<td width="20"><img src="commande/statut'.$obj->fk_statut.'.png"></td>';
} print '</tr>';
$db->free(); $i++;
if ($num > 0) { }
print "</table><br>"; $db->free($resql);
} if ($num > 0)
{
print "</table><br>";
}
} }
else else
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
/* /*
* 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 WHERE p.fk_soc = $societe->id"; $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as p WHERE p.fk_soc = $societe->id";
$sql .= " ORDER BY p.datef"; $sql.= " ORDER BY p.datef DESC";
$resql=$db->query($sql); $sql.= " ".$db->plimit($conf->liste_limit+1, $offset);
if ($resql)
$resql=$db->query($sql);
if ($resql)
{ {
$i = 0 ; $i = 0 ;
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num > 0) if ($num > 0)
{ {
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>";
} }
while ($i < $num && $i < $max)
while ($i < $num && $i < $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">'.$obj->amount.'</td>';
print '<td align="right">'.$obj->amount.'</td>'; $fac = new FactureFournisseur($db);
$fac = new FactureFournisseur($db); print '<td align="center">'.$fac->LibStatut($obj->paye,$obj->fk_statut).'</td>';
print '<td align="center">'.$fac->LibStatut($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
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
/* /*
@ -339,7 +345,10 @@ if ( $societe->fetch($socid) )
print "<td align=\"center\"><a href=\"".DOL_URL_ROOT.'/contact/fiche.php?socid='.$socid."&amp;action=create\">".$langs->trans("AddContact")."</a></td></tr>"; print "<td align=\"center\"><a href=\"".DOL_URL_ROOT.'/contact/fiche.php?socid='.$socid."&amp;action=create\">".$langs->trans("AddContact")."</a></td></tr>";
$sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note"; $sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note";
$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p WHERE p.fk_soc = $societe->id ORDER by p.datec"; $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as p";
$sql.= " WHERE p.fk_soc = ".$societe->id;
$sql.= " ORDER by p.datec";
$result = $db->query($sql); $result = $db->query($sql);
$i = 0 ; $i = 0 ;