diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 32acbad1341..ce8e5c80414 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -62,9 +62,20 @@ print ''; print '
'; -/* - * Recherche Contrat - */ +// Legend +$var=false; +print ''; +print ''; +print ''; +print '
'.$langs->trans("ServicesLegend").'
'; +print $staticcontratligne->LibStatut(0,4).'
'; +print $staticcontratligne->LibStatut(4,4,false).'
'; +print $staticcontratligne->LibStatut(4,4,true).'
'; +print $staticcontratligne->LibStatut(5,4).'
'; +print '
'; +print "
"; + +// Search contract if ($conf->contrat->enabled) { $var=false; @@ -80,18 +91,6 @@ if ($conf->contrat->enabled) print "
"; } -// Legend -$var=false; -print ''; -print ''; -print ''; -print '
'.$langs->trans("ServicesLegend").'
'; -print $staticcontratligne->LibStatut(0,4).'
'; -print $staticcontratligne->LibStatut(4,4,false).'
'; -print $staticcontratligne->LibStatut(4,4,true).'
'; -print $staticcontratligne->LibStatut(5,4).'
'; -print '
'; - /** * Draft contratcs */ @@ -117,7 +116,6 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire) $var = false; $num = $db->num_rows($resql); - print '
'; print ''; print ''; print ''; @@ -206,7 +204,7 @@ if ($result) $var=!$var; print ""; - print ""; - print '"; - print ''; print ''; print "\n"; $i++;
'.$langs->trans("DraftContracts").($num?' ('.$num.')':'').'
"; + print ''; $staticcontrat->ref=($obj->ref?$obj->ref:$obj->cid); $staticcontrat->id=$obj->cid; print $staticcontrat->getNomUrl(1,16); @@ -267,7 +265,7 @@ if ( $db->query($sql) ) $var=!$var; print "
'; + print ''; $staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat); $staticcontrat->id=$obj->fk_contrat; print $staticcontrat->getNomUrl(1,16); @@ -330,7 +328,7 @@ if ($resql) $obj = $db->fetch_object($resql); $var=!$var; print "
'; + print ''; $staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat); $staticcontrat->id=$obj->fk_contrat; print $staticcontrat->getNomUrl(1,16); @@ -346,7 +344,7 @@ if ($resql) print ''; $dateend=$db->jdate($obj->date_fin_validite); - print $staticcontratligne->LibStatut($obj->statut,5, ($dateend && $dateend < $now)); + print $staticcontratligne->LibStatut($obj->statut, 3, ($dateend && $dateend < $now)); print '