Merge branch '24.0' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2026-08-14 02:37:17 +02:00
commit b4db290594
4 changed files with 26 additions and 15 deletions

View file

@ -419,12 +419,12 @@ foreach ($arrayofunalterablefiles as $entry) {
exit(1);
}
if ($newdir != $dir) {
//if ($needtoclose) {
if ($release) {
fputs($fp, ' </dir>'."\n");
}
if ($needtoclose) {
if ($release) {
fputs($fp, ' </dir>'."\n");
}
$needtoclose = 0;
//}
}
if ($release) {
fputs($fp, ' <dir name="'.$newdir.'">'."\n");
}

View file

@ -269,6 +269,9 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
}
dolibarr_set_const($db, "FACTURE_TVAOPTION", $usevat, 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "MAIN_INFO_SOCIETE_VAT_EXEMPTION_CODE", GETPOST('MAIN_INFO_SOCIETE_VAT_EXEMPTION_CODE'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "FACTURE_LOCAL_TAX1_OPTION", $uselocaltax1, 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "FACTURE_LOCAL_TAX2_OPTION", $uselocaltax2, 'chaine', 0, '', $conf->entity);

View file

@ -1,7 +1,8 @@
<?php
/* Copyright (C) 2017 ATM Consulting <contact@atm-consulting.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2026 Frédéric France <frederic.france@free.fr>
/* Copyright (C) 2017 ATM Consulting <contact@atm-consulting.fr>
* Copyright (C) 2018 Destailleur Laurent <eldy@users.sourceforge.net>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2026 Frédéric France <frederic.france@free.fr>
*
* 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
@ -37,8 +38,12 @@ function getBlockedLogVersionToShow()
// Protection if we used a past old version not yet certified, we change version shown.
if (!constant('CERTIF_LNE')) { // Hard coded in version
$versionbadge = preg_replace('/^(\d)\./', '\1b.', $versionbadge);
};
// $versionbadge = preg_replace('/^(\d)\./', '\1b.', $versionbadge); // Not yet required.
}
if (constant('DOLCERT_NAME') != 'BlockedLog') { // Can add a prefix namevefore version text for clarity.
$versionbadge = constant('DOLCERT_NAME').'-'.$versionbadge;
}
return $versionbadge;
}

View file

@ -21,11 +21,15 @@
* \brief File included by main files of the Unalterable Log module
*/
// The version of the POS system (Immutable Log system)
// Can be 3.0.0-beta when not yet certified
// 3.0.0 once certified
define('DOLCERT_VERSION', '3.0.0');
// The name of the module to manage the Unalterable Log.
// If you develop a different application, your can change this name.
define('DOLCERT_NAME', 'BlockedLog'); // Blockedlog = "Log inalterables" in french.
// The version of the POS system (Immutable Log system)
// Can be: 3.0.0-beta (beta can't be certified)
// Or for stable: 3.0.0 (certification mechanism or french attestation mechanism).
// This is the constant used to build answer of function getBlockedLogVersionToShow().
define('DOLCERT_VERSION', '3.0.0');
// 1 was used for beta version candidate for certification, or for stable version that has been certified.
// 2 to force LNE features for debug purposes (integrity of files will be broken). It just has one difference with 1: https is not required in this mode helping to work in development environment.
@ -35,7 +39,6 @@ if (!defined('CERTIF_LNE')) {
define('CERTIF_LNE', '0');
}
// Array of dir/files to include in the signature of the scope of the certification files.
// This array will be used by the script: dev/buikd/generate_filelist_xml.php release=auto
// to generate the filelist.xml file.