diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index cbfecbbc19f..461db52f959 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -283,6 +283,9 @@ RESTLER:
elseif (count($value) && isset($value[0]) && is_numeric($value[0]))
+* Add CommentParser.php line 406 & 407 to remove a warning on api request in php 8.1
+ empty($value[0]) ? null :
+ empty($value[1]) ? null :
+With swagger 2 provided into /explorer:
----------------------------------------
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 2a15c74c948..aad41d10ec9 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -1177,6 +1177,15 @@ if ($action == 'create') {
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteRepeatableInvoice'), $langs->trans('ConfirmDeleteRepeatableInvoice'), 'confirm_deleteinvoice', '', 'no', 1);
}
+ // Call Hook formConfirm
+ $parameters = array('formConfirm' => $formconfirm);
+ $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ if (empty($reshook)) {
+ $formconfirm .= $hookmanager->resPrint;
+ } elseif ($reshook > 0) {
+ $formconfirm = $hookmanager->resPrint;
+ }
+
print $formconfirm;
$author = new User($db);
@@ -1653,33 +1662,41 @@ if ($action == 'create') {
*/
print '
';
- if (empty($object->suspended)) {
- if ($user->rights->facture->creer) {
- if (!empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max)) {
- print '
';
- } else {
- if (empty($object->frequency) || $object->date_when <= $nowlasthour) {
- print '
';
- } else {
- print '
';
- }
- }
- } else {
- print '
';
- }
- }
-
- if ($user->rights->facture->creer) {
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ if (empty($reshook)) {
+ $params = array(
+ 'attr' => array(
+ 'class' => 'classfortooltip',
+ ),
+ );
if (empty($object->suspended)) {
- print '
';
- } else {
- print '
';
+ if ($user->rights->facture->creer) {
+ if (!empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max)) {
+ print '
';
+ } else {
+ if (empty($object->frequency) || $object->date_when <= $nowlasthour) {
+ print '
';
+ } else {
+ print '
';
+ }
+ }
+ } else {
+ print '
';
+ }
}
+
+ if ($user->rights->facture->creer) {
+ if (empty($object->suspended)) {
+ print '
';
+ } else {
+ print '
';
+ }
+ }
+
+ // Delete
+ print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=delete&token=' . newToken(), 'delete', $user->rights->facture->supprimer);
}
-
- // Delete
- print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $user->rights->facture->supprimer);
-
print '
';
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index f2a185e534d..3dc618c36ab 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -175,7 +175,7 @@ class FormTicket
print dol_get_fiche_head(null, 'card', '', 0, '');
}
- print '