lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX Search on leave request ref

Browse Source
This commit is contained in:
Laurent Destailleur 2019-11-01 20:52:30 +01:00
parent a95a10b8f0
commit 4616519dcf
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/holiday/list.php
View File

@ -121,6 +121,7 @@ $search_array_options=$extrafields->getOptionalsFromPost($object->table_element,
// List of fields to search into when doing a "search in all" // List of fields to search into when doing a "search in all"
$fieldstosearchall = array( $fieldstosearchall = array(
'cp.ref'=>'Ref',
'cp.description'=>'Description', 'cp.description'=>'Description',
'uu.lastname'=>'EmployeeLastname', 'uu.lastname'=>'EmployeeLastname',
'uu.firstname'=>'EmployeeFirstname', 'uu.firstname'=>'EmployeeFirstname',
@ -287,7 +288,7 @@ $sql.= ", ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
$sql.= " WHERE cp.entity IN (".getEntity('holiday').")"; $sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
$sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau $sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
// Search all // Search all
if (!empty($sall)) $sql.= natural_search(array_keys($fieldstosearchall), $sall); //if (!empty($sall)) $sql.= natural_search(array_keys($fieldstosearchall), $sall);
// Ref // Ref
if(!empty($search_ref)) if(!empty($search_ref))
{ {