From 2b43cd1a9e0843b856f882d35f292d1820b48037 Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Tue, 1 Mar 2005 13:34:13 +0000 Subject: [PATCH] Synchro --- htdocs/compta/prelevement/bons.php | 29 +++++++---------------------- htdocs/compta/prelevement/fiche.php | 4 ++++ 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 61856ee0748..b796ea16319 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -25,7 +25,7 @@ $page = $_GET["page"]; $sortorder = $_GET["sortorder"]; $sortfield = $_GET["sortfield"]; -llxHeader('','Telephonie - Ligne - Liste'); +llxHeader('','Prélèvements - Bons'); /* * Sécurité accés client */ @@ -35,12 +35,8 @@ if ($user->societe_id > 0) $socidp = $user->societe_id; } -if ($sortorder == "") { - $sortorder="DESC"; -} -if ($sortfield == "") { - $sortfield="p.datec"; -} +if ($sortorder == "") $sortorder="DESC"; +if ($sortfield == "") $sortfield="p.datec"; /* * Recherche @@ -61,13 +57,8 @@ $pagenext = $page + 1; * */ $sql = "SELECT p.rowid, p.ref, p.amount,".$db->pdate("p.datec")." as datec"; -$sql .= " FROM ".MAIN_DB_PREFIX."prelevement as p"; - -if ($_GET["search_client"]) -{ - $sel =urldecode($_GET["search_client"]); - $sql .= " AND s.nom LIKE '%".$sel."%'"; -} +$sql .= ", p.statut"; +$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset); @@ -79,7 +70,7 @@ if ($result) $urladd= "&statut=".$_GET["statut"]; - print_barre_liste("Prélèvements", $page, "bons.php", $urladd, $sortfield, $sortorder, '', $num); + print_barre_liste("Bons de prélèvements", $page, "bons.php", $urladd, $sortfield, $sortorder, '', $num); print"\n\n"; print ''; print ''; @@ -95,12 +86,9 @@ if ($result) print ''; print ''; print ''; - - print ''; print ''; - $var=True; while ($i < min($num,$conf->liste_limit)) @@ -109,10 +97,7 @@ if ($result) $var=!$var; print "\n"; diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php index 68b86046eef..2d4e3ac9479 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/fiche.php @@ -77,6 +77,10 @@ $head[$h][1] = $langs->trans("Card"); $hselected = $h; $h++; +$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/lignes.php?id='.$_GET["id"]; +$head[$h][1] = $langs->trans("Lignes"); +$h++; + $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/factures.php?id='.$_GET["id"]; $head[$h][1] = $langs->trans("Bills"); $h++;
 
"; - - print ''; - print img_file(); - print ' '; + print ' '; print ''.$obj->ref."