diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php index e2f735dc25d..a97a59a3da3 100644 --- a/htdocs/core/lib/contact.lib.php +++ b/htdocs/core/lib/contact.lib.php @@ -184,12 +184,13 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $ print "\n".''; $sql = 'SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount'; - $sql .= ', cls.code as opp_status_code'; + $sql .= ', cls.code as opp_status_code, ctc.libelle'; $sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_lead_status as cls on p.fk_opp_status = cls.rowid'; $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (p.rowid = cc.element_id)'; + $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_contact as ctc ON (ctc.rowid = cc.fk_c_type_contact)'; $sql .= ' WHERE cc.fk_socpeople = '.((int) $object->id); - $sql .= ' AND cc.fk_c_type_contact IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE element="project" AND source="external")'; + $sql .= ' AND ctc.element="project" AND ctc.source="external"'; $sql .= ' AND p.entity IN ('.getEntity('project').')'; $sql .= ' ORDER BY p.dateo DESC'; @@ -200,6 +201,7 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $ print ''; print ''; print ''; + print ''; print ''; print ''; print ''; @@ -232,6 +234,7 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $ // Label print ''; + print ''; // Date start print ''; // Date end
'.$langs->trans("Ref").''.$langs->trans("Name").''.$langs->trans("ContactType").''.$langs->trans("DateStart").''.$langs->trans("DateEnd").''.$langs->trans("OpportunityAmountShort").''.$obj->title.''.$obj->libelle.''.dol_print_date($db->jdate($obj->do), "day").'