diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php index 22d7c52a5aa..e95a25ad248 100644 --- a/htdocs/compta/prelevement/orders_list.php +++ b/htdocs/compta/prelevement/orders_list.php @@ -29,9 +29,6 @@ // Load Dolibarr environment require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; - /** * @var Conf $conf * @var DoliDB $db @@ -40,6 +37,8 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Load translation files required by the page $langs->loadLangs(array('banks', 'categories', 'withdrawals')); @@ -54,6 +53,11 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page $optioncss = GETPOST('optioncss', 'alpha'); $mode = GETPOST('mode', 'alpha'); +// Get supervariables +$status = GETPOSTINT('status'); +$search_ref = GETPOST('search_ref', 'alpha'); +$search_amount = GETPOST('search_amount', 'alpha'); +$search_status = GETPOST('search_status'); $type = GETPOST('type', 'aZ09'); // Load variable for pagination @@ -75,11 +79,6 @@ if (!$sortfield) { $sortfield = "p.datec"; } -// Get supervariables -$statut = GETPOSTINT('statut'); -$search_ref = GETPOST('search_ref', 'alpha'); -$search_amount = GETPOST('search_amount', 'alpha'); - $bon = new BonPrelevement($db); $hookmanager->initHooks(array('withdrawalsreceiptslist')); @@ -110,6 +109,7 @@ $error = 0; if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers $search_ref = ""; $search_amount = ""; + $search_status = ""; } // Mass actions @@ -192,7 +192,7 @@ if ($type == 'bank-transfer') { $help_url = ''; -$sql = "SELECT p.rowid, p.ref, p.amount, p.statut, p.datec"; +$sql = "SELECT p.rowid, p.ref, p.amount, p.statut as status, p.datec"; $sqlfields = $sql; // $sql fields to remove for count total @@ -209,6 +209,9 @@ if ($search_ref) { if ($search_amount) { $sql .= natural_search("p.amount", $search_amount, 1); } +if ((string) $search_status != '' && (string) $search_status != '-1') { + $sql .= natural_search("p.statut", $search_status, 1); +} // Count total nb of records $nbtotalofrecords = ''; @@ -252,7 +255,7 @@ llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'bodyforlist'); $arrayofselected = is_array($toselect) ? $toselect : array(); $param = ''; -$param .= "&statut=".urlencode((string) ($statut)); +$param .= "&status=".urlencode((string) ($status)); if ($type == 'bank-transfer') { $param .= '&type=bank-transfer'; } @@ -349,7 +352,14 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { print '