diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 72be65b0a4f..bf30b1831f9 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -385,7 +385,7 @@ if ($action == 'create') {
print '
| '.$langs->trans("Country").' | ';
print '';
- print $form->select_country($selectedcode, 'account_country_id');
+ print img_picto('', 'country', 'class="pictofixedwidth"').$form->select_country($selectedcode, 'account_country_id');
if ($user->admin) {
print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
}
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 84c91384038..ef190884e22 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -95,8 +95,8 @@ if (!$sortorder) {
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$object = new Account($db);
-$hookmanager->initHooks(array('bankaccountlist'));
$extrafields = new ExtraFields($db);
+$hookmanager->initHooks(array('bankaccountlist'));
// fetch optionals attributes and labels
$extrafields->fetch_name_optionals_label($object->table_element);
@@ -129,6 +129,8 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
+$permissiontoadd = $user->rights->banque->modifier;
+$permissiontodelete = $user->rights->banque->supprimer;
/*
* Actions
@@ -162,7 +164,6 @@ if (empty($reshook)) {
// Mass actions
$objectclass = 'Account';
$objectlabel = 'FinancialAccount';
- $permissiontoadd = $user->rights->banque->modifier;
$uploaddir = $conf->banque->dir_output;
include DOL_DOCUMENT_ROOT . '/core/actions_massactions.inc.php';
}
@@ -287,13 +288,17 @@ if ($optioncss != '') {
}
// Add $param from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
// List of mass actions available
$arrayofmassactions = array(
// 'presend'=>img_picto('', 'email').$langs->trans("SendByMail"),
// 'builddoc'=>img_picto('', 'pdf').$langs->trans("PDFMerge"),
);
-if ($user->rights->banque->supprimer) {
+if ($permissiontodelete) {
$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
}
if ($user->rights->banque->modifier) {
@@ -304,10 +309,7 @@ if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
}
$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
-$newcardbutton = dolGetButtonTitle($langs->trans('NewFinancialAccount'), '', 'fa fa-plus-circle', 'card.php?action=create', '', $user->rights->banque->configurer);
-
-// Lines of title fields
-print ' |