Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2024-09-06 14:03:05 +02:00
commit aebcc76df8
22 changed files with 39 additions and 33 deletions

View file

@ -4,6 +4,7 @@
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
*
* 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
@ -649,7 +650,7 @@ if ($object->fetch($id) >= 0) {
print '<br>';
if ($sqlmessage && $user->admin) {
print info_admin($langs->trans("SQLUsedForExport").':<br> '.$sqlmessage, 0, 0, 1, '', 'TechnicalInformation');
print info_admin($langs->trans("SQLUsedForExport").':<br> '.$sqlmessage, 0, 0, '1', '', 'TechnicalInformation');
print '<br>';
}

View file

@ -3368,7 +3368,7 @@ if ($action == 'create') {
if (!getDolGlobalString('INVOICE_DISABLE_AUTOMATIC_RECURRING_INVOICE')) {
$text .= ' '.$langs->trans("ToCreateARecurringInvoiceGeneAuto", $langs->transnoentitiesnoconv('Module2300Name'));
}
print info_admin($text, 0, 0, 0, 'opacitymedium').'<br>';
print info_admin($text, 0, 0, '0', 'opacitymedium').'<br>';
}
print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST" id="formtocreate" name="formtocreate">';

View file

@ -232,7 +232,7 @@ $calcmode .= '</label>';
report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array('modecompta'=>$modecompta, 'showaccountdetail'=>$showaccountdetail), $calcmode);
if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, '1');
}
// Show report array

View file

@ -205,7 +205,7 @@ $calcmode .= '</label>';
report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array(), $calcmode);
if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, '1');
}

View file

