diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index be5dc4e76e6..43ad8c15929 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -156,36 +156,38 @@ print "";
// Bank account (from Banks module)
print '
| '.$langs->trans("BankToPayCreditTransfer").' | ';
-print '';
-$form->select_comptes($conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT, 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT', 0, "courant=1", 1);
+print ' | ';
+print img_picto('', 'bank_account', 'class="pictofixedwidth"');
+print $form->select_comptes($conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT, 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT', 0, "courant=1", 1, '', 0, 'minwidth200', 1);
print ' |
';
/* Moved to bank account data
// ICS
print '| '.$langs->trans("ICS").' | ';
-print '';
+print ' | ';
print ' | ';
print '
';
*/
//User
print '| '.$langs->trans("ResponsibleUser").' | ';
-print '';
-print $form->select_dolusers($conf->global->PAYMENTBYBANKTRANSFER_USER, 'PAYMENTBYBANKTRANSFER_USER', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+print ' | ';
+print img_picto('', 'user', 'class="pictofixedwidth"');
+print $form->select_dolusers($conf->global->PAYMENTBYBANKTRANSFER_USER, 'PAYMENTBYBANKTRANSFER_USER', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'minwidth200 maxwidth500');
print ' | ';
print '
';
/*
//EntToEnd
print '| '.$langs->trans("END_TO_END").' | ';
-print '';
-print ' | ';
+print '';
+print ' | ';
print '
';
//USTRD
print '| '.$langs->trans("USTRD").' | ';
-print '';
-print ' | ';
+print '';
+print ' | ';
print '
';
*/
@@ -195,7 +197,7 @@ print '';
if (!$conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS) {
$conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS = 0;
}
-print ' | ';
+print '';
print '';
print '';
print '
';
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index c7de6d59896..01e3b6d4913 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -160,8 +160,9 @@ print "";
// Bank account (from Banks module)
print '| '.$langs->trans("BankToReceiveWithdraw").' | ';
-print '';
-$form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'PRELEVEMENT_ID_BANKACCOUNT', 0, "courant=1", 1);
+print ' | ';
+print img_picto('', 'bank_account', 'class="pictofixedwidth"');
+print $form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'PRELEVEMENT_ID_BANKACCOUNT', 0, "courant=1", 1, '', 0, 'minwidth200', 1);
print ' |
';
/* Moved to bank account data
@@ -179,8 +180,9 @@ print '';
//User
print '| '.$langs->trans("ResponsibleUser").' | ';
-print '';
-print $form->select_dolusers($conf->global->PRELEVEMENT_USER, 'PRELEVEMENT_USER', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+print ' | ';
+print img_picto('', 'user', 'class="pictofixedwidth"');
+print $form->select_dolusers($conf->global->PRELEVEMENT_USER, 'PRELEVEMENT_USER', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'minwidth200 maxwidth500');
print ' | ';
print '
';
@@ -189,8 +191,8 @@ print '| ';
$htmltext = $langs->trans("KeepThisEmptyInMostCases");
print $form->textwithpicto($langs->trans("END_TO_END"), $htmltext);
print ' | ';
-print '';
-print ' | ';
+print '';
+print ' | ';
print '
';
//USTRD
@@ -199,16 +201,16 @@ $htmltext = $langs->trans("KeepThisEmptyInMostCases");
print $form->textwithpicto($langs->trans("USTRD"), $htmltext);
print '';
print '';
-print ' | ';
+print '';
print '';
//ADDDAYS
print '| '.$langs->trans("ADDDAYS").' | ';
-print '';
+print ' | ';
if (empty($conf->global->PRELEVEMENT_ADDDAYS)) {
$conf->global->PRELEVEMENT_ADDDAYS = 0;
}
-print ' | ';
+print '';
print '
';
print '';
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 2c33085aa6d..05aed6a215e 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -624,21 +624,21 @@ if ($result) {
print '';
- print '| '.$langs->trans("Conciliation")." | ";
+ print '
| '.$form->textwithpicto($langs->trans("AccountStatement"), $langs->trans("InputReceiptNumber"))." | ";
if ($user->rights->banque->consolidate) {
print '';
if ($objp->rappro) {
- print $langs->trans("AccountStatement").' rappro ? ' disabled' : '').'>';
+ print 'rappro ? ' disabled' : '').'>';
print '';
} else {
- print $langs->trans("AccountStatement").' rappro ? ' disabled' : '').'>';
+ print 'rappro ? ' disabled' : '').'>';
}
if ($objp->num_releve) {
print ' ('.$langs->trans("AccountStatement").' '.$objp->num_releve.')';
}
print ' | ';
} else {
- print ''.$objp->num_releve.' | ';
+ print ''.$objp->num_releve.' | ';
}
print '
';
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 937750648bb..be18099b6a8 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -67,6 +67,7 @@ $hookmanager->initHooks(array('directdebitcreatecard', 'globalcard'));
/*
* Actions
*/
+
if (GETPOST('cancel', 'alpha')) {
$massaction = '';
}
@@ -165,7 +166,11 @@ llxHeader('', $langs->trans("NewStandingOrder"));
if (prelevement_check_config($type) < 0) {
$langs->load("errors");
- setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
+ $modulenametoshow = "Withdraw";
+ if ($type == 'bank-transfer') {
+ $modulenametoshow = "PaymentByBankTransfer";
+ }
+ setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv($modulenametoshow)), null, 'errors');
}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 9e46d55d6a8..4e9da790f28 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1952,15 +1952,12 @@ class Form
}
dol_syslog(get_class($this)."::select_dolusers", LOG_DEBUG);
+
$resql = $this->db->query($sql);
if ($resql) {
$num = $this->db->num_rows($resql);
$i = 0;
if ($num) {
- // Enhance with select2
- include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
- $out .= ajax_combobox($htmlname);
-
// do not use maxwidthonsmartphone by default. Set it by caller so auto size to 100% will work when not defined
$out .= '';
+
+ if ($num) {
+ // Enhance with select2
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+ $out .= ajax_combobox($htmlname);
+ }
} else {
dol_print_error($this->db);
}