diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index d02804aab5f..a1c20b546d4 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -37,6 +37,7 @@ if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/p if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +if ($conf->ficheinter->enabled) require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); if (!empty($conf->global->MAIN_MODULE_CHRONODOCS)) require_once(DOL_DOCUMENT_ROOT."/chronodocs/chronodocs_entries.class.php"); $langs->load("companies"); @@ -621,12 +622,14 @@ if ($socid > 0) { print ''; - $sql = "SELECT s.nom, s.rowid, f.rowid as id, f.ref, f.datei as di"; + $sql = "SELECT s.nom, s.rowid, f.rowid as id, f.ref, f.duree as duration, f.datei as startdate"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as f"; $sql .= " WHERE f.fk_soc = s.rowid"; $sql .= " AND s.rowid = ".$objsoc->id; $sql .= " ORDER BY f.tms DESC"; + $fichinter_static=new Fichinter($db); + $resql=$db->query($sql); if ($resql) { @@ -642,10 +645,14 @@ if ($socid > 0) $i = 0; while ($i < $num && $i < $MAXLIST) { + $fichinter_static->id=$objp->id; + $objp = $db->fetch_object($resql); - print ""; - print ''."\n"; + print ""; + print ''."\n"; + //print ''."\n"; + print ''."\n"; + print ''."\n"; print ''; $var=!$var; $i++;
'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.''."\n"; - print ''.dol_print_date($db->jdate($objp->di),"day").'
'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.''.dol_print_date($db->jdate($objp->startdate)).''.ConvertSecondToTime($objp->duration).''.$fichinter_static->getLibStatut(3).'