From ee05abaa272deff7bfab011def7b254f2456be27 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 8 Sep 2022 15:13:16 +0200 Subject: [PATCH] Clean code --- htdocs/adherents/subscription.php | 2 +- htdocs/comm/propal/card.php | 2 +- htdocs/comm/propal/list.php | 2 +- htdocs/commande/card.php | 2 +- htdocs/commande/list.php | 2 +- htdocs/compta/bank/bankentries_list.php | 2 +- htdocs/compta/bank/various_payment/list.php | 2 +- htdocs/compta/facture/invoicetemplate_list.php | 2 +- htdocs/compta/facture/list.php | 2 +- htdocs/compta/localtax/card.php | 2 +- htdocs/compta/paiement/list.php | 2 +- htdocs/compta/paiement_vat.php | 2 +- htdocs/compta/sociales/list.php | 2 +- htdocs/compta/tva/card.php | 2 +- htdocs/compta/tva/list.php | 2 +- htdocs/fourn/facture/list-rec.php | 2 +- htdocs/fourn/facture/list.php | 2 +- htdocs/salaries/list.php | 2 +- htdocs/salaries/payments.php | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index 5779fe036d9..67c2ffef1d0 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -1072,7 +1072,7 @@ if ($rowid > 0) { // Payment mode print ''.$langs->trans("PaymentMode").''; - $form->select_types_paiements(GETPOST('operation'), 'operation', '', 2, 1, 0, 0, 1, 'minwidth200'); + print $form->select_types_paiements(GETPOST('operation'), 'operation', '', 2, 1, 0, 0, 1, 'minwidth200', 1); print "\n"; // Date of payment diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index d3e7070a25d..f7da4d720c0 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1797,7 +1797,7 @@ if ($action == 'create') { // Mode of payment print ''.$langs->trans('PaymentMode').''; print img_picto('', 'bank', 'class="pictofixedwidth"'); - $form->select_types_paiements((GETPOSTISSET('mode_reglement_id') && GETPOST('mode_reglement_id') != 0) ? GETPOST('mode_reglement_id', 'int') : $soc->mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx'); + print $form->select_types_paiements((GETPOSTISSET('mode_reglement_id') && GETPOST('mode_reglement_id') != 0) ? GETPOST('mode_reglement_id', 'int') : $soc->mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx', 1); print ''; // Bank Account diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 9998a8b714f..1b7083f4277 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -1238,7 +1238,7 @@ if ($resql) { // Payment mode if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) { print ''; - $form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1); + print $form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1, '', 1); print ''; } if (!empty($arrayfields['p.total_ht']['checked'])) { diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 3b4b05f6ec3..c81b4266dbf 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1819,7 +1819,7 @@ if ($action == 'create' && $usercancreate) { // Payment mode print ''.$langs->trans('PaymentMode').''; print img_picto('', 'bank', 'class="pictofixedwidth"'); - $form->select_types_paiements($mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx'); + print $form->select_types_paiements($mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx', 1); print ''; // Bank Account diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index ef485f62b5f..7578f75cc1f 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -1513,7 +1513,7 @@ if ($resql) { // Payment mode if (!empty($arrayfields['c.fk_mode_reglement']['checked'])) { print ''; - $form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1); + print $form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1, '', 1); print ''; } // Channel diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index d9689202297..93505490146 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -1084,7 +1084,7 @@ if ($resql) { } if (!empty($arrayfields['type']['checked'])) { print ''; - $form->select_types_paiements(empty($search_type) ? '' : $search_type, 'search_type', '', 2, 1, 1, 0, 1, 'maxwidth100'); + print $form->select_types_paiements(empty($search_type) ? '' : $search_type, 'search_type', '', 2, 1, 1, 0, 1, 'maxwidth100', 1); print ''; } // Numero diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php index fe9bb032fa8..3499c02f8e0 100644 --- a/htdocs/compta/bank/various_payment/list.php +++ b/htdocs/compta/bank/various_payment/list.php @@ -418,7 +418,7 @@ if ($resql) { // Payment type if ($arrayfields['type']['checked']) { print ''; - $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16, 1, 'maxwidth100'); + print $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16, 1, 'maxwidth100', 1); print ''; } diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php index e905360853a..836f9e47f4b 100644 --- a/htdocs/compta/facture/invoicetemplate_list.php +++ b/htdocs/compta/facture/invoicetemplate_list.php @@ -536,7 +536,7 @@ if ($resql) { if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) { // Payment mode print ''; - $form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100'); + print $form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100', 1); print ''; } if (!empty($arrayfields['recurring']['checked'])) { diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index abec5b19cf6..ce00bfecbd1 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -1365,7 +1365,7 @@ if ($resql) { // Payment mode if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) { print ''; - $form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 10); + print $form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 10, 1, '', 1); print ''; } // Payment terms diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php index 84f40f5cd19..c076fa1de1b 100644 --- a/htdocs/compta/localtax/card.php +++ b/htdocs/compta/localtax/card.php @@ -177,7 +177,7 @@ if ($action == 'create') { if (isModEnabled("banque")) { // Type payment print ''.$langs->trans("PaymentMode").''; - $form->select_types_paiements(GETPOST("paiementtype"), "paiementtype", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx'); + print $form->select_types_paiements(GETPOST("paiementtype"), "paiementtype", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx', 1); print "\n"; print ""; diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php index e6b57137df8..3ace8f1cc6b 100644 --- a/htdocs/compta/paiement/list.php +++ b/htdocs/compta/paiement/list.php @@ -400,7 +400,7 @@ if (!empty($arrayfields['s.nom']['checked'])) { // Filter: Payment type if (!empty($arrayfields['c.libelle']['checked'])) { print ''; - $form->select_types_paiements($search_paymenttype, 'search_paymenttype', '', 2, 1, 1); + print $form->select_types_paiements($search_paymenttype, 'search_paymenttype', '', 2, 1, 1, 1, 1, '', 1); print ''; } diff --git a/htdocs/compta/paiement_vat.php b/htdocs/compta/paiement_vat.php index f1f243bc06d..db573086a2f 100644 --- a/htdocs/compta/paiement_vat.php +++ b/htdocs/compta/paiement_vat.php @@ -207,7 +207,7 @@ if ($action == 'create') { print ''; print ''.$langs->trans("PaymentMode").''; - $form->select_types_paiements(GETPOSTISSET("paiementtype") ? GETPOST("paiementtype", "int") : $tva->paiementtype, "paiementtype", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx'); + print $form->select_types_paiements(GETPOSTISSET("paiementtype") ? GETPOST("paiementtype", "int") : $tva->paiementtype, "paiementtype", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx', 1); print "\n"; print ''; diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php index f36694bb3b2..ce27ebb3200 100644 --- a/htdocs/compta/sociales/list.php +++ b/htdocs/compta/sociales/list.php @@ -457,7 +457,7 @@ if (!empty($arrayfields['cs.fk_user']['checked'])) { // Filter: Type if (!empty($arrayfields['cs.fk_mode_reglement']['checked'])) { print ''; - $form->select_types_paiements($search_type, 'search_type', '', 0, 1, 1, 0, 1, 'maxwidth150'); + print $form->select_types_paiements($search_type, 'search_type', '', 0, 1, 1, 0, 1, 'maxwidth150', 1); print ''; } diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php index 5f089a4e205..c10c4fb9fae 100644 --- a/htdocs/compta/tva/card.php +++ b/htdocs/compta/tva/card.php @@ -490,7 +490,7 @@ if ($action == 'create') { // Type payment print ''.$langs->trans("PaymentMode").''; - $form->select_types_paiements(GETPOST("type_payment", 'int'), "type_payment", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx'); + print $form->select_types_paiements(GETPOST("type_payment", 'int'), "type_payment", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx', 1); print "\n"; print ""; diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php index 524f8b0105b..39ead71f25d 100644 --- a/htdocs/compta/tva/list.php +++ b/htdocs/compta/tva/list.php @@ -354,7 +354,7 @@ if (!empty($arrayfields['t.datev']['checked'])) { // Filter: Type if (!empty($arrayfields['t.fk_typepayment']['checked'])) { print ''; - $form->select_types_paiements($search_type, 'search_type', '', 0, 1, 1, 16); + print $form->select_types_paiements($search_type, 'search_type', '', 0, 1, 1, 16, 1, '', 1); print ''; } diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php index 7445e36f8a1..8316e689ead 100644 --- a/htdocs/fourn/facture/list-rec.php +++ b/htdocs/fourn/facture/list-rec.php @@ -527,7 +527,7 @@ if ($resql) { if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) { // Payment mode print ''; - $form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100'); + print $form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100', 1); print ''; } if (!empty($arrayfields['recurring']['checked'])) { diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index ec201537695..0ca7336944d 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -1051,7 +1051,7 @@ if ($resql) { // Payment mode if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) { print ''; - $form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 20, 1, 'maxwidth100'); + print $form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 20, 1, 'maxwidth100', 1); print ''; } if (!empty($arrayfields['f.total_ht']['checked'])) { diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php index dd44155ea5a..dec6bcd273f 100644 --- a/htdocs/salaries/list.php +++ b/htdocs/salaries/list.php @@ -434,7 +434,7 @@ print ''; // Type print ''; -$form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16); +print $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16, 1, '', 1); print ''; // Bank account diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php index 6893d701d96..5b858633d14 100644 --- a/htdocs/salaries/payments.php +++ b/htdocs/salaries/payments.php @@ -443,7 +443,7 @@ print ''; -$form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16); +print $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16, 1, '', 1); print ''; // Chq number print '';