diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index dfcb1e8457c..05135f39aeb 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -189,7 +189,7 @@ foreach($listofstatus as $status)
print '
';
print '| '.$staticcontratligne->LibStatut($status, 0, ($bool?1:0)).' | ';
- print ''.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status, 3, ($bool?1:0)).' | ';
+ print ''.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status, 3, ($bool?1:0)).' | ';
print "
\n";
}
if ($status==4 && ! $bool) $bool=true;
@@ -218,15 +218,15 @@ foreach($listofstatus as $status)
{
print '';
print '| '.$staticcontratligne->LibStatut($status, 0, ($bool?1:0)).' | ';
- print ''.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status, 3, ($bool?1:0)).' | ';
+ print ''.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status, 3, ($bool?1:0)).' | ';
if ($status==4 && ! $bool) $bool=true;
else $bool=false;
print "
\n";
}
}
//if ($totalinprocess != $total)
-//print '| '.$langs->trans("Total").' ('.$langs->trans("ServicesRunning").') | '.$totalinprocess.' |
';
-print '| '.$langs->trans("Total").' | '.$total.' |
';
+//print '| '.$langs->trans("Total").' ('.$langs->trans("ServicesRunning").') | '.$totalinprocess.' |
';
+print '| '.$langs->trans("Total").' | '.$total.' |
';
print "
";
@@ -332,7 +332,7 @@ if ($result)
print '| '.$langs->trans("LastContracts", 5).' | ';
print ''.$langs->trans("DateModification").' | ';
- //print ''.$langs->trans("Status").' | ';
+ //print ''.$langs->trans("Status").' | ';
print ''.$langs->trans("Services").' | ';
print "
\n";
@@ -354,10 +354,10 @@ if ($result)
print '';
print ''.dol_print_date($db->jdate($obj->tms), 'dayhour').' | ';
//print ''.$staticcontrat->LibStatut($obj->statut,2).' | ';
- print ''.($obj->nb_initial>0 ? $obj->nb_initial.$staticcontratligne->LibStatut(0, 3):'').' | ';
- print ''.($obj->nb_running>0 ? $obj->nb_running.$staticcontratligne->LibStatut(4, 3, 0):'').' | ';
- print ''.($obj->nb_expired>0 ? $obj->nb_expired.$staticcontratligne->LibStatut(4, 3, 1):'').' | ';
- print ''.($obj->nb_closed>0 ? $obj->nb_closed.$staticcontratligne->LibStatut(5, 3):'').' | ';
+ print ''.($obj->nb_initial>0 ? $obj->nb_initial.$staticcontratligne->LibStatut(0, 3):'').' | ';
+ print ''.($obj->nb_running>0 ? $obj->nb_running.$staticcontratligne->LibStatut(4, 3, 0):'').' | ';
+ print ''.($obj->nb_expired>0 ? $obj->nb_expired.$staticcontratligne->LibStatut(4, 3, 1):'').' | ';
+ print ''.($obj->nb_closed>0 ? $obj->nb_closed.$staticcontratligne->LibStatut(5, 3):'').' | ';
print "\n";
$i++;
}
@@ -432,7 +432,7 @@ if ($resql)
$staticcompany->name=$obj->name;
print $staticcompany->getNomUrl(1, '', 20);
print '';
- print '';
+ print ' | ';
$dateend=$db->jdate($obj->date_fin_validite);
print $staticcontratligne->LibStatut($obj->statut, 3, ($dateend && $dateend < $now)?1:0);
print ' | ';
@@ -511,7 +511,7 @@ if ($resql)
$staticcompany->name=$obj->name;
print $staticcompany->getNomUrl(1, '', 20);
print '';
- print '';
+ print ' | ';
print $staticcontratligne->LibStatut($obj->statut, 3);
print ' | ';
print "\n";
@@ -590,7 +590,7 @@ if ($resql)
$staticcompany->name=$obj->name;
print $staticcompany->getNomUrl(1, '', 20);
print '';
- print '';
+ print ' | ';
print $staticcontratligne->LibStatut($obj->statut, 3, 1);
print ' | ';
print "\n";
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 24dccaae25d..fb2422b7762 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -559,7 +559,7 @@ if (! empty($arrayfields['lower_planned_end_date']['checked']))
// Status
if (! empty($arrayfields['status']['checked']))
{
- print ' | ';
+ print ' | ';
}
print '';
$searchpicto=$form->showFilterButtons();
|