diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php index 17b7c2a4706..dca08f851e0 100644 --- a/htdocs/contact/index.php +++ b/htdocs/contact/index.php @@ -40,6 +40,7 @@ $result = restrictedArea($user, 'contact', $contactid,''); $search_nom=GETPOST("search_nom"); $search_prenom=GETPOST("search_prenom"); $search_societe=GETPOST("search_societe"); +$search_poste=GETPOST("search_poste"); $search_phone=GETPOST("search_phone"); $search_phoneper=GETPOST("search_phoneper"); $search_phonepro=GETPOST("search_phonepro"); @@ -92,6 +93,7 @@ if ($_POST["button_removefilter"]) $search_nom=""; $search_prenom=""; $search_societe=""; + $search_poste=""; $search_phone=""; $search_phoneper=""; $search_phonepro=""; @@ -114,7 +116,7 @@ llxHeader('',$langs->trans("ContactsAddresses"),'EN:Module_Third_Parties|FR:Modu $form=new Form($db); $sql = "SELECT s.rowid as socid, s.nom,"; -$sql.= " p.rowid as cidp, p.name, p.firstname, p.email,"; +$sql.= " p.rowid as cidp, p.name, p.firstname, p.poste, p.email,"; $sql.= " p.phone, p.phone_mobile, p.fax, p.fk_pays, p.priv,"; $sql.= " p.tms,"; $sql.= " cp.code as pays_code"; @@ -155,6 +157,10 @@ if ($search_societe) // filtre sur la societe { $sql .= " AND s.nom like '%".$db->escape($search_societe)."%'"; } +if (strlen($search_poste)) // filtre sur la societe +{ + $sql .= " AND p.poste like '%".$db->escape($search_poste)."%'"; +} if (strlen($search_phone)) { $sql .= " AND (p.phone like '%".$db->escape($search_phone)."%' OR p.phone_perso like '%".$db->escape($search_phone)."%' OR p.phone_mobile like '%".$db->escape($search_phone)."%')"; @@ -256,6 +262,7 @@ if ($result) print ''; print_liste_field_titre($langs->trans("Lastname"),"index.php","p.name", $begin, $param, '', $sortfield,$sortorder); print_liste_field_titre($langs->trans("Firstname"),"index.php","p.firstname", $begin, $param, '', $sortfield,$sortorder); + print_liste_field_titre($langs->trans("PostOrFunction"),"index.php","p.poste", $begin, $param, '', $sortfield,$sortorder); if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) print_liste_field_titre($langs->trans("Company"),"index.php","s.nom", $begin, $param, '', $sortfield,$sortorder); if ($view == 'phone') { @@ -276,36 +283,39 @@ if ($result) // Ligne des champs de filtres print ''; print ''; - print ''; + print ''; print ''; print ''; - print ''; + print ''; + print ''; + print ''; + print ''; print ''; if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) { print ''; - print ''; + print ''; print ''; } if ($view == 'phone') { print ''; - print ''; + print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; - print ''; + print ''; print ''; } else { print ''; - print ''; + print ''; print ''; print ''; - print ''; + print ''; print ''; } print ' '; @@ -340,7 +350,10 @@ if ($result) // Firstname print ''.dol_trunc($obj->firstname,20).''; - // Company + // Function + print ''.dol_trunc($obj->poste,20).''; + + // Company if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) { print '';