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

Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0

Browse Source
This commit is contained in:
Laurent Destailleur 2022-01-13 11:05:57 +01:00
commit f51720879b
10 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/compta/paiement/list.php
View File

@ -340,7 +340,6 @@ print '<input type="hidden" name="action" value="list">';
print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="search_status" value="'.$search_status.'">';
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bill', 0, '', '', $limit, 0, 0, 1); print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bill', 0, '', '', $limit, 0, 0, 1);

2
htdocs/compta/sociales/list.php
View File

@ -75,7 +75,7 @@ $search_account = GETPOST('search_account', 'int');
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha'); $sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha'); $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) {

4
htdocs/compta/stats/cabyprodserv.php
View File

@ -52,8 +52,8 @@ if (GETPOST("modecompta")) {
$modecompta = GETPOST("modecompta"); $modecompta = GETPOST("modecompta");
} }
$sortorder = GETPOST("sortorder", 'aZ09'); $sortorder = GETPOST("sortorder", 'aZ09comma');
$sortfield = GETPOST("sortfield", 'aZ09'); $sortfield = GETPOST("sortfield", 'aZ09comma');
if (!$sortorder) { if (!$sortorder) {
$sortorder = "asc"; $sortorder = "asc";
} }

4
htdocs/compta/stats/cabyuser.php
View File

@ -51,8 +51,8 @@ if (GETPOST("modecompta")) {
$modecompta = GETPOST("modecompta"); $modecompta = GETPOST("modecompta");
} }
$sortorder = GETPOST("sortorder", 'aZ09'); $sortorder = GETPOST("sortorder", 'aZ09comma');
$sortfield = GETPOST("sortfield", 'aZ09'); $sortfield = GETPOST("sortfield", 'aZ09comma');
if (!$sortorder) { if (!$sortorder) {
$sortorder = "asc"; $sortorder = "asc";
} }

4
htdocs/compta/stats/casoc.php
View File

@ -44,8 +44,8 @@ if (GETPOST("modecompta")) {
$modecompta = GETPOST("modecompta"); $modecompta = GETPOST("modecompta");
} }
$sortorder = GETPOST("sortorder", 'aZ09'); $sortorder = GETPOST("sortorder", 'aZ09comma');
$sortfield = GETPOST("sortfield", 'aZ09'); $sortfield = GETPOST("sortfield", 'aZ09comma');
if (!$sortorder) { if (!$sortorder) {
$sortorder = "asc"; $sortorder = "asc";
} }

4
htdocs/compta/stats/supplier_turnover_by_prodserv.php
View File

@ -36,8 +36,8 @@ if (GETPOST("modecompta")) {
$modecompta = GETPOST("modecompta"); $modecompta = GETPOST("modecompta");
} }
$sortorder = GETPOST("sortorder", 'aZ09'); $sortorder = GETPOST("sortorder", 'aZ09comma');
$sortfield = GETPOST("sortfield", 'aZ09'); $sortfield = GETPOST("sortfield", 'aZ09comma');
if (!$sortorder) { if (!$sortorder) {
$sortorder = "asc"; $sortorder = "asc";
} }

4
htdocs/compta/stats/supplier_turnover_by_thirdparty.php
View File

@ -38,8 +38,8 @@ if (GETPOST("modecompta")) {
$modecompta = GETPOST("modecompta"); $modecompta = GETPOST("modecompta");
} }
$sortorder = GETPOST("sortorder", 'aZ09'); $sortorder = GETPOST("sortorder", 'aZ09comma');
$sortfield = GETPOST("sortfield", 'aZ09'); $sortfield = GETPOST("sortfield", 'aZ09comma');
if (!$sortorder) { if (!$sortorder) {
$sortorder = "asc"; $sortorder = "asc";
} }

2
htdocs/expedition/list.php
View File

@ -95,7 +95,7 @@ $offset = $limit * $page;
$pageprev = $page - 1; $pageprev = $page - 1;
$pagenext = $page + 1; $pagenext = $page + 1;
$search_status = GETPOST('search_status'); $search_status = GETPOST('search_status', 'intcomma');
$diroutputmassaction = $conf->expedition->dir_output.'/sending/temp/massgeneration/'.$user->id; $diroutputmassaction = $conf->expedition->dir_output.'/sending/temp/massgeneration/'.$user->id;

2
htdocs/reception/list.php
View File

@ -75,7 +75,7 @@ $pagenext = $page + 1;
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$contextpage = 'receptionlist'; $contextpage = 'receptionlist';
$search_status = GETPOST('search_status'); $search_status = GETPOST('search_status', 'intcomma');
$object = new Reception($db); $object = new Reception($db);

2
htdocs/societe/website.php
View File

@ -43,8 +43,6 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'web
$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
$search_status = GETPOST('search_status');
// Security check // Security check
$id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int'); $id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
if ($user->socid) { if ($user->socid) {