vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Version

Browse source
This commit is contained in:
Laurent Destailleur 2026-06-08 12:54:46 +02:00
parent 979a95e7c7
commit 791b1e4a3f
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
htdocs/admin/modules.php
View file

@ -942,12 +942,19 @@ if ($mode == 'common' || $mode == 'commonkanban') {
// We discard showing according to filters
if ($search_keyword) {
$qualified = 0;
if (preg_match('/'.preg_quote($search_keyword, '/').'/i', $modulename)
|| preg_match('/'.preg_quote($search_keyword, '/').'/i', $moduletechnicalname)
|| ($moduledesc && preg_match('/'.preg_quote($search_keyword, '/').'/i', $moduledesc))
|| ($moduledesclong && preg_match('/'.preg_quote($search_keyword, '/').'/i', $moduledesclong))
|| ($moduleauthor && preg_match('/'.preg_quote($search_keyword, '/').'/i', $moduleauthor))
) {
$search_keyword_array = explode(' ', $search_keyword);
$foundkeyword = 1;
foreach ($search_keyword_array as $word) {
if (!preg_match('/'.preg_quote($word, '/').'/i', $modulename)
&& !preg_match('/'.preg_quote($word, '/').'/i', $moduletechnicalname)
&& !($moduledesc && preg_match('/'.preg_quote($word, '/').'/i', $moduledesc))
&& !($moduledesclong && preg_match('/'.preg_quote($word, '/').'/i', $moduledesclong))
&& !($moduleauthor && preg_match('/'.preg_quote($word, '/').'/i', $moduleauthor))
) {
$foundkeyword = 0;
}
}
if ($foundkeyword) {
$qualified = 1;
}
if (!$qualified) {

10
htdocs/core/modules/modBlockedLog.class.php
View file

@ -352,7 +352,15 @@ class modBlockedLog extends DolibarrModules
// Special message for France
if ($mysoc->country_code == 'FR') {
$islne = isALNEQualifiedVersion(1, 1);
$versionbadge = '<span class="badge-text badge-secondary">'.DOL_VERSION.'</span>';
$versionbadge = '<span class="badge-text badge-secondary">'.getBlockedLogVersionToShow();
/*
if ($mysoc->country_code == 'FR' && !constant('CERTIF_LNE')) {
// Can add an edditional mention
$versionbadge .= ' - '.$langs->trans("NeedAThirdPartyStatement");
}
*/
$versionbadge .= '</span>';
if ($islne) {
if (preg_match('/\-/', DOL_VERSION)) {
// This is an alpha or beta version