@ -2,7 +2,7 @@
/* Copyright (C) 2016-2017 Jamal Elbaz <jamelbaz@gmail.com>
* Copyright (C) 2016-2022 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2018-2020 Laurent Destailleur <eldy@destailleur.fr>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -247,7 +247,7 @@ report_header($name, '', $period, $periodlink ?? '', $description, $builddate, $
if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, '1');
}

View file

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2018 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2018-2021 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2022 Alexandre Spangaro <aspangaro@open-dsi.fr>
*
* This program is free software; you can redistribute it and/or modify
@ -289,7 +289,7 @@ $description .= ' <input type="hidden" name="modecompta" value="'.$modecompta.'
report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array(), $calcmode);
if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, '1');
}

View file

@ -285,7 +285,7 @@ if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) {
report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode);
if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, '1');
}

View file

@ -3,7 +3,7 @@
* Copyright (C) 2004-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2013 Antoine Iauch <aiauch@gpcsolutions.fr>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2022 Alexandre Spangaro <aspangaro@open-dsi.fr>
*
* This program is free software; you can redistribute it and/or modify
@ -233,7 +233,7 @@ if (!empty($modecompta)) {
report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $moreparam, $calcmode);
if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, '1');
}

View file

@ -5,7 +5,7 @@
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
* Copyright (C) 2013 Antoine Iauch <aiauch@gpcsolutions.fr>
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2022 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
@ -262,7 +262,7 @@ if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) {
report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode);
if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, '1');
}

View file

@ -3,7 +3,7 @@
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2017 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2018-2020 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 Benjamin B. <b.crozon@trebisol.com>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
@ -212,7 +212,7 @@ report_header($name, $namelink, $period, $periodlink, $description, $builddate,
if (isModEnabled('accounting')) {
if ($modecompta != 'BOOKKEEPING') {
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, '1');
} else {
// Test if there is at least one line in bookkeeping
$pcgverid = getDolGlobalInt('CHARTOFACCOUNTS');
@ -234,7 +234,7 @@ if (isModEnabled('accounting')) {
$nb = $db->num_rows($resql);
if ($nb == 0) {
$langs->load("errors");
print info_admin($langs->trans("WarningNoDataTransferedInAccountancyYet"), 0, 0, 1);
print info_admin($langs->trans("WarningNoDataTransferedInAccountancyYet"), 0, 0, '1');
}
}
}

View file

@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2020 Maxime Kohlhaas <maxime@atm-consulting.fr>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
*
* 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
@ -205,7 +206,7 @@ report_header($name, $namelink, $period, $periodlink, $description, $builddate,
if (isModEnabled('accounting')) {
if ($modecompta != 'BOOKKEEPING') {
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, '1');
} else {
// Test if there is at least one line in bookkeeping
$pcgverid = getDolGlobalInt('CHARTOFACCOUNTS');
@ -227,7 +228,7 @@ if (isModEnabled('accounting')) {
$nb = $db->num_rows($resql);
if ($nb == 0) {
$langs->load("errors");
print info_admin($langs->trans("WarningNoDataTransferedInAccountancyYet"), 0, 0, 1);
print info_admin($langs->trans("WarningNoDataTransferedInAccountancyYet"), 0, 0, '1');
}
}
}

View file

@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2020 Maxime Kohlhaas <maxime@atm-consulting.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
*
* 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
@ -260,7 +261,7 @@ report_header($name, '', $period, $periodlink, $description, $builddate, $export
if (isModEnabled('accounting')) {
if ($modecompta != 'BOOKKEEPING') {
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, '1');
} else {
// Test if there is at least one line in bookkeeping
$pcgverid = getDolGlobalInt('CHARTOFACCOUNTS');
@ -282,7 +283,7 @@ if (isModEnabled('accounting')) {
$nb = $db->num_rows($resql);
if ($nb == 0) {
$langs->load("errors");
print info_admin($langs->trans("WarningNoDataTransferedInAccountancyYet"), 0, 0, 1);
print info_admin($langs->trans("WarningNoDataTransferedInAccountancyYet"), 0, 0, '1');
}
}
}

View file

@ -2,6 +2,7 @@
/* Copyright (C) 2020 Maxime Kohlhaas <maxime@atm-consulting.fr>
* Copyright (C) 2023 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
*
* 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
@ -240,7 +241,7 @@ report_header($name, '', $period, $periodlink, $description, $builddate, $export
if (isModEnabled('accounting')) {
if ($modecompta != 'BOOKKEEPING') {
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, '1');
} else {
// Test if there is at least one line in bookkeeping
$pcgverid = getDolGlobalInt('CHARTOFACCOUNTS');
@ -262,7 +263,7 @@ if (isModEnabled('accounting')) {
$nb = $db->num_rows($resql);
if ($nb == 0) {
$langs->load("errors");
print info_admin($langs->trans("WarningNoDataTransferedInAccountancyYet"), 0, 0, 1);
print info_admin($langs->trans("WarningNoDataTransferedInAccountancyYet"), 0, 0, '1');
}
}
}

View file

@ -1150,7 +1150,7 @@ if ($mode == 'graph') {
if ($sql && !defined('MAIN_CUSTOM_REPORT_KEEP_GRAPH_ONLY')) {
// Show admin info
print '<br>'.info_admin($langs->trans("SQLUsedForExport").':<br> '.$sql, 0, 0, 1, '', 'TechnicalInformation');
print '<br>'.info_admin($langs->trans("SQLUsedForExport").':<br> '.$sql, 0, 0, '1', '', 'TechnicalInformation');
}
print '<div>';

View file

@ -4,6 +4,7 @@
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2012 Charles-Fr BENKE <charles.fr@benke.fr>
* Copyright (C) 2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
*
* 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
@ -1277,7 +1278,7 @@ if ($step == 5 && $datatoexport) {
if ($sqlusedforexport && $user->admin) {
print info_admin($langs->trans("SQLUsedForExport").':<br> '.$sqlusedforexport, 0, 0, 1, '', 'TechnicalInformation');
print info_admin($langs->trans("SQLUsedForExport").':<br> '.$sqlusedforexport, 0, 0, '1', '', 'TechnicalInformation');
}

View file

@ -2261,7 +2261,7 @@ if ($action == 'create') {
if (!getDolGlobalString('INVOICE_DISABLE_AUTOMATIC_RECURRING_INVOICE')) {
$text .= ' '.$langs->trans("ToCreateARecurringInvoiceGeneAuto", $langs->transnoentitiesnoconv('Module2300Name'));
}
print info_admin($text, 0, 0, 0, 'opacitymedium').'<br>';
print info_admin($text, 0, 0, '0', 'opacitymedium').'<br>';
}
print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';

View file

@ -579,7 +579,7 @@ if ($step == 3 && $datatoimport) {
if ($format == 'xlsx' && !class_exists('XMLWriter')) {
$langs->load("install");
print info_admin($langs->trans("ErrorPHPDoesNotSupport", 'php-xml'), 0, 0, 1, 'error');
print info_admin($langs->trans("ErrorPHPDoesNotSupport", 'php-xml'), 0, 0, '1', 'error');
}

View file

@ -3584,7 +3584,7 @@ function main_area($title = '')
print $hookmanager->resPrint;
if (getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')) {
print info_admin($langs->trans("WarningYouAreInMaintenanceMode", getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')), 0, 0, 1, 'warning maintenancemode');
print info_admin($langs->trans("WarningYouAreInMaintenanceMode", getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')), 0, 0, '1', 'warning maintenancemode');
}
// Permit to add user company information on each printed document by setting SHOW_SOCINFO_ON_PRINT

View file

@ -3218,7 +3218,7 @@ if (empty($allowonlineinstall)) {
$message = info_admin($langs->trans('InstallModuleFromWebHasBeenDisabledContactUs'));
} else {
// Show technical message
$message = info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile", $dolibarrdataroot.'/installmodules.lock'), 0, 0, 1, 'warning');
$message = info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile", $dolibarrdataroot.'/installmodules.lock'), 0, 0, '1', 'warning');
}
print $message;

View file

@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2020 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
*
* 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
@ -259,10 +260,10 @@ if (is_array($results)) {
print '</b><br>';
if ($object->status == RecruitmentJobPosition::STATUS_RECRUITED) {
print info_admin($langs->trans("JobClosedTextCandidateFound"), 0, 0, 0, 'warning');
print info_admin($langs->trans("JobClosedTextCandidateFound"), 0, 0, '0', 'warning');
}
if ($object->status == RecruitmentJobPosition::STATUS_CANCELED) {
print info_admin($langs->trans("JobClosedTextCanceled"), 0, 0, 0, 'warning');
print info_admin($langs->trans("JobClosedTextCanceled"), 0, 0, '0', 'warning');
}
print '<br>';

View file

@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2020 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
*
* 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
@ -311,10 +312,10 @@ print '</b>';
print '</b><br>';
if ($object->status == RecruitmentJobPosition::STATUS_RECRUITED) {
print info_admin($langs->trans("JobClosedTextCandidateFound"), 0, 0, 0, 'warning');
print info_admin($langs->trans("JobClosedTextCandidateFound"), 0, 0, '0', 'warning');
}
if ($object->status == RecruitmentJobPosition::STATUS_CANCELED) {
print info_admin($langs->trans("JobClosedTextCanceled"), 0, 0, 0, 'warning');
print info_admin($langs->trans("JobClosedTextCanceled"), 0, 0, '0', 'warning');
}
print '<br>';

View file

@ -80,7 +80,6 @@ parameters:
- '#on array{url: mixed} in empty\(\) does not exist.#'
- '#dolCopyDir expects string, int given#'
- '#dol_copy expects string, int given#'
- '#info_admin expects string, int given#'
- '#dol_getIdFromCode expects string, int given#'
- '#dol_strlen expects string, int given#'
- '#dol_get_fiche_head expects string, int given#'