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

Merge pull request #2849 from aspangaro/develop-ER_listlimit

Browse Source 
Fix: ER list don't respect $conf->liste_limit
This commit is contained in:
Laurent Destailleur 2015-05-20 15:26:34 +02:00
commit 0f89164f4f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/expensereport/list.php
View File

@ -88,10 +88,10 @@ if ($page == -1) {
$page = 0 ; $page = 0 ;
} }
$limit = $conf->liste_limit; $offset = $conf->liste_limit * $page;
$offset = $limit * $page;
$pageprev = $page - 1; $pageprev = $page - 1;
$pagenext = $page + 1; $pagenext = $page + 1;
$limit = $conf->liste_limit;
$sql = "SELECT d.rowid, d.ref, d.fk_user_author, d.total_ht, d.total_tva, d.total_ttc, d.fk_statut as status,"; $sql = "SELECT d.rowid, d.ref, d.fk_user_author, d.total_ht, d.total_tva, d.total_ttc, d.fk_statut as status,";
$sql.= " d.date_debut, d.date_fin,"; $sql.= " d.date_debut, d.date_fin,";
@ -219,7 +219,7 @@ if ($resql)
print '<td class="liste_titre">&nbsp;</td>'; print '<td class="liste_titre">&nbsp;</td>';
} }
// Amount with no taxe // Amount with no tax
print '<td class="liste_titre" align="right"><input class="flat" type="text" size="6" name="search_amount_ht" value="'.$search_amount_ht.'"></td>'; print '<td class="liste_titre" align="right"><input class="flat" type="text" size="6" name="search_amount_ht" value="'.$search_amount_ht.'"></td>';
print '<td class="liste_titre">&nbsp;</td>'; print '<td class="liste_titre">&nbsp;</td>';
@ -245,9 +245,9 @@ if ($resql)
$total_total_ttc = 0; $total_total_ttc = 0;
$total_total_tva = 0; $total_total_tva = 0;
if($num>0) if($num > 0)
{ {
while ($i < $num) while ($i < min($num,$limit))
{ {
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);