From de40214a09c908d76bbe2b8f552d924c98ac332e Mon Sep 17 00:00:00 2001
From: HENRY Florian <florian.henry@open-concept.pro>
Date: Tue, 20 May 2025 20:33:31 +0200
Subject: [PATCH 1/2] fix: multi filter journal in
 accountancy/bookkeeping/list.php and in export  (#34217)

* fix: filter journal IN

* fix: filter journal IN
---
 htdocs/accountancy/bookkeeping/list.php        | 2 +-
 htdocs/accountancy/class/bookkeeping.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 6337b50f85f..026d2e5b4c9 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -676,7 +676,7 @@ if (count($filter) > 0) {
 		} elseif ($key == 't.reconciled_option') {
 			$sqlwhere[] = 't.lettering_code IS NULL';
 		} elseif ($key == 't.code_journal' && !empty($value)) {
-			$sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
+			$sqlwhere[] = natural_search("t.code_journal", join(',', $value), 4, 1);
 		} else {
 			$sqlwhere[] = natural_search($key, $value, 0, 1);
 		}
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 021eabe999e..69d2fba04cd 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1053,7 +1053,7 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = natural_search($key, $value, 1, 1);
 				} elseif ($key == 't.code_journal' && !empty($value)) {
 					if (is_array($value)) {
-						$sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
+						$sqlwhere[] = natural_search("t.code_journal", join(',', $value), 4, 1);
 					} else {
 						$sqlwhere[] = natural_search("t.code_journal", $value, 3, 1);
 					}

From 4c6955017f6816516dcb4b50b16eb1618929f1b1 Mon Sep 17 00:00:00 2001
From: atm-lucas <121817516+atm-lucasmantegari@users.noreply.github.com>
Date: Tue, 20 May 2025 21:47:08 +0200
Subject: [PATCH 2/2] Adding mapping to module rights (#34212)

---
 htdocs/user/class/user.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index c7feb5d408e..3b383a50be3 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -718,6 +718,7 @@ class User extends CommonObject
 			'mo' => 'mrp',
 			'order' => 'commande',
 			'produit' => 'product',
+			'productlot' => 'produit',
 			'project' => 'projet',
 			'propale' => 'propal',
 			'shipping' => 'expedition',