do not add default value in list

This commit is contained in:
Frédéric FRANCE 2023-06-26 13:58:44 +02:00
parent 37e39f5305
commit 276a6ae6a4
12 changed files with 14 additions and 13 deletions

View file

@ -1324,7 +1324,7 @@ if ($resql) {
// Payment mode
if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
print '<td class="liste_titre">';
print $form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1, '', 1);
print $form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1, '', 1, 'list');
print '</td>';
}
if (!empty($arrayfields['p.total_ht']['checked'])) {

View file

@ -1588,7 +1588,7 @@ if ($resql) {
// Payment mode
if (!empty($arrayfields['c.fk_mode_reglement']['checked'])) {
print '<td class="liste_titre">';
print $form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1, '', 1);
print $form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1, '', 1, 'list');
print '</td>';
}
// Channel

View file

@ -1052,7 +1052,7 @@ if ($resql) {
// Payment mode
if (!empty($arrayfields['c.fk_mode_reglement']['checked'])) {
print '<td class="liste_titre">';
$form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1);
$form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1, '', 0, 'list');
print '</td>';
}
// Channel

View file

@ -488,7 +488,7 @@ if ($arrayfields['datev']['checked']) {
// Payment type
if ($arrayfields['type']['checked']) {
print '<td class="liste_titre center">';
print $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16, 1, 'maxwidth100', 1);
print $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16, 1, 'maxwidth100', 1, 'list');
print '</td>';
}

View file

@ -633,7 +633,7 @@ if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
// Payment mode
print '<td class="liste_titre right">';
print $form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100', 1);
print $form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100', 1, 'list');
print '</td>';
}
if (!empty($arrayfields['recurring']['checked'])) {

View file

@ -1452,7 +1452,7 @@ if ($resql) {
// Payment mode
if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
print '<td class="liste_titre">';
print $form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 0, 1, 'minwidth100 maxwidth100', 1);
print $form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 0, 1, 'minwidth100 maxwidth100', 1, 'list');
print '</td>';
}
// Payment terms

View file

@ -416,7 +416,7 @@ if (!empty($arrayfields['s.nom']['checked'])) {
// Filter: Payment type
if (!empty($arrayfields['c.libelle']['checked'])) {
print '<td class="liste_titre">';
print $form->select_types_paiements($search_paymenttype, 'search_paymenttype', '', 2, 1, 1, 1, 1, '', 1);
print $form->select_types_paiements($search_paymenttype, 'search_paymenttype', '', 2, 1, 1, 1, 1, '', 1, 'list');
print '</td>';
}

View file

@ -519,7 +519,7 @@ if (!empty($arrayfields['cs.fk_user']['checked'])) {
// Filter: Type
if (!empty($arrayfields['cs.fk_mode_reglement']['checked'])) {
print '<td class="liste_titre">';
print $form->select_types_paiements($search_type, 'search_type', '', 0, 1, 1, 0, 1, 'maxwidth150', 1);
print $form->select_types_paiements($search_type, 'search_type', '', 0, 1, 1, 0, 1, 'maxwidth150', 1, 'list');
print '</td>';
}

View file

@ -465,7 +465,7 @@ if (!empty($arrayfields['t.datev']['checked'])) {
// Filter: Type
if (!empty($arrayfields['t.fk_typepayment']['checked'])) {
print '<td class="liste_titre left">';
print $form->select_types_paiements($search_type, 'search_type', '', 0, 1, 1, 16, 1, '', 1);
print $form->select_types_paiements($search_type, 'search_type', '', 0, 1, 1, 16, 1, '', 1, 'list');
print '</td>';
}

View file

@ -4346,9 +4346,10 @@ class Form
* @param int $active Active or not, -1 = all
* @param string $morecss Add more CSS on select tag
* @param int $nooutput 1=Return string, do not send to output
* @param string $mode card or list
* @return string|void String for the HTML select component
*/
public function select_types_paiements($selected = '', $htmlname = 'paiementtype', $filtertype = '', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '', $nooutput = 0)
public function select_types_paiements($selected = '', $htmlname = 'paiementtype', $filtertype = '', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '', $nooutput = 0, $mode = 'card')
{
// phpcs:enable
global $langs, $user, $conf;
@ -4369,7 +4370,7 @@ class Form
$this->load_cache_types_paiements();
// Set default value if not already set by caller
if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TYPE_ID)) {
if (empty($selected) && $mode == 'card' && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TYPE_ID)) {
$selected = $conf->global->MAIN_DEFAULT_PAYMENT_TYPE_ID;
}

View file

@ -390,7 +390,7 @@ if (!empty($arrayfields['s.nom']['checked'])) {
// Filter: Payment type
if (!empty($arrayfields['c.libelle']['checked'])) {
print '<td class="liste_titre">';
$form->select_types_paiements($search_payment_type, 'search_payment_type', '', 2, 1, 1);
$form->select_types_paiements($search_payment_type, 'search_payment_type', '', 2, 1, 1, 0, 1, '', 0, 'list');
print '</td>';
}

View file

@ -522,7 +522,7 @@ print '</td>';
// Type
print '<td class="liste_titre left">';
print $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16, 1, 'maxwidth125', 1);
print $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16, 1, 'maxwidth125', 1, 'list');
print '</td>';
// Bank account