diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 55b82d1063c..d900709b835 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -259,52 +259,50 @@ dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
print '
';
-//if (empty($socid))
-//{
- // Show filter box
- print '';
- print '
'; -//} +// Show filter box +print ''; +print '
'; + print '';
print '
'; -//} +// Show filter box +print ''; +print '
'; + print '
| 0?'&userid='.$userid:'').'">'.$oldyear.' | '; - print '0 | '; print ''; print ' | 0 | '; diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php index 02201093830..a244a1feb60 100644 --- a/htdocs/compta/paiement/avalider.php +++ b/htdocs/compta/paiement/avalider.php @@ -38,22 +38,29 @@ if ($user->societe_id > 0) } -/* - * Affichage - */ - -llxHeader(); - -$sortfield = GETPOST("sortfield",'alpha'); -$sortorder = GETPOST("sortorder",'alpha'); -$page = GETPOST("page",'int'); +$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit; +$sortfield = GETPOST('sortfield','alpha'); +$sortorder = GETPOST('sortorder','alpha'); +$page = GETPOST('page','int'); if ($page == -1) { $page = 0; } -$offset = $conf->liste_limit * $page; +$offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; if (! $sortorder) $sortorder="DESC"; if (! $sortfield) $sortfield="p.rowid"; -$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit; + + +/* + * Actions + */ + + + +/* + * View + */ + +llxHeader(); $sql = "SELECT p.rowid, p.datep as dp, p.amount, p.statut"; $sql.=", c.libelle as paiement_type, p.num_paiement"; @@ -70,10 +77,20 @@ if ($socid) $sql.= " AND f.fk_soc = ".$socid; } $sql.= " AND p.statut = 0"; -$sql.= " ORDER BY $sortfield $sortorder"; -$sql.= $db->plimit($limit+1, $offset); -$resql = $db->query($sql); +$sql.= $db->order($sortfield,$sortorder); + +// Count total nb of records +$nbtotalofrecords = ''; +if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) +{ + $result = $db->query($sql); + $nbtotalofrecords = $db->num_rows($result); +} + +$sql.= $db->plimit($limit + 1,$offset); + +$resql = $db->query($sql); if ($resql) { $num = $db->num_rows($resql); diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php index 07b8d95ddbc..7de97eba2e0 100644 --- a/htdocs/compta/paiement/card.php +++ b/htdocs/compta/paiement/card.php @@ -199,11 +199,12 @@ if ($action == 'valide') } -print '|||||||
| '.$langs->trans('Ref').' | '; print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', ''); @@ -280,6 +281,8 @@ if (! empty($conf->banque->enabled)) print ' | ||
| '.$langs->trans('Bill').' | '; print ''.$langs->trans('Company').' | '; @@ -363,6 +373,8 @@ if ($resql) $var=!$var; print "
| '.$langs->trans("DateChequeReceived").' '; print " | \n"; @@ -539,7 +542,8 @@ if ($action == 'new') $i++; } print "
';
if ($user->rights->banque->cheque)
{
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 695afb7562f..8f90183f0f7 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -37,33 +37,57 @@ $socid = GETPOST('socid','int');
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'prelevement','','','bons');
-// Get supervariables
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
$page = GETPOST('page','int');
-$sortorder = ((GETPOST('sortorder','alpha')=="")) ? "DESC" : GETPOST('sortorder','alpha');
-$sortfield = ((GETPOST('sortfield','alpha')=="")) ? "p.datec" : GETPOST('sortfield','alpha');
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="DESC";
+if (! $sortfield) $sortfield="p.datec";
+
+// Get supervariables
$statut = GETPOST('statut','int');
-$search_line = GETPOST('search_ligne','int');
+$search_ref = GETPOST('search_ref','alpha');
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+{
+ $search_ref="";
+}
+
+
+/*
+ * View
+ */
llxHeader('',$langs->trans("WithdrawalsReceipts"));
$bon=new BonPrelevement($db,"");
-if ($page == -1) { $page = 0 ; }
-$offset = $conf->liste_limit * $page ;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-
-
-/*
- * Mode List
- *
- */
$sql = "SELECT p.rowid, p.ref, p.amount, p.statut";
$sql.= ", p.datec";
$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
$sql.= " WHERE p.entity = ".$conf->entity;
-$sql.= " ORDER BY $sortfield $sortorder ";
-$sql.= $db->plimit($conf->liste_limit+1, $offset);
+if ($search_ref) $sql.=natural_search("p.ref", $search_ref);
+
+$sql.= $db->order($sortfield,$sortorder);
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+ $result = $db->query($sql);
+ $nbtotalofrecords = $db->num_rows($result);
+}
+
+$sql.= $db->plimit($limit + 1,$offset);
$result = $db->query($sql);
if ($result)
@@ -73,9 +97,22 @@ if ($result)
$urladd= "&statut=".$statut;
- print_barre_liste($langs->trans("WithdrawalsReceipts"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num);
+ // Lines of title fields
+ print '