diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index c263cc99696..3b38cb10e9c 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -40,18 +40,19 @@ $langs->load("bills"); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'tax|salaries', '', '', 'charges|'); -$year=$_GET["year"]; -$filtre=$_GET["filtre"]; -if (! $year && $_GET["mode"] != 'sconly') { $year=date("Y", time()); } - -$sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"]; -$sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; -$page = $_GET["page"]; -if ($page < 0) $page = 0; - -//$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit; -//$offset = $limit * $page ; +$mode=GETPOST("mode",'alpha'); +$year=GETPOST("year",'int'); +$filtre=GETPOST("filtre",'alpha'); +if (! $year && $mode != 'sconly') { $year=date("Y", time()); } +$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 = $limit * $page; +$pageprev = $page - 1; +$pagenext = $page + 1; if (! $sortfield) $sortfield="cs.date_ech"; if (! $sortorder) $sortorder="DESC"; @@ -68,18 +69,36 @@ $sal_static = new PaymentSalary($db); llxHeader('',$langs->trans("SpecialExpensesArea")); $title=$langs->trans("SpecialExpensesArea"); -if ($_GET["mode"] == 'sconly') $title=$langs->trans("SocialContributionsPayments"); +if ($mode == 'sconly') $title=$langs->trans("SocialContributionsPayments"); $param=''; -if (GETPOST("mode") == 'sconly') $param='&mode=sconly'; +if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit; +if ($mode == 'sconly') $param='&mode=sconly'; if ($sortfield) $param.='&sortfield='.$sortfield; if ($sortorder) $param.='&sortorder='.$sortorder; -print load_fiche_titre($title, ($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":""), 'title_accountancy.png'); + +print '
'; llxFooter(); diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index b6e6e9fa942..2bdc2f088b9 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -714,6 +714,7 @@ if ($resql) print '