diff --git a/.travis.yml b/.travis.yml index bf810ea8cb4..3cc08657537 100644 --- a/.travis.yml +++ b/.travis.yml @@ -531,6 +531,9 @@ script: php upgrade.php 22.0.0 23.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade22002300.log || cat $TRAVIS_BUILD_DIR/upgrade22002300.log php upgrade2.php 22.0.0 23.0.0 > $TRAVIS_BUILD_DIR/upgrade22002300-2.log || cat $TRAVIS_BUILD_DIR/upgrade22002300-2.log php step5.php 22.0.0 23.0.0 > $TRAVIS_BUILD_DIR/upgrade22002300-3.log || cat $TRAVIS_BUILD_DIR/upgrade22002300-3.log + php upgrade.php 23.0.0 24.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade23002400.log || cat $TRAVIS_BUILD_DIR/upgrade23002400.log + php upgrade2.php 23.0.0 24.0.0 > $TRAVIS_BUILD_DIR/upgrade23002400-2.log || cat $TRAVIS_BUILD_DIR/upgrade23002400-2.log + php step5.php 23.0.0 24.0.0 > $TRAVIS_BUILD_DIR/upgrade23002400-3.log || cat $TRAVIS_BUILD_DIR/upgrade23002400-3.log set +e echo diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 06776a7034f..ed3a1a238d6 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -7,7 +7,7 @@ * Copyright (C) 2013 Florian Henry * Copyright (C) 2014 Cedric GROSS * Copyright (C) 2015 Alexandre Spangaro - * Copyright (C) 2018-2025 Frédéric France + * Copyright (C) 2018-2026 Frédéric France * Copyright (C) 2019 Ferran Marcet * Copyright (C) 2024-2025 MDW * @@ -2064,7 +2064,7 @@ if ($id > 0 && $action != 'create') { $delay_warning = getDolGlobalInt('MAIN_DELAY_ACTIONS_TODO') * 24 * 60 * 60; - // Confirmation suppression action + // Deletion confirmation action if ($action == 'delete') { print $form->formconfirm("card.php?id=".urlencode((string) ($id)), $langs->trans("DeleteAction"), $langs->trans("ConfirmDeleteAction"), "confirm_delete", '', '', 1); } diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index 181af7fb3f6..10608f0a599 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -25,7 +25,7 @@ /** * \file htdocs/contrat/contact.php * \ingroup contrat - * \brief Onglet de gestion des contacts des contrats + * \brief Tab for management of contracts */ // Load Dolibarr environment diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index 4a4698c0009..5a845a64cfb 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -2,7 +2,7 @@ /* Copyright (C) 2003-2007 Rodolphe Quiedeville * Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2024-2025 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2025 MDW * * This program is free software; you can redistribute it and/or modify @@ -22,7 +22,7 @@ /** * \file htdocs/product/stats/contrat.php * \ingroup product service contrat - * \brief Page des stats des contrats pour un produit + * \brief Page of contracts stats for a product */ // Load Dolibarr environment diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php index b428bacb346..a45fea52620 100644 --- a/htdocs/resource/element_resource.php +++ b/htdocs/resource/element_resource.php @@ -2,7 +2,7 @@ /* Copyright (C) 2013-2018 Jean-François Ferry * Copyright (C) 2016 Gilles Poirier * Copyright (C) 2019 Josep Lluís Amador - * Copyright (C) 2021-2025 Frédéric France + * Copyright (C) 2021-2026 Frédéric France * Copyright (C) 2023 William Mead * Copyright (C) 2024-2025 MDW * @@ -339,7 +339,7 @@ if ($ret == -1) { if (!$ret) { print '
'.$langs->trans('NoResourceInDatabase').'
'; } else { - // Confirmation suppression resource line + // Deletion confirmation resource line if ($action == 'delete_resource') { print $form->formconfirm("element_resource.php?element=".$element."&element_id=".$element_id."&id=".$id."&lineid=".$lineid, $langs->trans("DeleteResource"), $langs->trans("ConfirmDeleteResourceElement"), "confirm_delete_linked_resource", '', '', 1); } diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 74b60465dee..81eb2638482 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -310,17 +310,12 @@ if ($action == 'create') { print ""; } else { - /* ************************************************************************** */ - /* */ - /* Visu et edition */ - /* */ - /* ************************************************************************** */ if ($id) { $head = group_prepare_head($object); $title = $langs->trans("Group"); /* - * Confirmation suppression + * Deletion confirmation */ if ($action == 'delete') { print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("DeleteAGroup"), $langs->trans("ConfirmDeleteGroup", $object->name), "confirm_delete", '', 0, 1);