diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php index c75041705df..b9f5611f7e8 100644 --- a/htdocs/adherents/subscription/list.php +++ b/htdocs/adherents/subscription/list.php @@ -33,6 +33,7 @@ $langs->loadLangs(array("members", "companies")); $action = GETPOST('action', 'aZ09'); $massaction = GETPOST('massaction', 'alpha'); +$contextpage = GETPOST('contextpage', 'aZ09'); $confirm = GETPOST('confirm', 'alpha'); $toselect = GETPOST('toselect', 'array'); $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search @@ -117,7 +118,6 @@ if (empty($reshook)) // Purge search criteria 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 = ""; $search_type = ""; $search_ref = ""; $search_lastname = ""; @@ -338,7 +338,7 @@ if (!empty($arrayfields['t.libelle']['checked'])) if (!empty($arrayfields['d.bank']['checked'])) { print ''; - $form->select_comptes($search_account, 'search_account', 0, '', 1); + $form->select_comptes($search_account, 'search_account', 0, '', 1, '', 0, 'maxwidth150'); print ''; } @@ -444,7 +444,7 @@ while ($i < min($num, $limit)) // Type if (!empty($arrayfields['d.fk_type']['checked'])) { - print ''; + print ''; if ($typeid > 0) { print $adht->getNomUrl(1); @@ -464,14 +464,14 @@ while ($i < min($num, $limit)) // Firstname if (!empty($arrayfields['d.firstname']['checked'])) { - print ''.$adherent->firstname.''; + print ''.$adherent->firstname.''; if (!$i) $totalarray['nbfield']++; } // Login if (!empty($arrayfields['d.login']['checked'])) { - print ''.$adherent->login.''; + print ''.$adherent->login.''; if (!$i) $totalarray['nbfield']++; } @@ -487,7 +487,7 @@ while ($i < min($num, $limit)) // Banque if (!empty($arrayfields['d.bank']['checked'])) { - print ""; + print ''; if ($obj->fk_account > 0) { $accountstatic->id = $obj->fk_account; diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php index 4c1d06e37fa..8a6e3053076 100644 --- a/htdocs/compta/bank/account_statement_document.php +++ b/htdocs/compta/bank/account_statement_document.php @@ -92,12 +92,12 @@ include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; * View */ +$form = new Form($db); + $title = $langs->trans("FinancialAccount").' - '.$langs->trans("Documents"); $helpurl = ""; llxHeader('', $title, $helpurl); -$form = new Form($db); - if ($id > 0 || !empty($ref)) { if ($object->fetch($id, $ref)) { $upload_dir = $conf->bank->dir_output."/".$id."/statement/".dol_sanitizeFileName($num); @@ -114,13 +114,9 @@ if ($id > 0 || !empty($ref)) { $totalsize += $file['size']; } - $morehtmlref = ''; - - $title = $langs->trans("AccountStatement").' '.$num.' - '.$langs->trans("BankAccount").' '.$object->getNomUrl(1, 'receipts'); print load_fiche_titre($title, '', ''); - print '
'; print '
'; diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php index 6c23e324f71..da51589b8ac 100644 --- a/htdocs/core/lib/bank.lib.php +++ b/htdocs/core/lib/bank.lib.php @@ -179,7 +179,7 @@ function account_statement_prepare_head($object, $num) // Attached files require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php'; - $upload_dir = $conf->bank->dir_output."/".$object->id.'/'.dol_sanitizeFileName($num); + $upload_dir = $conf->bank->dir_output."/".$object->id.'/statement/'.dol_sanitizeFileName($num); $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$')); $nbLinks = Link::count($db, $object->element, $object->id);