From d3f43caf785e6adaa9de85c476fd6f8df665d2db Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 29 Mar 2019 17:02:16 +0100
Subject: [PATCH] FIX #9828 search on external_reference

---
 .../indexing_searching/search_adv_result.php                  | 4 +++-
 src/frontend/lang/lang-fr.ts                                  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/maarch_entreprise/indexing_searching/search_adv_result.php b/apps/maarch_entreprise/indexing_searching/search_adv_result.php
index 7ac9229f9b7..f8a3c669842 100755
--- a/apps/maarch_entreprise/indexing_searching/search_adv_result.php
+++ b/apps/maarch_entreprise/indexing_searching/search_adv_result.php
@@ -479,7 +479,7 @@ if (count($_REQUEST['meta']) > 0) {
                     $arrayPDO = array_merge($arrayPDO, array(":resIdWelcome" => $welcome));
                 }
                 $where_request_welcome .= "( REGEXP_REPLACE(lower(translate(subject,'ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûýýþÿŔŕ','aaaaaaaceeeeiiiidnoooooouuuuybsaaaaaaaceeeeiiiidnoooooouuuyybyRr')),'( ){2,}', ' ') like lower(:multifieldWelcome) "
-                    ."or lower(external_id) LIKE lower(:multifieldWelcome) "
+                    ."or lower(external_reference) LIKE lower(:multifieldWelcomeReference) "
                     ."or (lower(translate(alt_identifier,'/','')) like lower(:multifieldWelcome) OR lower(alt_identifier) like lower(:multifieldWelcome)) "
                     ."or lower(title) LIKE lower(:multifieldWelcome) "
                     ."or lower(description) LIKE lower(:multifieldWelcome) "
@@ -488,6 +488,8 @@ if (count($_REQUEST['meta']) > 0) {
                     ."or res_id in (select res_id_master from res_view_attachments where (lower(translate(identifier,'/','')) like lower(:multifieldWelcome) OR lower(identifier) like lower(:multifieldWelcome)) AND status NOT IN ('DEL','OBS','TMP')) "
                     ."or contact_id in (select contact_id from view_contacts where society ilike :multifieldWelcome or contact_firstname ilike :multifieldWelcome or contact_lastname ilike :multifieldWelcome) or (exp_user_id in (select user_id from users where firstname ilike :multifieldWelcome or lastname ilike :multifieldWelcome )))";
 
+                $arrayPDO = array_merge($arrayPDO, array(":multifieldWelcomeReference" => "%".$welcome."%"));
+
                 $multifieldWelcome = \SrcCore\models\TextFormatModel::normalize(['string' => $welcome]);
                 $multifieldWelcome = preg_replace('/\s+/', ' ', $multifieldWelcome);
                 $arrayPDO = array_merge($arrayPDO, array(":multifieldWelcome" => "%".$multifieldWelcome."%"));
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index af381ef9080..f00e45ee3a1 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -449,7 +449,7 @@ export const LANG_FR = {
     "scriptCreated"                     : "Script créé",
     "search"                            : "Chercher",
     "searchEntities"                    : "Rechercher une entité",
-    "secondaryEntity"                   : "Entitté secondaire",
+    "secondaryEntity"                   : "Entité secondaire",
     "secondLevelAdded"                  : "Sous-chemise créée",
     "secondLevelAttached"               : "Rattacher à la sous-chemise",
     "secondLevelDeleted"                : "Sous-chemise supprimée",
-- 
GitLab