diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 3c858852cd4..9349e1dd03d 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -47,7 +47,7 @@ $staticcontratligne=new ContratLigne($db); /* - * Affichage page + * View */ llxHeader(); @@ -166,7 +166,7 @@ $sql.= ' sum('.$db->ifsql("cd.statut=0",1,0).') as nb_initial,'; $sql.= ' sum('.$db->ifsql("cd.statut=4 AND cd.date_fin_validite > sysdate()",1,0).') as nb_running,'; $sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite <= sysdate())",1,0).') as nb_late,'; $sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,'; -$sql.= " c.rowid as cid, c.ref, c.datec, c.statut, s.nom, s.rowid as socid"; +$sql.= " c.rowid as cid, c.ref, c.datec, c.tms, c.statut, s.nom, s.rowid as socid"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,"; if (!$user->rights->societe->client->voir && !$socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,"; @@ -188,9 +188,9 @@ if ($result) print ''; print ''; - print ''; + print ''; //print ''; - print ''; + print ''; print "\n"; $var=True; @@ -211,11 +211,11 @@ if ($result) $staticcompany->nom=$obj->nom; print $staticcompany->getNomUrl(1,'',20); print ''; - print ''; + print ''; //print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print "\n"; $i++; } @@ -265,7 +265,7 @@ if ( $db->query($sql) ) $staticcontrat->id=$obj->fk_contrat; print $staticcontrat->getNomUrl(1,16); print ''; - print ''; else print ' '.dolibarr_trunc($obj->note,20).''; @@ -274,7 +274,7 @@ if ( $db->query($sql) ) $staticcompany->nom=$obj->nom; print $staticcompany->getNomUrl(1,'',20); print ''; - print ''; print "\n";
'.$langs->trans("LastContracts",5).''.$langs->trans("DateCreation").''.$langs->trans("DateModification").''.$langs->trans("Status").''.$langs->trans("Services").''.$langs->trans("Services").'
'.dolibarr_print_date($obj->datec).''.dolibarr_print_date($obj->tms,'dayhour').''.$staticcontrat->LibStatut($obj->statut,2).''.($obj->nb_initial>0 ? $obj->nb_initial.$staticcontratligne->LibStatut(0,3):'').''.($obj->nb_running+$obj->nb_late>0 ? ($obj->nb_running+$obj->nb_late).$staticcontratligne->LibStatut(4,3):'').''.($obj->nb_closed>0 ? $obj->nb_closed.$staticcontratligne->LibStatut(5,3):'').''.($obj->nb_initial>0 ? $obj->nb_initial.$staticcontratligne->LibStatut(0,3):'').''.($obj->nb_running+$obj->nb_late>0 ? ($obj->nb_running+$obj->nb_late).$staticcontratligne->LibStatut(4,3):'').''.($obj->nb_closed>0 ? $obj->nb_closed.$staticcontratligne->LibStatut(5,3):'').'
'; + print ''; print ''.img_object($langs->trans("ShowService"),"service"); if ($obj->label) print ' '.dolibarr_trunc($obj->label,20).''; + print ''; print $staticcontratligne->LibStatut($obj->statut,3); print '