Search ticket by thirdparty name instead of id

Dolibarr · Apr 29, 2019 · cef5bb1 · cef5bb1
1 parent 8f6f3d7
commit cef5bb1
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
@@ -52,7 +52,7 @@
 $msg_id     = GETPOST('msg_id', 'int');
 $socid      = GETPOST('socid', 'int');
 $projectid  = GETPOST('projectid', 'int');
-$search_fk_soc=GETPOST('$search_fk_soc', 'int')?GETPOST('$search_fk_soc', 'int'):GETPOST('socid', 'int');
+$search_societe = GETPOST('search_societe', 'alpha');
 $search_fk_project=GETPOST('search_fk_project', 'int')?GETPOST('search_fk_project', 'int'):GETPOST('projectid', 'int');
 $search_fk_status = GETPOST('search_fk_statut', 'array');
 $mode       = GETPOST('mode', 'alpha');
@@ -210,6 +210,7 @@
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 if ($object->ismultientitymanaged == 1) $sql.= " WHERE t.entity IN (".getEntity($object->element).")";
 else $sql.=" WHERE 1 = 1";
+$sql.= " AND t.fk_soc = s.rowid";
 
 foreach($search as $key => $val)
 {
@@ -231,7 +232,7 @@
     if ($search[$key] != '') $sql.=natural_search($key, $search[$key], $mode_search);
 }
 if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
-if ($search_fk_soc)     $sql.= natural_search('fk_soc', $search_fk_soc, 2);
+if ($search_societe)     $sql .= natural_search('s.nom', $search_societe);
 if ($search_fk_project) $sql.= natural_search('fk_project', $search_fk_project, 2);
 if (! $user->societe_id && ($mode == "mine" || (!$user->admin && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY))) {
     $sql.= " AND (t.fk_user_assign = ".$user->id;
@@ -538,6 +539,10 @@
 			print Form::multiselectarray('search_fk_statut', $arrayofstatus, array_values($search[$key]), 0, 0, 'minwidth150', 1, 0, '', '', '');
 			print '</td>';
 		}
+		elseif ($key == "fk_soc")
+		{
+			print '<td class="liste_titre'.($cssforfield?' '.$cssforfield:'').'"><input type="text" class="flat maxwidth75" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
+		}
 		else {
 			print '<td class="liste_titre'.($cssforfield?' '.$cssforfield:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
 		}