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

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0

Browse source
This commit is contained in:
ldestailleur 2025-06-02 14:27:14 +02:00
commit 9a8a07e85a
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
htdocs/accountancy/class/bookkeeping.class.php
View file

@ -1068,7 +1068,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", (string) join(',', $value), 3, 1);
} else {
$sqlwhere[] = natural_search("t.code_journal", $value, 3, 1);
}

1
htdocs/user/class/user.class.php
View file

@ -697,6 +697,7 @@ class User extends CommonObject
'mo' => 'mrp',
'order' => 'commande',
'produit' => 'product',
'productlot' => 'produit',
'project' => 'projet',
'propale' => 'propal',
'shipping' => 'expedition',