diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index be312383de9..26c466b213f 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -72,10 +72,11 @@ print '
Activ
print '
';
// Not activated services
-$sql = "SELECT cd.rowid as cid, cd.statut, cd.label, cd.fk_contrat ";
-$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
-$sql .= " WHERE cd.statut IN (0,3)";
-$sql .= " ORDER BY cd.tms DESC";
+$sql = "SELECT cd.rowid as cid, cd.statut, cd.label, cd.fk_contrat, c.fk_soc, s.nom";
+$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
+$sql.= " WHERE cd.statut IN (0,3)";
+$sql.= " AND cd.fk_contrat = c.rowid AND c.fk_soc = s.idp";
+$sql.= " ORDER BY cd.tms DESC";
if ( $db->query($sql) )
{
@@ -84,7 +85,7 @@ if ( $db->query($sql) )
print '';
- print '| '.$langs->trans("NotActivatedServices").' | ';
+ print ' | '.$langs->trans("NotActivatedServices").' | ';
print " \n";
$var=True;
@@ -94,9 +95,10 @@ if ( $db->query($sql) )
$var=!$var;
print "";
- print '| '.img_object($langs->trans("ShowContract"),"contract").' '.$obj->fk_contrat.' | ';
- print ''.img_object($langs->trans("ShowService"),"service").' '.$obj->label.' | ';
- print ' | ';
+ print ''.img_object($langs->trans("ShowContract"),"contract").' '.$obj->fk_contrat.' | ';
+ print ''.img_object($langs->trans("ShowService"),"service").' '.$obj->label.' | ';
+ print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.' | ';
+ print ' | ';
print " \n";
$i++;
}
@@ -115,10 +117,11 @@ print ' ';
// Last activated services
$max=10;
-$sql = "SELECT cd.rowid as cid, cd.statut, cd.label, cd.fk_contrat ";
-$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
-$sql .= " WHERE cd.statut = 4";
-$sql .= " ORDER BY cd.tms DESC";
+$sql = "SELECT cd.rowid as cid, cd.statut, cd.label, cd.fk_contrat, c.fk_soc, s.nom";
+$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
+$sql.= " WHERE cd.statut = 4";
+$sql.= " AND cd.fk_contrat = c.rowid AND c.fk_soc = s.idp";
+$sql.= " ORDER BY cd.tms DESC";
if ( $db->query($sql) )
{
@@ -127,7 +130,7 @@ if ( $db->query($sql) )
print '';
- print '| '.$langs->trans("LastActivatedServices",min($num,$max)).' | ';
+ print ' | '.$langs->trans("LastActivatedServices",min($num,$max)).' | ';
print " \n";
$var=True;
@@ -137,9 +140,10 @@ if ( $db->query($sql) )
$var=!$var;
print "";
- print '| '.img_object($langs->trans("ShowContract"),"contract").' '.$obj->fk_contrat.' | ';
- print ''.img_object($langs->trans("ShowService"),"service").' '.$obj->label.' | ';
- print ' | ';
+ print ''.img_object($langs->trans("ShowContract"),"contract").' '.$obj->fk_contrat.' | ';
+ print ''.img_object($langs->trans("ShowService"),"service").' '.$obj->label.' | ';
+ print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.' | ';
+ print ' | ';
print " \n";
$i++;
}
|