diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 64c6d399966..b7f657866c9 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -9,6 +9,7 @@ * Copyright (C) 2015-2016 Abbes Bahfir * Copyright (C) 2018-2022 Philippe Grand * Copyright (C) 2020 Frédéric France + * Copyright (C) 2023 Benjamin Grembi * * 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 @@ -1275,9 +1276,9 @@ if ($action == 'create') { print ''; if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) { - // Duration + // Duration in time print ''; - print ''; + print ''; print ''; } diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php index d5a7a7079b2..20a78a21ab9 100644 --- a/htdocs/modulebuilder/index.php +++ b/htdocs/modulebuilder/index.php @@ -1,6 +1,7 @@ * Copyright (C) 2018-2019 Nicolas ZABOURI + * Copyright (C) 2023 Alexandre Janniaux * * 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 @@ -1334,6 +1335,11 @@ if ($dirins && $action == 'initobject' && $module && $objectname) { setEventMessages($langs->trans("FileAlreadyExists", $destfile), null, 'warnings'); } } + $arrayreplacement = array( + '/myobject\.class\.php/' => strtolower($objectname).'.class.php', + '/myobject\.lib\.php/' => strtolower($objectname).'.lib.php', + ); + dolReplaceInFile($destdir.'/'.$destfile, $arrayreplacement, '', 0, 0, 1); } }
'.$langs->trans("TotalDuration").''.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).''.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).' ('.convertDurationtoHour($object->duration, "s").' '.$langs->trans("h").')