Skip to content

#1843 [Index] feat: ne pas mettre à jour un module qui demande un Saturne plus récent #1845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolas-eoxia merged 1 commit into from
Nov 2, 2026
Merged

#1843 [Index] feat: ne pas mettre à jour un module qui demande un Saturne plus récent #1845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions core/tpl/index/index_view.tpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,22 @@


$moduleUpdateNeededDolibarrVersion = '';
$moduleUpdateNeededSaturneVersion = '';
$saturneVersion = '';

if (getDolGlobalString($moduleVersion) !== $modModule->version) {
// init() is called here without the Dolibarr version check activateModule() makes first: once remove() has run, a refused init() leaves the module disabled in this entity
$neededDolibarrVersion = $modModule->need_dolibarr_version ?? 0;
// Same for Saturne, shipped separately: the module declares in need_saturne_version the oldest one its code runs on
$neededSaturneVersion = $modModule->need_saturne_version ?? 0;
if (is_array($neededSaturneVersion)) {
require_once __DIR__ . '/../../modules/modSaturne.class.php';
$saturneVersion = (new modSaturne($db))->version;
}
if (is_array($neededDolibarrVersion) && versioncompare(versiondolibarrarray(), $neededDolibarrVersion) < 0) {
$moduleUpdateNeededDolibarrVersion = versiontostring($neededDolibarrVersion);
} elseif (is_array($neededSaturneVersion) && versioncompare(explode('.', $saturneVersion), $neededSaturneVersion) < 0) {
$moduleUpdateNeededSaturneVersion = versiontostring($neededSaturneVersion);
} else {
$modModule->remove();
if ($modModule->init() > 0) {
Expand All @@ -101,6 +111,16 @@
</div>
<?php endif;

if (dol_strlen($moduleUpdateNeededSaturneVersion) > 0) : ?>
<div class="wpeo-notice notice-warning">
<div class="notice-content">
<div class="notice-subtitle"><strong><?php echo $langs->trans('ModuleUpdate', $moduleName); ?></strong>
<?php echo $langs->trans('ModuleUpdateNeedSaturneVersion', $modModule->version, $moduleUpdateNeededSaturneVersion, $saturneVersion) ?>
</div>
</div>
</div>
<?php endif;

if (getDolGlobalInt($moduleJustUpdated) === 1) : ?>
<div class="wpeo-notice notice-success">
<div class="notice-content">
Expand Down
1 change: 1 addition & 0 deletions langs/en_US/saturne.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ ModuleArea = Welcome to %s
ModuleUpdate = Update of %s :
ModuleHasBeenUpdatedTo = %s has been updated to %s
ModuleUpdateNeedDolibarrVersion = version %s requires Dolibarr %s or higher (current version: %s). Upgrade Dolibarr first: until then, the module stays as it is.
ModuleUpdateNeedSaturneVersion = version %s requires Saturne %s or higher (current version: %s). Upgrade Saturne first: until then, the module stays as it is.
ModuleUpdateFailed = Update of %s to version %s failed
ModulePatchNote = Update note %s %s
ShowPatchNote = See the update note
Expand Down
1 change: 1 addition & 0 deletions langs/fr_FR/saturne.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ ModuleArea = Bienvenue sur %s
ModuleUpdate = Mise à jour de %s :
ModuleHasBeenUpdatedTo = %s a été mis à jour en version %s
ModuleUpdateNeedDolibarrVersion = la version %s demande Dolibarr %s ou plus (version actuelle : %s). Mettez d'abord Dolibarr à jour : d'ici là, le module reste dans son état actuel.
ModuleUpdateNeedSaturneVersion = la version %s demande Saturne %s ou plus (version actuelle : %s). Mettez d'abord Saturne à jour : d'ici là, le module reste dans son état actuel.
ModuleUpdateFailed = La mise à jour de %s en version %s a échoué
ModulePatchNote = Note de mise à jour %s %s
ShowPatchNote = Consulter la note de mise à jour
Expand Down
Loading