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

Merge pull request #17329 from dolibit-ut/patch-285

Browse Source 
Update list.php
This commit is contained in:
Laurent Destailleur 2021-04-19 20:21:36 +02:00 committed by GitHub
commit 398800ef68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/expensereport/list.php
View File

@ -80,10 +80,10 @@ $diroutputmassaction = $conf->expensereport->dir_output.'/temp/massgeneration/'.
// Load variable for pagination // Load variable for pagination
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit; $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'aZ09comma'); $sortfield = GETPOST('sortfield', 'aZ09comma');
$sortorder = GETPOST('sortorder', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == -1) { if (empty($page) || $page == -1) {
$page = 0; $page = 0;
} // If $page is not defined, or '' or -1 } // If $page is not defined, or '' or -1
@ -98,19 +98,22 @@ if (!$sortfield) {
} }
$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
$search_ref = GETPOST('search_ref', 'alpha');
$search_user = GETPOST('search_user', 'int'); $search_ref = GETPOST('search_ref', 'alpha');
$search_amount_ht = GETPOST('search_amount_ht', 'alpha'); $search_user = GETPOST('search_user', 'int');
$search_amount_vat = GETPOST('search_amount_vat', 'alpha'); $search_amount_ht = GETPOST('search_amount_ht', 'alpha');
$search_amount_ttc = GETPOST('search_amount_ttc', 'alpha'); $search_amount_vat = GETPOST('search_amount_vat', 'alpha');
$search_status = (GETPOST('search_status', 'intcomma') != '' ?GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma')); $search_amount_ttc = GETPOST('search_amount_ttc', 'alpha');
$month_start = GETPOST("month_start", "int"); $search_status = (GETPOST('search_status', 'intcomma') != '' ?GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
$year_start = GETPOST("year_start", "int");
$day_start = GETPOST("day_start", "int"); $year_start = GETPOST('year_start', 'int');
$day_end = GETPOST("day_end", "int"); $month_start = GETPOST('month_start', 'int');
$month_end = GETPOST("month_end", "int"); $day_start = GETPOST('day_start', 'int');
$year_end = GETPOST("year_end", "int"); $year_end = GETPOST('year_end', 'int');
$month_end = GETPOST('month_end', 'int');
$day_end = GETPOST('day_end', 'int');
$optioncss = GETPOST('optioncss', 'alpha'); $optioncss = GETPOST('optioncss', 'alpha');
if ($search_status == '') { if ($search_status == '') {