diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 7a652631d676fa31f49e384573242b169b080d6a..df24b195b7fba997b27ddcf3eda102524b75949e 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -210,6 +210,15 @@ if ($search_user > 0) $sql.= ' ORDER BY '.$sortfield.' '.$sortorder.', p.ref DESC'; + +$nbtotalofrecords = 0; +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); @@ -236,7 +245,7 @@ if ($result) if ($search_montant_ht) $param.='&search_montant_ht='.$search_montant_ht; if ($search_author) $param.='&search_author='.$search_author; if ($search_town) $param.='&search_town='.$search_town; - print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); // Lignes des champs de filtre print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">'; diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index c4a416f1898a9bbf4b17a46a1081b5de5507f1c0..2e96a5451d48fbd77462d426c308b9adfe6d1841 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -200,6 +200,15 @@ if ($search_user > 0) } $sql.= ' ORDER BY '.$sortfield.' '.$sortorder; + +$nbtotalofrecords = 0; +if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) +{ + $result = $db->query($sql); + $nbtotalofrecords = $db->num_rows($result); +} + + $sql.= $db->plimit($limit + 1,$offset); //print $sql; @@ -245,7 +254,7 @@ if ($resql) if ($search_sale > 0) $param.='&search_sale='.$search_sale; $num = $db->num_rows($resql); - print_barre_liste($title, $page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num); + print_barre_liste($title, $page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); $i = 0; // Lignes des champs de filtre diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 42d08c3b02cb35cd1a961112b9899251e121dd49..12d2f0f032b012e8a43e5bb682021b9347f68538 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -231,6 +231,15 @@ $sql.= ' ORDER BY '; $listfield=explode(',',$sortfield); foreach ($listfield as $key => $value) $sql.= $listfield[$key].' '.$sortorder.','; $sql.= ' f.rowid DESC '; + +$nbtotalofrecords = 0; +if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) +{ + $result = $db->query($sql); + $nbtotalofrecords = $db->num_rows($result); +} + + $sql.= $db->plimit($limit+1,$offset); //print $sql; @@ -255,7 +264,7 @@ if ($resql) if ($search_user > 0) $param.='&search_user=' .$search_user; if ($search_montant_ht) $param.='&search_montant_ht='.$search_montant_ht; if ($search_montant_ttc) $param.='&search_montant_ttc='.$search_montant_ttc; - print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->nom:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->nom:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); $i = 0; print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">'."\n"; diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/liste.php index d6c4bb9427dde64fb327ccd47f49aaf46b445e03..ef6e839dd09cf983e2ac785d6b6b7c7f424a950e 100644 --- a/htdocs/fourn/commande/liste.php +++ b/htdocs/fourn/commande/liste.php @@ -119,6 +119,16 @@ if (GETPOST('statut')) } $sql.= " ORDER BY $sortfield $sortorder "; + +$nbtotalofrecords = 0; +if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) +{ + $result = $db->query($sql); + $nbtotalofrecords = $db->num_rows($result); +} + + + $sql.= $db->plimit($conf->liste_limit+1, $offset); $resql = $db->query($sql); @@ -133,7 +143,7 @@ if ($resql) if ($search_nom) $param.="&search_nom=".$search_nom; if ($search_user) $param.="&search_user=".$search_user; if ($search_ttc) $param.="&search_ttc=".$search_ttc; - print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num); + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num,$nbtotalofrecords); print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'; print '<table class="noborder" width="100%">'; print '<tr class="liste_titre">'; diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index dd8d778d63a8d06991221ec894af3b5f307488bd..4b3b375a047897e734bb829a358b8fc02eea1daf 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -169,6 +169,14 @@ if (GETPOST("search_montant_ttc")) $sql .= " AND fac.total_ttc = '".$db->escape(price2num(GETPOST("search_montant_ttc")))."'"; } +$nbtotalofrecords = 0; +if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) +{ + $result = $db->query($sql); + $nbtotalofrecords = $db->num_rows($result); +} + + $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit+1, $offset); @@ -193,7 +201,7 @@ if ($resql) if (GETPOST("search_montant_ht")) $param.='&search_montant_ht='.urlencode(GETPOST("search_montant_ht")); if (GETPOST("search_montant_ttc")) $param.='&search_montant_ttc='.urlencode(GETPOST("search_montant_ttc")); - print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->nom":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->nom":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">'; print '<table class="liste" width="100%">'; print '<tr class="liste_titre">'; diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index 283305860705dc5c8eaaaf11aef60185109b2536..e5dbd9ba3c3b1f12a0a61319efb230ca6631db07 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -189,6 +189,14 @@ else $sql.= " p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte"; $sql .= ', p.desiredstock'; //if (GETPOST("toolowstock")) $sql.= " HAVING SUM(s.reel) < p.seuil_stock_alerte"; // Not used yet + + $nbtotalofrecords = 0; + if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) + { + $result = $db->query($sql); + $nbtotalofrecords = $db->num_rows($result); + } + $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit + 1, $offset); @@ -229,7 +237,8 @@ else $param.=($fourn_id?"&fourn_id=".$fourn_id:""); $param.=($search_categ?"&search_categ=".$search_categ:""); $param.=isset($type)?"&type=".$type:""; - print_barre_liste($texte, $page, "liste.php", $param, $sortfield, $sortorder,'',$num); + + print_barre_liste($texte, $page, "liste.php", $param, $sortfield, $sortorder,'',$num ,$nbtotalofrecords); if (! empty($catid)) { @@ -501,7 +510,7 @@ else $param.=($fourn_id?"&fourn_id=".$fourn_id:""); $param.=($search_categ?"&search_categ=".$search_categ:""); $param.=isset($type)?"&type=".$type:""; - print_barre_liste('', $page, "liste.php", $param, $sortfield, $sortorder,'',$num); + print_barre_liste('', $page, "liste.php", $param, $sortfield, $sortorder,'',$num,$nbtotalofrecords); $db->free($resql);