Merge pull request #19624 from 1ocate/FIX_05_author_searching_include_first_and_last_name

Fix author searching include first and last name
This commit is contained in:
Laurent Destailleur 2021-12-16 17:09:44 +01:00 committed by GitHub
commit 39b4586957
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions

View File

@ -564,7 +564,7 @@ if ($search_multicurrency_montant_ttc != '') {
$sql .= natural_search('f.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
}
if ($search_login) {
$sql .= natural_search('u.login', $search_login);
$sql .= natural_search(array('u.lastname', 'u.firstname', 'u.login'), $search_login);
}
if ($search_status != '' && $search_status >= 0) {
$sql .= " AND f.fk_statut = ".((int) $search_status);

View File

@ -468,7 +468,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$sql .= natural_search('e.rowid', $search_warehouse, 2);
}
if (!empty($search_user)) {
$sql .= natural_search('u.login', $search_user);
$sql .= natural_search(array('u.lastname', 'u.firstname', 'u.login'), $search_user);
}
if (!empty($search_batch)) {
$sql .= natural_search('m.batch', $search_batch);

View File

@ -489,7 +489,7 @@ if ($search_warehouse != '' && $search_warehouse != '-1') {
$sql .= natural_search('e.rowid', $search_warehouse, 2);
}
if (!empty($search_user)) {
$sql .= natural_search('u.login', $search_user);
$sql .= natural_search(array('u.lastname', 'u.firstname', 'u.login'), $search_user);
}
if (!empty($search_batch)) {
$sql .= natural_search('m.batch', $search_batch);

View File

@ -548,7 +548,7 @@ if ($search_warehouse != '' && $search_warehouse != '-1') {
$sql .= natural_search('e.rowid', $search_warehouse, 2);
}
if (!empty($search_user)) {
$sql .= natural_search('u.login', $search_user);
$sql .= natural_search(array('u.lastname', 'u.firstname', 'u.login'), $search_user);
}
if (!empty($search_batch)) {
$sql .= natural_search('m.batch', $search_batch);

View File

@ -364,7 +364,7 @@ if ($search_societe) {
$sql .= natural_search('s.nom', $search_societe);
}
if ($search_login) {
$sql .= natural_search('u.login', $search_login);
$sql .= natural_search(array('u.lastname', 'u.firstname', 'u.login'), $search_login);
}
if ($search_montant_ht) {
$sql .= natural_search('sp.total_ht=', $search_montant_ht, 1);