From e3443365d27661f645cfb1428e75142e3d1cd937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 28 Nov 2015 19:08:52 +0100 Subject: [PATCH 1/2] Navigation to loan list --- htdocs/loan/index.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php index 25d0f015253..76524a87960 100644 --- a/htdocs/loan/index.php +++ b/htdocs/loan/index.php @@ -83,6 +83,12 @@ if ($filtre) { } $sql.= " GROUP BY l.rowid, l.label, l.capital, l.datestart, l.dateend"; $sql.= $db->order($sortfield,$sortorder); +$numall = 0; +if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) +{ + $result = $db->query($sql); + $numall = $db->num_rows($result); +} $sql.= $db->plimit($limit+1, $offset); //print $sql; @@ -93,13 +99,13 @@ if ($resql) $i = 0; $var=true; - print load_fiche_titre($langs->trans("Loans")); - $param=""; if ($optioncss != '') $param.='&optioncss='.$optioncss; print '
'."\n"; if ($optioncss != '') print ''; + print_barre_liste($langs->trans("Loans"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $numall,'title_generic.png'); + print ''; print ''; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"l.rowid","",$param,"",$sortfield,$sortorder); From 79263d06e950b957871c3a4dbbe31b9eb4ced6ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 28 Nov 2015 20:37:09 +0100 Subject: [PATCH 2/2] Update index.php --- htdocs/loan/index.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php index 76524a87960..e99691d8ff9 100644 --- a/htdocs/loan/index.php +++ b/htdocs/loan/index.php @@ -100,7 +100,10 @@ if ($resql) $var=true; $param=""; - if ($optioncss != '') $param.='&optioncss='.$optioncss; + if ($search_ref) $param.="&search_ref=".$search_ref; + if ($search_label) $param.="&search_label=".$search_user; + if ($search_amount) $param.="&search_amount=".$search_amount_ht; + if ($optioncss != '') $param.='&optioncss='.$optioncss; print ''."\n"; if ($optioncss != '') print '';