From 9796b1b26888d2069c40fdda390b03e93e70ee83 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 16 Feb 2016 17:43:05 +0100 Subject: [PATCH] Can select number of records into lists --- htdocs/compta/charges/index.php | 60 +++++++++++++++++++---------- htdocs/compta/facture/list.php | 1 + htdocs/compta/salaries/index.php | 21 ++++++---- htdocs/compta/sociales/index.php | 31 +++++++++------ htdocs/compta/tva/index.php | 7 ++-- htdocs/compta/tva/quadri_detail.php | 4 +- htdocs/compta/tva/reglement.php | 22 +++++++---- htdocs/fichinter/list.php | 9 +++-- htdocs/loan/index.php | 9 +++-- 9 files changed, 106 insertions(+), 58 deletions(-) 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 '
'; +if ($optioncss != '') print ''; +print ''; +print ''; +print ''; +print ''; +print ''; + +if ($mode != 'sconly') +{ + $center=($year?''.img_previous($langs->trans("Previous"), 'class="valignbottom"')." ".$langs->trans("Year").' '.$year.' '.img_next($langs->trans("Next"), 'class="valignbottom"')."":""); + print_barre_liste($title,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,$center,$num,$totalnboflines, 'title_accountancy', 0, '', '', $limit, 1); +} +else +{ + print_barre_liste($title,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,$center,$num,$totalnboflines, 'title_accountancy', 0, '', '', $limit); +} if ($year) $param.='&year='.$year; -if (GETPOST("mode") != 'sconly') +if ($mode != 'sconly') { print $langs->trans("DescTaxAndDividendsArea").'
'; print "
"; @@ -89,7 +108,7 @@ if (GETPOST("mode") != 'sconly') if ($conf->tax->enabled) { // Social contributions only - if (GETPOST("mode") != 'sconly') + if ($mode != 'sconly') { print load_fiche_titre($langs->trans("SocialContributionsPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); } @@ -140,7 +159,7 @@ if ($conf->tax->enabled) $totalpaye = 0; $var=true; - while ($i < $num) + while ($i < min($num, $limit)) { $obj = $db->fetch_object($resql); $var = !$var; @@ -199,7 +218,7 @@ if ($conf->tax->enabled) // VAT if ($conf->tax->enabled) { - if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly') + if (! $mode || $mode != 'sconly') { print "
"; @@ -300,7 +319,7 @@ else while($j<$numlt) { - if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly') + if (! $mode || $mode != 'sconly') { print "
"; @@ -384,7 +403,7 @@ while($j<$numlt) // Payment Salary if ($conf->salaries->enabled) { - if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly') + if (! $mode || $mode != 'sconly') { $sal = new PaymentSalary($db); @@ -463,6 +482,7 @@ if ($conf->salaries->enabled) } } +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 '
'."\n"; if ($optioncss != '') print ''; print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php index 18554f30de8..b0584d62850 100644 --- a/htdocs/compta/salaries/index.php +++ b/htdocs/compta/salaries/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2015 Laurent Destailleur + * Copyright (C) 2015-2016 Laurent Destailleur * Copyright (C) 2015 Jean-François Ferry * * This program is free software; you can redistribute it and/or modify @@ -35,6 +35,7 @@ $socid = GETPOST("socid","int"); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'salaries', '', '', ''); +$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit; $search_ref = GETPOST('search_ref','int'); $search_user = GETPOST('search_user','alpha'); $search_label = GETPOST('search_label','alpha'); @@ -46,7 +47,6 @@ if ($page == -1) { $page = 0; } $offset = $conf->liste_limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit; if (! $sortfield) $sortfield="s.datep"; if (! $sortorder) $sortorder="DESC"; $optioncss = GETPOST('optioncss','alpha'); @@ -107,6 +107,8 @@ if ($filtre) { if ($typeid) { $sql .= " AND s.fk_typepayment=".$typeid; } +$sql.= $db->order($sortfield,$sortorder); + //$sql.= " GROUP BY u.rowid, u.lastname, u.firstname, s.rowid, s.fk_user, s.amount, s.label, s.datev, s.fk_typepayment, s.num_payment, pst.code"; $totalnboflines=0; $result=$db->query($sql); @@ -114,7 +116,6 @@ if ($result) { $totalnboflines = $db->num_rows($result); } -$sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit+1,$offset); $result = $db->query($sql); @@ -126,15 +127,21 @@ if ($result) $var=true; $param=''; + if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit; if ($typeid) $param.='&typeid='.$typeid; if ($optioncss != '') $param.='&optioncss='.$optioncss; - print_barre_liste($langs->trans("SalariesPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines, 'title_accountancy.png'); - print ''; - if ($optioncss != '') print ''; + if ($optioncss != '') print ''; + print ''; + print ''; + print ''; + print ''; + print ''; - print ''; + print_barre_liste($langs->trans("SalariesPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit); + + print '
'; print ''; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"s.rowid","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Person"),$_SERVER["PHP_SELF"],"u.rowid","",$param,"",$sortfield,$sortorder); diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 2dbb3fd22d7..3133022b9e6 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -39,14 +39,15 @@ $result = restrictedArea($user, 'tax', '', '', 'charges'); $search_ref = GETPOST('search_ref','int'); $search_label = GETPOST('search_label','alpha'); $search_amount = GETPOST('search_amount','alpha'); + +$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 = $conf->liste_limit * $page; +$offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit; if (! $sortfield) $sortfield="cs.date_ech"; if (! $sortorder) $sortorder="DESC"; @@ -100,8 +101,8 @@ $sql.= " AND cs.entity = ".$conf->entity; // Search criteria if ($search_ref) $sql.=" AND cs.rowid=".$search_ref; -if ($search_label) $sql.=" AND cs.libelle LIKE '%".$db->escape($search_label)."%'"; -if ($search_amount) $sql.=" AND cs.amount='".$db->escape(price2num(trim($search_amount)))."'"; +if ($search_label) $sql.=natural_search("cs.libelle", $search_label); +if ($search_amount) $sql.=natural_search("cs.amount", price2num(trim($search_amount)), 1); if ($year > 0) { $sql .= " AND ("; @@ -119,16 +120,16 @@ if ($typeid) { $sql .= " AND cs.fk_type=".$typeid; } $sql.= " GROUP BY cs.rowid, cs.fk_type, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, c.libelle"; +$sql.= $db->order($sortfield,$sortorder); + $totalnboflines=0; $result=$db->query($sql); if ($result) { $totalnboflines = $db->num_rows($result); } -$sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit+1,$offset); - $resql=$db->query($sql); if ($resql) { @@ -137,16 +138,26 @@ if ($resql) $var=true; $param=''; + if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit; if ($year) $param.='&year='.$year; if ($typeid) $param.='&typeid='.$typeid; + print ''; + if ($optioncss != '') print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + if ($year) { - print load_fiche_titre($langs->trans("SocialContributions"),($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":"")); + $center=($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":""); + print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit); } else { - print_barre_liste($langs->trans("SocialContributions"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines); + print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit); } if (empty($mysoc->country_id) && empty($mysoc->country_code)) @@ -160,7 +171,6 @@ if ($resql) else { - print ''; print '
'; print ''; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"id","",$param,"",$sortfield,$sortorder); @@ -247,9 +257,8 @@ if ($resql) } print '
'; - - print ''; } + print ''; } else { diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 4090f2904b7..dc2be67e44f 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -116,7 +116,8 @@ $tva = new Tva($db); $textprevyear="".img_previous($langs->trans("Previous"), 'class="valignbottom"').""; $textnextyear=" ".img_next($langs->trans("Next"), 'class="valignbottom"').""; -print load_fiche_titre($langs->trans("VAT"),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear"); +print $conf->dol_optimize_smallscreen; +print load_fiche_titre($langs->trans("VAT"), $textprevyear." ".$langs->trans("Year")." ".$year_start." ".$textnextyear, 'title_accountancy.png'); print $langs->trans("VATReportBuildWithOptionDefinedInModule").'
'; print '('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')
'; @@ -124,12 +125,12 @@ print '
'; print ''; print ''; print ''; @@ -567,7 +567,7 @@ else } else { - print $fields['payment_amount']; + print price($fields['payment_amount']); if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice*100,2).'%)'; } print ''; diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index 3dee569b0ff..9615bec99f1 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -42,14 +42,15 @@ $search_label = GETPOST('search_label','alpha'); $search_amount = GETPOST('search_amount','alpha'); $month = GETPOST("month","int"); $year = GETPOST("year","int"); + +$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 = $conf->liste_limit * $page; +$offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit; if (! $sortfield) $sortfield="t.datev"; if (! $sortorder) $sortorder="DESC"; @@ -115,13 +116,13 @@ if ($filtre) { if ($typeid) { $sql .= " AND t.fk_typepayment=".$typeid; } +$sql.= $db->order($sortfield,$sortorder); $totalnboflines=0; $result=$db->query($sql); if ($result) { $totalnboflines = $db->num_rows($result); } -$sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit+1,$offset); $result = $db->query($sql); @@ -133,13 +134,20 @@ if ($result) $var=true; $param=''; + if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit; if ($typeid) $param.='&typeid='.$typeid; - print_barre_liste($langs->trans("VATPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines); - print ''; - - print '
'; -print load_fiche_titre($langs->trans("VATSummary")); +print load_fiche_titre($langs->trans("VATSummary"), '', ''); // The report mode is the one defined by defaut in tax module setup //print $modetax; //print '('.$langs->trans("SeeVATReportInInputOutputMode",'','').')'; print ''; -print load_fiche_titre($langs->trans("VATPaid")); +print load_fiche_titre($langs->trans("VATPaid"), '', ''); print '
'; diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 00edf22ac3a..e04530a9dc7 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -416,7 +416,7 @@ else print $langs->trans("NotUsedForGoods"); } else { - print $fields['payment_amount']; + print price($fields['payment_amount']); if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice*100,2).'%)'; } print '
'; + print ''; + if ($optioncss != '') print ''; + print ''; + print ''; + print ''; + print ''; + + print_barre_liste($langs->trans("VATPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines, 'title_accountancy', 0, '', '', $limit); + + print '
'; print ''; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"t.rowid","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"t.label","",$param,'align="left"',$sortfield,$sortorder); diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index f919ad0d9d1..d86c2b86274 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -151,10 +151,11 @@ if ($result) print ''."\n"; if ($optioncss != '') print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; print_barre_liste($langs->trans("ListOfInterventions"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_commercial.png', 0, '', '', $limit); diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php index 3d13c9c82fa..51f4e74e119 100644 --- a/htdocs/loan/index.php +++ b/htdocs/loan/index.php @@ -37,16 +37,16 @@ $socid = GETPOST('socid', 'int'); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'loan', '', '', ''); +$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 = $conf->liste_limit * $page; +$offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; if (! $sortfield) $sortfield="l.rowid"; if (! $sortorder) $sortorder="DESC"; -$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit; $search_ref=GETPOST('search_ref','int'); $search_label=GETPOST('search_label','alpha'); @@ -103,7 +103,8 @@ if ($resql) $i = 0; $var=true; - $param=""; + $param=''; + if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit; 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; @@ -117,7 +118,7 @@ if ($resql) print ''; print ''; - print_barre_liste($langs->trans("Loans"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit); + print_barre_liste($langs->trans("Loans"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit); print '
'; print '';