From 5d35dd22dbd645154c999791494918b75a7b43dd Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Wed, 10 Aug 2005 07:26:04 +0000 Subject: [PATCH] Correction bug #14017 --- htdocs/compta/facture/impayees.php | 209 ++++++++++++++--------------- 1 file changed, 104 insertions(+), 105 deletions(-) diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 6afbbd11b5f..78b692e3a78 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -22,10 +22,10 @@ */ /** - \file htdocs/compta/facture.php - \ingroup facture - \brief Page de création d'une facture - \version $Revision$ + \file htdocs/compta/facture.php + \ingroup facture + \brief Page de création d'une facture + \version $Revision$ */ require("./pre.inc.php"); @@ -36,7 +36,7 @@ $user->getrights('facture'); $user->getrights('banque'); if (!$user->rights->facture->lire) -accessforbidden(); + accessforbidden(); $langs->load("main"); // BUG De chargement de traduction ne pas modifier cette ligne $langs->load("bills"); @@ -49,12 +49,12 @@ if ($_GET["socidp"]) { $socidp=$_GET["socidp"]; } // Sécurité accés client if ($user->societe_id > 0) { - $action = ''; - $socidp = $user->societe_id; + $action = ''; + $socidp = $user->societe_id; } -llxHeader('',$langs->trans("UnpayedBills")); +llxHeader('',$langs->trans("BillsCustomersUnpayed")); /*************************************************************************** @@ -67,128 +67,127 @@ $sortfield=$_GET["sortfield"]; $sortorder=$_GET["sortorder"]; if (! $sortfield) $sortfield="f.date_lim_reglement"; if (! $sortorder) $sortorder="ASC"; -if ($page == -1) $page = 0; if ($user->rights->facture->lire) { - $limit = $conf->liste_limit; - $offset = $limit * $page ; - - $sql = "SELECT s.nom,s.idp,f.facnumber,f.increment,f.total,f.total_ttc,"; - $sql.= $db->pdate("f.datef")." as df, ".$db->pdate("f.date_lim_reglement")." as datelimite, "; - $sql.= " f.paye as paye, f.rowid as facid, f.fk_statut, sum(pf.amount) as am"; - $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; - $sql.= ",".MAIN_DB_PREFIX."facture as f"; - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture "; - $sql.= " WHERE f.fk_soc = s.idp"; - $sql.= " AND f.paye = 0 AND f.fk_statut = 1"; - if ($socidp) $sql .= " AND s.idp = $socidp"; - - if ($_GET["filtre"]) + $limit = $conf->liste_limit; + $offset = $limit * $page ; + + $sql = "SELECT s.nom,s.idp,f.facnumber,f.increment,f.total,f.total_ttc,"; + $sql.= $db->pdate("f.datef")." as df, ".$db->pdate("f.date_lim_reglement")." as datelimite, "; + $sql.= " f.paye as paye, f.rowid as facid, f.fk_statut, sum(pf.amount) as am"; + $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; + $sql.= ",".MAIN_DB_PREFIX."facture as f"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture "; + $sql.= " WHERE f.fk_soc = s.idp"; + $sql.= " AND f.paye = 0 AND f.fk_statut = 1"; + if ($socidp) $sql .= " AND s.idp = $socidp"; + + if ($_GET["filtre"]) { - $filtrearr = split(",", $_GET["filtre"]); - foreach ($filtrearr as $fil) + $filtrearr = split(",", $_GET["filtre"]); + foreach ($filtrearr as $fil) { - $filt = split(":", $fil); - $sql .= " AND " . $filt[0] . " = " . $filt[1]; + $filt = split(":", $fil); + $sql .= " AND " . $filt[0] . " = " . $filt[1]; } } - - if ($_GET["search_ref"]) + + if ($_GET["search_ref"]) { - $sql .= " AND f.facnumber like '%".$_GET["search_ref"]."%'"; + $sql .= " AND f.facnumber like '%".$_GET["search_ref"]."%'"; } - - if ($_GET["search_societe"]) + + if ($_GET["search_societe"]) { - $sql .= " AND s.nom like '%".$_GET["search_societe"]."%'"; + $sql .= " AND s.nom like '%".$_GET["search_societe"]."%'"; } - - if ($_GET["search_montant_ht"]) + + if ($_GET["search_montant_ht"]) { - $sql .= " AND f.total = '".$_GET["search_montant_ht"]."'"; + $sql .= " AND f.total = '".$_GET["search_montant_ht"]."'"; } - - if ($_GET["search_montant_ttc"]) + + if ($_GET["search_montant_ttc"]) { - $sql .= " AND f.total_ttc = '".$_GET["search_montant_ttc"]."'"; + $sql .= " AND f.total_ttc = '".$_GET["search_montant_ttc"]."'"; } - - if (strlen($_POST["sf_ref"]) > 0) + + if (strlen($_POST["sf_ref"]) > 0) { - $sql .= " AND f.facnumber like '%".$_POST["sf_ref"] . "%'"; + $sql .= " AND f.facnumber like '%".$_POST["sf_ref"] . "%'"; } - - $sql .= " GROUP BY f.facnumber"; - - $sql .= " ORDER BY "; - $listfield=split(',',$sortfield); - foreach ($listfield as $key => $value) $sql.=$listfield[$key]." ".$sortorder.","; - $sql .= " f.fk_soc ASC"; - - //$sql .= $db->plimit($limit+1,$offset); - - $result = $db->query($sql); - - if ($result) + + $sql .= " GROUP BY f.facnumber"; + + $sql .= " ORDER BY "; + $listfield=split(',',$sortfield); + foreach ($listfield as $key => $value) $sql.=$listfield[$key]." ".$sortorder.","; + $sql .= " f.fk_soc ASC"; + + //$sql .= $db->plimit($limit+1,$offset); + + $result = $db->query($sql); + + if ($result) { - $num = $db->num_rows($result); - - if ($socidp) + $num = $db->num_rows($result); + + if ($socidp) { - $soc = new Societe($db); - $soc->fetch($socidp); + $soc = new Societe($db); + $soc->fetch($socidp); } - - print_barre_liste($langs->trans("BillsCustomersUnpayed")." ".($socidp?" $soc->nom":""),$page,"impayees.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); - $i = 0; - print ''; - print ''; - - print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.facnumber","","&socidp=$socidp","",$sortfield); - print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"f.datef","","&socidp=$socidp",'align="center"',$sortfield); - print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"f.date_lim_reglement","","&socidp=$socidp",'align="center"',$sortfield); - print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&socidp=$socidp","",$sortfield); - print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","","&socidp=$socidp",'align="right"',$sortfield); - print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"f.total_ttc","","&socidp=$socidp",'align="right"',$sortfield); - print_liste_field_titre($langs->trans("Received"),$_SERVER["PHP_SELF"],"am","","&socidp=$socidp",'align="right"',$sortfield); - print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye","","&socidp=$socidp",'align="right"',$sortfield); - print "\n"; - - // Lignes des champs de filtre - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - print ''; - - if ($num > 0) + + print_barre_liste($langs->trans("BillsCustomersUnpayed")." ".($socidp?" $soc->nom":""),$page,"impayees.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); + $i = 0; + print '
'; - print '  '; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print '
'; + print ''; + + print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.facnumber","","&socidp=$socidp","",$sortfield); + print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"f.datef","","&socidp=$socidp",'align="center"',$sortfield); + print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"f.date_lim_reglement","","&socidp=$socidp",'align="center"',$sortfield); + print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&socidp=$socidp","",$sortfield); + print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","","&socidp=$socidp",'align="right"',$sortfield); + print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"f.total_ttc","","&socidp=$socidp",'align="right"',$sortfield); + print_liste_field_titre($langs->trans("Received"),$_SERVER["PHP_SELF"],"am","","&socidp=$socidp",'align="right"',$sortfield); + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye","","&socidp=$socidp",'align="right"',$sortfield); + print "\n"; + + // Lignes des champs de filtre + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print "\n"; + print ''; + + if ($num > 0) { - $var=True; - $total=0; - $totalrecu=0; - - while ($i < $num) + $var=True; + $total=0; + $totalrecu=0; + + while ($i < $num) { - $objp = $db->fetch_object($result); - + $objp = $db->fetch_object($result); + $var=!$var; - + print ""; $class = "impayee"; - + print '
'; + print '  '; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print '
'.img_object($langs->trans("ShowBill"),"bill")." "; print ''.$objp->facnumber.''.$objp->increment; if ($objp->datelimite < (time() - $warning_delay) && ! $objp->paye && $objp->fk_statut == 1 && ! $objp->am) print img_warning($langs->trans("Late"));