diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php index e77b97fe92d..7b7148f89ce 100644 --- a/htdocs/accountancy/admin/categories_list.php +++ b/htdocs/accountancy/admin/categories_list.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2004-2023 Laurent Destailleur * Copyright (C) 2011-2021 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify @@ -852,6 +852,9 @@ if ($resql) { print "\n"; $i++; } + } else { + $colspan = 11; + print ''.$langs->trans("None").''; } } else { dol_print_error($db); diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 6e6fe073d5f..fb306b9b257 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -2639,7 +2639,6 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '') $maxlength = ''; if (in_array($fieldlist[$field], array('libelle', 'label'))) { switch ($tabname) { - case 'c_accounting_category': case 'c_ecotaxe': case 'c_email_senderprofile': case 'c_forme_juridique': diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php index 262205fd36b..d101becc1b5 100644 --- a/htdocs/compta/paiement/card.php +++ b/htdocs/compta/paiement/card.php @@ -592,8 +592,13 @@ if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) { } } +$params = array(); +if (! empty($title_button)) { + $params['attr'] = array('title' => $title_button); +} + if ($user->socid == 0 && $action == '') { - print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $user->hasRight('facture', 'paiement') && !$disable_delete); + print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $user->hasRight('facture', 'paiement') && !$disable_delete, $params); } print ''; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 3f05922627b..13d5775196b 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -7097,7 +7097,7 @@ class Form $arrayofdateof = $adddateof; } foreach ($arrayofdateof as $valuedateof) { - $tmpadddateof = $valuedateof['adddateof']; + $tmpadddateof = $valuedateof['adddateof'] != '' ? $valuedateof['adddateof'] : 0; $tmplabeladddateof = $valuedateof['labeladddateof']; $tmparray = dol_getdate($tmpadddateof); if (empty($tmplabeladddateof)) { diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php index d4d618586e5..9c72c98721c 100644 --- a/htdocs/core/class/html.formaccounting.class.php +++ b/htdocs/core/class/html.formaccounting.class.php @@ -235,7 +235,7 @@ class FormAccounting extends Form public function select_accounting_category($selected = '', $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0) { // phpcs:enable - global $db, $langs, $user, $mysoc; + global $db, $langs, $mysoc; if (empty($mysoc->country_id) && empty($mysoc->country_code) && empty($allcountries)) { dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined'); @@ -293,7 +293,7 @@ class FormAccounting extends Form $out .= ''; //if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); } else { - $out = $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code); + $out = $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code, $langs->trans("Accounting"), $langs->trans("Setup"), $langs->trans("AccountingCategories")); } } else { dol_print_error($this->db); diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 9fd5d1d07d5..fd1f2f9bc1e 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -4122,6 +4122,12 @@ function migrate_delete_old_files($db, $langs, $conf) '/core/menus/standard/auguria_frontoffice.php', '/core/menus/standard/eldy_backoffice.php', '/core/menus/standard/eldy_frontoffice.php', + '/core/modules/export/export_excel.modules.php', + '/core/modules/export/export_csv.modules.php', + '/core/modules/export/exportcsv.modules.php', + '/core/modules/export/export_excel2007new.modules.php', + '/core/modules/facture/pdf_crabe.modules.php', + '/core/modules/facture/pdf_oursin.modules.php', '/core/modules/mailings/contacts2.modules.php', '/core/modules/mailings/contacts3.modules.php', '/core/modules/mailings/contacts4.modules.php', @@ -4130,12 +4136,6 @@ function migrate_delete_old_files($db, $langs, $conf) '/core/modules/mailings/peche.modules.php', '/core/modules/mailings/poire.modules.php', '/core/modules/mailings/kiwi.modules.php', - '/core/modules/facture/pdf_crabe.modules.php', - '/core/modules/facture/pdf_oursin.modules.php', - '/core/modules/export/export_excel.modules.php', - '/core/modules/export/export_csv.modules.php', - '/core/modules/export/exportcsv.modules.php', - '/core/modules/export/export_excel2007new.modules.php', '/core/boxes/box_members.php', '/api/class/api_generic.class.php', diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index 2ba06c1c17c..af9fe858dfc 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -448,7 +448,7 @@ ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction fro ## Error SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them -ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries) +ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s) ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice %s, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused. ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account. ExportNotSupported=The export format setuped is not supported into this page diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php index d7bbe577734..62e262ca6f9 100644 --- a/htdocs/opensurvey/wizard/choix_date.php +++ b/htdocs/opensurvey/wizard/choix_date.php @@ -360,11 +360,13 @@ print ''."\n"; print '
'."\n"; print '
'."\n"; print ''."\n"; // The div class=center has no effect on table, so we must keep the align=center for table -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; +print ''."\n"; print '
'.$motmois.' '.$_SESSION["annee"].'
'; -print ''; -print '		'; +print '
'.$motmois.' '.$_SESSION["annee"].'
'; +print ''; +print '		'; print '
'."\n"; print '
'."\n"; @@ -493,7 +495,7 @@ for ($i = 0; $i < $nbrejourmois + $premierjourmois; $i++) { for ($j = 0; $j < $nbofchoice; $j++) { // show red buttons if (date("j", $_SESSION["totalchoixjour"][$j]) == $numerojour && date("n", $_SESSION["totalchoixjour"][$j]) == $_SESSION["mois"] && date("Y", $_SESSION["totalchoixjour"][$j]) == $_SESSION["annee"]) { - print ''."\n"; + print ''."\n"; $dejafait = $numerojour; } } @@ -503,10 +505,10 @@ for ($i = 0; $i < $nbrejourmois + $premierjourmois; $i++) { if (isset($dejafait) === false || $dejafait != $numerojour) { // green button if (($numerojour >= $jourAJ && $_SESSION["mois"] == $moisAJ && $_SESSION["annee"] == $anneeAJ) || ($_SESSION["mois"] > $moisAJ && $_SESSION["annee"] == $anneeAJ) || $_SESSION["annee"] > $anneeAJ) { - print ''."\n"; + print ''."\n"; } else { // grey button - print ''.$numerojour.''."\n"; + print ''.$numerojour.''."\n"; } } } @@ -543,12 +545,13 @@ if (issetAndNoEmpty('totalchoixjour', $_SESSION) || $erreur) { print ''."\n"; - //affichage de la liste des jours choisis + // Show list of selected days + $nbofchoice = count($_SESSION["totalchoixjour"]); for ($i = 0; $i < $nbofchoice; $i++) { print ''."\n"; - print ''.dol_print_date($_SESSION["totalchoixjour"][$i], 'daytext').' ('.dol_print_date($_SESSION["totalchoixjour"][$i], '%A').')'; + print ''.dol_print_date($_SESSION["totalchoixjour"][$i], 'daytext').' ('.dol_print_date($_SESSION["totalchoixjour"][$i], '%A').')'; //affichage des cases d'horaires for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) { @@ -568,7 +571,9 @@ if (issetAndNoEmpty('totalchoixjour', $_SESSION) || $erreur) { // show buttons to cancel, delete days or create survey print ''."\n"; print ''."\n"; - print ''."\n"; + print ''; + print ''; + print ''."\n"; print''."\n"; print ''."\n"; print '


'."\n"; diff --git a/htdocs/opensurvey/wizard/index.php b/htdocs/opensurvey/wizard/index.php index 4542ecfa3bd..ef7a35dd303 100644 --- a/htdocs/opensurvey/wizard/index.php +++ b/htdocs/opensurvey/wizard/index.php @@ -2,7 +2,7 @@ /* Copyright (C) 2013 Laurent Destailleur * Copyright (C) 2014 Marcos García * Copyright (C) 2016 Regis Houssin - * Copyright (C) 2019 Frédéric France + * Copyright (C) 2019 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -55,13 +55,18 @@ print '
'; print '
'; print '
'; print '
'; -print ''; +print ''; print '
'; print '
'; print '
'; -print ''; +print ''; print '
'; print '
'; +print '
'; print '
'; print '
';