From 368f3d74b7de5b4d0a6aadc2479eb04f7cf5453e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 13 Aug 2026 19:21:32 +0200 Subject: [PATCH 1/6] Debug v24 --- dev/build/generate_filelist_xml.php | 10 +++++----- htdocs/blockedlog/versionmod.inc.php | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev/build/generate_filelist_xml.php b/dev/build/generate_filelist_xml.php index 51996dd1468..146701579f9 100755 --- a/dev/build/generate_filelist_xml.php +++ b/dev/build/generate_filelist_xml.php @@ -419,12 +419,12 @@ foreach ($arrayofunalterablefiles as $entry) { exit(1); } if ($newdir != $dir) { - //if ($needtoclose) { - if ($release) { - fputs($fp, ' '."\n"); - } + if ($needtoclose) { + if ($release) { + fputs($fp, ' '."\n"); + } $needtoclose = 0; - //} + } if ($release) { fputs($fp, ' '."\n"); } diff --git a/htdocs/blockedlog/versionmod.inc.php b/htdocs/blockedlog/versionmod.inc.php index 811c007acda..429642742b7 100644 --- a/htdocs/blockedlog/versionmod.inc.php +++ b/htdocs/blockedlog/versionmod.inc.php @@ -22,9 +22,9 @@ */ // 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'); +// Can be: 3.0.0-beta (beta can't be certified) +// Or for stable: 3.0.0 (certification mechanism) or 3b.0.0 (french attestation mechanism). +define('DOLCERT_VERSION', '3b.0.0'); // 1 was used for beta version candidate for certification, or for stable version that has been certified. From 8ab7bc1a1d4c970f22db94b7cb6cd437a3aec8ae Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 13 Aug 2026 19:25:07 +0200 Subject: [PATCH 2/6] Version --- htdocs/blockedlog/versionmod.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/blockedlog/versionmod.inc.php b/htdocs/blockedlog/versionmod.inc.php index 429642742b7..d3d77b62198 100644 --- a/htdocs/blockedlog/versionmod.inc.php +++ b/htdocs/blockedlog/versionmod.inc.php @@ -23,8 +23,8 @@ // 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 3b.0.0 (french attestation mechanism). -define('DOLCERT_VERSION', '3b.0.0'); +// Or for stable: 3.0.0 (certification mechanism or french attestation mechanism). +define('DOLCERT_VERSION', '3.0.0'); // 1 was used for beta version candidate for certification, or for stable version that has been certified. From a111a3adc7d903239cb249d62d421999b2e04d31 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 13 Aug 2026 19:58:44 +0200 Subject: [PATCH 3/6] Doc --- htdocs/blockedlog/lib/blockedlog.lib.php | 9 +++++---- htdocs/blockedlog/versionmod.inc.php | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/htdocs/blockedlog/lib/blockedlog.lib.php b/htdocs/blockedlog/lib/blockedlog.lib.php index 106fcdf56e4..71d16f9009f 100644 --- a/htdocs/blockedlog/lib/blockedlog.lib.php +++ b/htdocs/blockedlog/lib/blockedlog.lib.php @@ -1,7 +1,8 @@ - * Copyright (C) 2024 MDW - * Copyright (C) 2026 Frédéric France +/* Copyright (C) 2017 ATM Consulting + * Copyright (C) 2018 Destailleur Laurent + * Copyright (C) 2024 MDW + * Copyright (C) 2026 Frédéric France * * 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,7 +38,7 @@ 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. }; return $versionbadge; diff --git a/htdocs/blockedlog/versionmod.inc.php b/htdocs/blockedlog/versionmod.inc.php index d3d77b62198..9ad17b446bc 100644 --- a/htdocs/blockedlog/versionmod.inc.php +++ b/htdocs/blockedlog/versionmod.inc.php @@ -24,6 +24,7 @@ // 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'); From 6b3b1e05894d501ff9858f9c951cbe92b88f698b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 13 Aug 2026 20:13:30 +0200 Subject: [PATCH 4/6] Doc --- htdocs/blockedlog/lib/blockedlog.lib.php | 5 ++++- htdocs/blockedlog/versionmod.inc.php | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/htdocs/blockedlog/lib/blockedlog.lib.php b/htdocs/blockedlog/lib/blockedlog.lib.php index 71d16f9009f..c5279f476c6 100644 --- a/htdocs/blockedlog/lib/blockedlog.lib.php +++ b/htdocs/blockedlog/lib/blockedlog.lib.php @@ -39,7 +39,10 @@ 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); // Not yet required. - }; + if (constant('DOLCERT_NAME') != 'BlockedLog') { + $versionbadge = constant('DOLCERT_NAME').'-'.$versionbadge; + } + } return $versionbadge; } diff --git a/htdocs/blockedlog/versionmod.inc.php b/htdocs/blockedlog/versionmod.inc.php index 9ad17b446bc..9322235ce01 100644 --- a/htdocs/blockedlog/versionmod.inc.php +++ b/htdocs/blockedlog/versionmod.inc.php @@ -21,13 +21,16 @@ * \brief File included by main files of the Unalterable Log module */ +// 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. // 0 was used for old version, for version not certified but compliant with the law by using an attestation of an IT provider that guarantee @@ -36,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. From ec33d4fab06c0c9febbb91f10ef6d776911b6d23 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 13 Aug 2026 20:14:53 +0200 Subject: [PATCH 5/6] Debug v24 --- htdocs/blockedlog/lib/blockedlog.lib.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/blockedlog/lib/blockedlog.lib.php b/htdocs/blockedlog/lib/blockedlog.lib.php index c5279f476c6..4ad02f20803 100644 --- a/htdocs/blockedlog/lib/blockedlog.lib.php +++ b/htdocs/blockedlog/lib/blockedlog.lib.php @@ -39,9 +39,10 @@ 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); // Not yet required. - if (constant('DOLCERT_NAME') != 'BlockedLog') { - $versionbadge = constant('DOLCERT_NAME').'-'.$versionbadge; - } + } + + if (constant('DOLCERT_NAME') != 'BlockedLog') { // Can add a prefix namevefore version text for clarity. + $versionbadge = constant('DOLCERT_NAME').'-'.$versionbadge; } return $versionbadge; From 5706222c3df4a18cf862d043577f6212a641d982 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 14 Aug 2026 02:34:28 +0200 Subject: [PATCH 6/6] Fix MAIN_INFO_SOCIETE_VAT_EXEMPTION_CODE not saved --- htdocs/admin/company.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 5c5bd9c3531..2ffcf6a1763 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -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);