diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index f07ff99c72a..81f14683383 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2810,9 +2810,10 @@ function load_fiche_titre($titre, $mesg='', $picto='title_generic.png', $pictois * @param string $picto Icon to use before title (should be a 32x32 transparent png file) * @param int $pictoisfullpath 1=Icon name is a full absolute url of image * @param string $morehtml More html to show + * @param string $morecss More css to the table * @return void */ -function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='') +function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='') { global $conf,$langs; @@ -2830,7 +2831,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so print "\n"; print "\n"; - print '
| '.$langs->trans("BuyingPriceMinShort").' | '; - if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print ''.$langs->trans("DesiredStock").' | '; - if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print ''.$langs->trans("PhysicalStock").' | '; + if ($user->rights->fournisseur->lire) print_liste_field_titre($langs->trans("BuyingPriceMinShort"), '', '', '', '', 'align="right"'); + if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print_liste_field_titre($langs->trans("DesiredStock"), '', '', '', '', 'align="right"'); + if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print_liste_field_titre($langs->trans("PhysicalStock"), '', '', '', '', 'align="right"'); print_liste_field_titre($langs->trans("Sell"), $_SERVER["PHP_SELF"], "p.tosell",$param,"",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Buy"), $_SERVER["PHP_SELF"], "p.tobuy",$param,"",'align="center"',$sortfield,$sortorder); print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch '); @@ -553,7 +553,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, "list.php", $param, $sortfield, $sortorder,'',$num,$nbtotalofrecords); + print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', '', '', 'paginationatbottom'); $db->free($resql); diff --git a/htdocs/theme/eldy/img/1downarrow.png b/htdocs/theme/eldy/img/1downarrow.png index 1d134ab3e4e..1d8a1164ae0 100644 Binary files a/htdocs/theme/eldy/img/1downarrow.png and b/htdocs/theme/eldy/img/1downarrow.png differ diff --git a/htdocs/theme/eldy/img/1downarrow_selected.png b/htdocs/theme/eldy/img/1downarrow_selected.png index 5caf8ead52d..17934d7c62e 100644 Binary files a/htdocs/theme/eldy/img/1downarrow_selected.png and b/htdocs/theme/eldy/img/1downarrow_selected.png differ diff --git a/htdocs/theme/eldy/img/1uparrow.png b/htdocs/theme/eldy/img/1uparrow.png index 70ea061dc5e..331731b750c 100644 Binary files a/htdocs/theme/eldy/img/1uparrow.png and b/htdocs/theme/eldy/img/1uparrow.png differ diff --git a/htdocs/theme/eldy/img/1uparrow_selected.png b/htdocs/theme/eldy/img/1uparrow_selected.png index 36d25a408c5..d9d8462fe43 100644 Binary files a/htdocs/theme/eldy/img/1uparrow_selected.png and b/htdocs/theme/eldy/img/1uparrow_selected.png differ diff --git a/htdocs/theme/eldy/img/filter.png b/htdocs/theme/eldy/img/filter.png index 917715107bd..ee34a22c78e 100644 Binary files a/htdocs/theme/eldy/img/filter.png and b/htdocs/theme/eldy/img/filter.png differ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 28d5e5c078d..c9294837f14 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2187,6 +2187,9 @@ div.pagination li.pagination .active { div.pagination li.paginationafterarrows { margin-left: 10px; } +.paginationatbottom { + margin-top: 9px; +} /* Prepare to remove class pair - impair .noborder > tbody > tr:nth-child(even) td { diff --git a/htdocs/theme/md/img/1downarrow.png b/htdocs/theme/md/img/1downarrow.png index 1d134ab3e4e..1d8a1164ae0 100644 Binary files a/htdocs/theme/md/img/1downarrow.png and b/htdocs/theme/md/img/1downarrow.png differ diff --git a/htdocs/theme/md/img/1downarrow_selected.png b/htdocs/theme/md/img/1downarrow_selected.png index 5caf8ead52d..17934d7c62e 100644 Binary files a/htdocs/theme/md/img/1downarrow_selected.png and b/htdocs/theme/md/img/1downarrow_selected.png differ diff --git a/htdocs/theme/md/img/1uparrow.png b/htdocs/theme/md/img/1uparrow.png index 70ea061dc5e..331731b750c 100644 Binary files a/htdocs/theme/md/img/1uparrow.png and b/htdocs/theme/md/img/1uparrow.png differ diff --git a/htdocs/theme/md/img/1uparrow_selected.png b/htdocs/theme/md/img/1uparrow_selected.png index 36d25a408c5..d9d8462fe43 100644 Binary files a/htdocs/theme/md/img/1uparrow_selected.png and b/htdocs/theme/md/img/1uparrow_selected.png differ