From 888a28b687047bf41dd294c1ace04e3fdffd4c43 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 May 2025 18:05:59 +0200 Subject: [PATCH 1/3] PHPStan > Update baseline (#34158) Co-authored-by: Dolibot --- dev/build/phpstan/phpstan-baseline.neon | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon index 265618f0b1d..cb1bc311968 100644 --- a/dev/build/phpstan/phpstan-baseline.neon +++ b/dev/build/phpstan/phpstan-baseline.neon @@ -13116,12 +13116,6 @@ parameters: count: 1 path: ../../../htdocs/eventorganization/conferenceorbooth_contact.php - - - message: '#^Variable \$permission might not be defined\.$#' - identifier: variable.undefined - count: 3 - path: ../../../htdocs/eventorganization/conferenceorbooth_contact.php - - message: '#^Call to function method_exists\(\) with Project and ''fetchComments'' will always evaluate to true\.$#' identifier: function.alreadyNarrowedType From 0de4e225fb702681d7e9d19ecda1c1da170a357e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= <142790847+clementgde@users.noreply.github.com> Date: Thu, 15 May 2025 18:10:12 +0200 Subject: [PATCH 2/3] QUAL harmonization between statistical sections (#34160) * QUAL Color harmonization between statistical sections * Update index.php --- htdocs/ticket/stats/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php index f020f29bf15..3e506311658 100644 --- a/htdocs/ticket/stats/index.php +++ b/htdocs/ticket/stats/index.php @@ -209,7 +209,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; //print ''; //print ''; //print ''; @@ -237,7 +237,7 @@ foreach ($data as $val) { print ''; print ''; print ''; - print ''; + print ''; //print ''; //print ''; //print ''; From 84f293ebe7f0ed081bee46dc0269864394b93385 Mon Sep 17 00:00:00 2001 From: Norbert Penel Date: Thu, 15 May 2025 18:11:36 +0200 Subject: [PATCH 3/3] FIX right name (#34163) right name have changed OLD BUG !!! report it on dol20 branch also, please --- htdocs/societe/paymentmodes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php index d27f6dc03cb..efb98fff435 100644 --- a/htdocs/societe/paymentmodes.php +++ b/htdocs/societe/paymentmodes.php @@ -92,7 +92,7 @@ $hookmanager->initHooks(array('thirdpartybancard', 'globalcard')); $permissiontoread = $user->hasRight('societe', 'lire'); $permissiontoadd = $user->hasRight('societe', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_builddoc.inc.php -$permissiontoaddupdatepaymentinformation = $user->hasRight('societe', 'thirdparty_paymentinformation_advance', 'write'); +$permissiontoaddupdatepaymentinformation = $user->hasRight('societe', 'thirdparty_paymentinformation', 'write'); // Check permission on company $result = restrictedArea($user, 'societe', '', '');
'.$langs->trans("Year").''.$langs->trans("NbOfTickets").'%%'.$langs->trans("AmountTotal").'%'.$langs->trans("AmountAverage").'
0 ? '&userid='.$userid : '').'">'.$year.''.$val['nb'].''.round(isset($val['nb_diff']) ? $val['nb_diff'] : 0).''.round(isset($val['nb_diff']) ? $val['nb_diff'] : 0).'%'.price(price2num($val['total'], 'MT'), 1).''.round($val['total_diff']).''.price(price2num($val['avg'], 'MT'), 1).'