diff --git a/Excel/backup/Ratio_Cuisine_20251126.xlsm b/Excel/backup/Ratio_Cuisine_20251126.xlsm deleted file mode 100644 index 38fc260..0000000 Binary files a/Excel/backup/Ratio_Cuisine_20251126.xlsm and /dev/null differ diff --git a/Excel/backup/Ratio_Cuisine_20251128.xlsm b/Excel/backup/Ratio_Cuisine_20251128.xlsm deleted file mode 100644 index b4c5360..0000000 Binary files a/Excel/backup/Ratio_Cuisine_20251128.xlsm and /dev/null differ diff --git a/Excel/backup/Ratio_Cuisine_20251203.xlsm b/Excel/backup/Ratio_Cuisine_20251203.xlsm deleted file mode 100644 index 65d79ea..0000000 Binary files a/Excel/backup/Ratio_Cuisine_20251203.xlsm and /dev/null differ diff --git a/Excel/backup/Ratio_Cuisine_20251205.xlsm b/Excel/backup/Ratio_Cuisine_20251205.xlsm deleted file mode 100644 index f93faca..0000000 Binary files a/Excel/backup/Ratio_Cuisine_20251205.xlsm and /dev/null differ diff --git a/Excel/backup/Ratio_Cuisine_Vers4.1.23.xlsm b/Excel/backup/Ratio_Cuisine_Vers4.1.23.xlsm new file mode 100644 index 0000000..1285ffa Binary files /dev/null and b/Excel/backup/Ratio_Cuisine_Vers4.1.23.xlsm differ diff --git a/Excel/backup/Ratio_Restauration_20251126.xlsm b/Excel/backup/Ratio_Restauration_20251126.xlsm deleted file mode 100644 index ecea7fc..0000000 Binary files a/Excel/backup/Ratio_Restauration_20251126.xlsm and /dev/null differ diff --git a/Excel/backup/Ratio_Restauration_20251128.xlsm b/Excel/backup/Ratio_Restauration_20251128.xlsm deleted file mode 100644 index ad05025..0000000 Binary files a/Excel/backup/Ratio_Restauration_20251128.xlsm and /dev/null differ diff --git a/Excel/backup/Ratio_Restauration_20251129.xlsm b/Excel/backup/Ratio_Restauration_20251129.xlsm deleted file mode 100644 index ad05025..0000000 Binary files a/Excel/backup/Ratio_Restauration_20251129.xlsm and /dev/null differ diff --git a/Excel/backup/Ratio_Restauration_20251130.xlsm b/Excel/backup/Ratio_Restauration_20251130.xlsm deleted file mode 100644 index dec26d2..0000000 Binary files a/Excel/backup/Ratio_Restauration_20251130.xlsm and /dev/null differ diff --git a/Excel/backup/Ratio_Restauration_20251201.xlsm b/Excel/backup/Ratio_Restauration_20251201.xlsm deleted file mode 100644 index 21a6cea..0000000 Binary files a/Excel/backup/Ratio_Restauration_20251201.xlsm and /dev/null differ diff --git a/Excel/backup/Ratio_Restauration_20251202.xlsm b/Excel/backup/Ratio_Restauration_20251202.xlsm deleted file mode 100644 index 690d8fa..0000000 Binary files a/Excel/backup/Ratio_Restauration_20251202.xlsm and /dev/null differ diff --git a/Excel/backup/Ratio_Restauration_20251203.xlsm b/Excel/backup/Ratio_Restauration_20251203.xlsm deleted file mode 100644 index 4055c74..0000000 Binary files a/Excel/backup/Ratio_Restauration_20251203.xlsm and /dev/null differ diff --git a/Excel/backup/Ratio_Restauration_20251205.xlsm b/Excel/backup/Ratio_Restauration_20251205.xlsm deleted file mode 100644 index cfb0c98..0000000 Binary files a/Excel/backup/Ratio_Restauration_20251205.xlsm and /dev/null differ diff --git a/Excel/backup/Ratio_Restauration_Vers1.0.41.xlsm b/Excel/backup/Ratio_Restauration_Vers1.0.41.xlsm new file mode 100644 index 0000000..cf89b9d Binary files /dev/null and b/Excel/backup/Ratio_Restauration_Vers1.0.41.xlsm differ diff --git a/Excel/backup/Ratio_Restauration_Vers1.0.42.xlsm b/Excel/backup/Ratio_Restauration_Vers1.0.42.xlsm new file mode 100644 index 0000000..e236a82 Binary files /dev/null and b/Excel/backup/Ratio_Restauration_Vers1.0.42.xlsm differ diff --git a/Excel/backup/Ratio_Restauration_Vers1.0.43.xlsm b/Excel/backup/Ratio_Restauration_Vers1.0.43.xlsm new file mode 100644 index 0000000..c7a7215 Binary files /dev/null and b/Excel/backup/Ratio_Restauration_Vers1.0.43.xlsm differ diff --git a/Excel/prod/Ratio_Cuisine.xlsm b/Excel/prod/Ratio_Cuisine.xlsm index f93faca..a27bb7c 100644 Binary files a/Excel/prod/Ratio_Cuisine.xlsm and b/Excel/prod/Ratio_Cuisine.xlsm differ diff --git a/Excel/prod/Ratio_Cuisine_VERSION.txt b/Excel/prod/Ratio_Cuisine_VERSION.txt index 9202354..a91bd6f 100644 --- a/Excel/prod/Ratio_Cuisine_VERSION.txt +++ b/Excel/prod/Ratio_Cuisine_VERSION.txt @@ -1,2 +1,2 @@ -4.1.21 -2025-12-05 +4.1.24 +2025-12-06 diff --git a/Excel/prod/Ratio_Restauration.xlsm b/Excel/prod/Ratio_Restauration.xlsm index cfb0c98..c7a7215 100644 Binary files a/Excel/prod/Ratio_Restauration.xlsm and b/Excel/prod/Ratio_Restauration.xlsm differ diff --git a/Excel/prod/Ratio_Restauration_VERSION.txt b/Excel/prod/Ratio_Restauration_VERSION.txt index b9c51a0..bb8e905 100644 --- a/Excel/prod/Ratio_Restauration_VERSION.txt +++ b/Excel/prod/Ratio_Restauration_VERSION.txt @@ -1,2 +1,2 @@ -1.0.38 -2025-12-05 +1.0.44 +2025-12-07 diff --git a/Scripts/Maj_prod_Cuisine.bat b/Scripts/Maj_prod_Cuisine.bat index 022ca8c..ad78e31 100644 --- a/Scripts/Maj_prod_Cuisine.bat +++ b/Scripts/Maj_prod_Cuisine.bat @@ -4,9 +4,14 @@ setlocal ENABLEDELAYEDEXPANSION REM --- Se place dans le dossier du .bat --- cd /d "%~dp0" -REM === 1) MISE À JOUR DE VERSION === REM Chemin du fichier de version pour la CUISINE -set VERSION_FILE=..\Excel\prod\Ratio_Cuisine_VERSION.txt +set "VERSION_FILE=..\Excel\prod\Ratio_Cuisine_VERSION.txt" + +REM On lit l'ANCIENNE version avant de la mettre à jour (pour nommer la sauvegarde) +set "OLD_VERSION=" +if exist "%VERSION_FILE%" ( + set /p OLD_VERSION=<"%VERSION_FILE%" +) echo Mise à jour de version... python "maj_version.py" "%VERSION_FILE%" @@ -43,11 +48,13 @@ if not exist "%BACKUP_DIR%" ( mkdir "%BACKUP_DIR%" ) -REM === 3) GÉNÉRATION DE LA DATE AU FORMAT AAAAMMJJ (via PowerShell) === -for /f %%a in ('powershell -NoProfile -Command "Get-Date -Format yyyyMMdd"') do set TODAY=%%a - -REM Le fichier de sauvegarde va maintenant dans BACKUP_DIR -set BACKUP=%BACKUP_DIR%\Ratio_Cuisine_%TODAY%.xlsm +REM === 3) NOM DU FICHIER DE SAUVEGARDE AVEC ANCIENNE VERSION === +if "%OLD_VERSION%"=="" ( + REM Sécurité : si on n'a pas réussi à lire la version, on met un nom générique + set "BACKUP=%BACKUP_DIR%\Ratio_Cuisine_sansVersion.xlsm" +) else ( + set "BACKUP=%BACKUP_DIR%\Ratio_Cuisine_Vers%OLD_VERSION%.xlsm" +) REM === 4) COPIE VERS PROD === echo Copie vers la version de production... diff --git a/Scripts/Maj_prod_Restauration.bat b/Scripts/Maj_prod_Restauration.bat index e19bd47..bf31fb8 100644 --- a/Scripts/Maj_prod_Restauration.bat +++ b/Scripts/Maj_prod_Restauration.bat @@ -6,17 +6,20 @@ cd /d "%~dp0" echo --- Mise en prod Ratio_Restauration --- -REM === 1) MISE À JOUR DE VERSION === -REM Fichier de version pour la restauration -set VERSION_FILE=..\Excel\prod\Ratio_Restauration_VERSION.txt +REM Chemin du fichier de version pour la RESTAURATION +set "VERSION_FILE=..\Excel\prod\Ratio_Restauration_VERSION.txt" + +REM On lit l'ANCIENNE version pour la sauvegarde +set "OLD_VERSION=" +if exist "%VERSION_FILE%" ( + set /p OLD_VERSION=<"%VERSION_FILE%" +) echo Mise à jour de version... python "maj_version.py" "%VERSION_FILE%" -REM Si tu utilises 'py' au lieu de 'python', commente la ligne ci-dessus et décommente celle-ci : -REM py "maj_version.py" "%VERSION_FILE%" if errorlevel 1 ( echo ERREUR lors de la mise à jour de version. - endlocal + pause exit /b 1 ) @@ -46,10 +49,13 @@ if not exist "%DST_DIR%" ( exit /b 1 ) -REM === 3) GÉNÉRATION DE LA DATE AU FORMAT AAAAMMJJ === -for /f %%a in ('powershell -NoProfile -Command "Get-Date -Format yyyyMMdd"') do set TODAY=%%a - -set BACKUP=%BACKUP_DIR%\Ratio_Restauration_%TODAY%.xlsm +REM === NOM DU FICHIER DE SAUVEGARDE AVEC ANCIENNE VERSION === +if "%OLD_VERSION%"=="" ( + REM Sécurité si la lecture a échoué + set "BACKUP=%BACKUP_DIR%\Ratio_Restauration_sansVersion.xlsm" +) else ( + set "BACKUP=%BACKUP_DIR%\Ratio_Restauration_Vers%OLD_VERSION%.xlsm" +) REM === 4) COPIE VERS PROD === echo Copie vers la version de production...