From 7d49af48122b0ae3e7ad37c9c3f5931150dfff72 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 26 Jun 2005 02:12:53 +0000
Subject: [PATCH] Look: Modifications mineures

---
 htdocs/contrat/enservice.php |  4 ++--
 htdocs/contrat/index.php     | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/htdocs/contrat/enservice.php b/htdocs/contrat/enservice.php
index 98e1266d5a9..3e649394401 100644
--- a/htdocs/contrat/enservice.php
+++ b/htdocs/contrat/enservice.php
@@ -90,8 +90,8 @@ if ($resql)
   print_liste_field_titre($langs->trans("Contract"),"enservice.php", "c.rowid","","","",$sortfield);
   print_liste_field_titre($langs->trans("Service"),"enservice.php", "p.label","","","",$sortfield);
   print_liste_field_titre($langs->trans("Company"),"enservice.php", "s.nom","","","",$sortfield);
-  print_liste_field_titre($langs->trans("DateStartReal"),"enservice.php", "cd.date_ouverture",'','',' align="center"',$sortfield);
-  print_liste_field_titre($langs->trans("DateEndPlanned"),"enservice.php", "cd.date_fin_validite",'','',' align="center"',$sortfield);
+  print_liste_field_titre($langs->trans("DateStartRealShort"),"enservice.php", "cd.date_ouverture",'','',' align="center"',$sortfield);
+  print_liste_field_titre($langs->trans("DateEndPlannedShort"),"enservice.php", "cd.date_fin_validite",'','',' align="center"',$sortfield);
   print_liste_field_titre($langs->trans("Status"),"enservice.php", "cd.statut","","","",$sortfield);
   print "</tr>\n";
 
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 8362762f250..59e7322e9f8 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -93,7 +93,7 @@ if ($conf->contrat->enabled) {
 print '</td><td width="70%" valign="top">';
 
 // Not activated services
-$sql = "SELECT cd.rowid as cid, cd.statut, cd.label, cd.fk_contrat, c.fk_soc, s.nom";
+$sql = "SELECT cd.rowid as cid, cd.statut, cd.label, cd.description as note, 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";
@@ -117,7 +117,9 @@ if ( $db->query($sql) )
         print "<tr $bc[$var]>";
 
         print '<td width="50"><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowContract"),"contract").' '.$obj->fk_contrat.'</a></td>';
-        print '<td><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service").' '.dolibarr_trunc($obj->label,20).'</a></td>';
+        print '<td><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
+        if ($obj->label) print ' '.dolibarr_trunc($obj->label,20).'</a></td>';
+        else print '</a> '.dolibarr_trunc($obj->note,20).'</td>';
         print '<td><a href="'.DOL_URL_ROOT.'/soc.php?socid='.$obj->fk_soc.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,44).'</a></td>';
         print '<td width="16"><a href="ligne.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'"><img src="./statut'.$obj->statut.'.png" border="0" alt="statut"></a></td>';
         print "</tr>\n";
@@ -138,11 +140,11 @@ print '<br>';
 // Last activated services
 $max=10;
 
-$sql = "SELECT cd.rowid as cid, cd.statut, cd.label, cd.fk_contrat, c.fk_soc, s.nom";
+$sql = "SELECT cd.rowid as cid, cd.statut, cd.label, cd.description as note, 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";
+$sql.= " ORDER BY cd.date_ouverture DESC";
 
 if ( $db->query($sql) )
 {
@@ -162,7 +164,9 @@ if ( $db->query($sql) )
         print "<tr $bc[$var]>";
 
         print '<td width="50"><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowContract"),"contract").' '.$obj->fk_contrat.'</a></td>';
-        print '<td><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service").' '.dolibarr_trunc($obj->label,20).'</a></td>';
+        print '<td><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
+        if ($obj->label) print ' '.dolibarr_trunc($obj->label,20).'</a></td>';
+        else print '</a> '.dolibarr_trunc($obj->note,20).'</td>';
         print '<td><a href="'.DOL_URL_ROOT.'/soc.php?socid='.$obj->fk_soc.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,44).'</a></td>';
         print '<td width="16"><a href="ligne.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'"><img src="./statut'.$obj->statut.'.png" border="0" alt="statut"></a></td>';
         print "</tr>\n";
@@ -180,6 +184,8 @@ else
 
 print '</td></tr></table>';
 
+print '<br>';
+
 $db->close();
 
 llxFooter('$Date$ - $Revision$');