/[dolibarr]/dolibarr/htdocs/contrat/index.php
ViewVC logotype

Diff of /dolibarr/htdocs/contrat/index.php

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.43 by eldy, Mon Sep 26 22:47:07 2005 UTC revision 1.44 by eldy, Tue Sep 27 19:34:04 2005 UTC
# Line 98  $sql.= ' sum('.$db->ifsql("cd.statut=0", Line 98  $sql.= ' sum('.$db->ifsql("cd.statut=0",
98  $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 > sysdate()",1,0).') as nb_running,';
99  $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=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite <= sysdate())",1,0).') as nb_late,';
100  $sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,';  $sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,';
101  $sql.= " c.rowid as cid, c.datec, c.statut, s.nom, s.idp as sidp";  $sql.= " c.rowid as cid, c.ref, c.datec, c.statut, s.nom, s.idp as sidp";
102  $sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";  $sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
103  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
104  $sql.= " WHERE c.fk_soc = s.idp ";  $sql.= " WHERE c.fk_soc = s.idp ";
# Line 133  if ($result) Line 133  if ($result)
133            
134          print "<tr $bc[$var]>";          print "<tr $bc[$var]>";
135          print "<td><a href=\"fiche.php?id=$obj->cid\">";          print "<td><a href=\"fiche.php?id=$obj->cid\">";
136          print img_object($langs->trans("ShowContract"),"contract").' '.$obj->cid.'</a>';          print img_object($langs->trans("ShowContract"),"contract").' '
137            . (isset($obj->ref) ? $obj->ref : $obj->cid).'</a>';
138          if ($obj->nb_late) print img_warning($langs->trans("Late"));          if ($obj->nb_late) print img_warning($langs->trans("Late"));
139          print '</td>';          print '</td>';
140          print '<td><a href="../comm/fiche.php?socid='.$obj->sidp.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';          print '<td><a href="../comm/fiche.php?socid='.$obj->sidp.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
# Line 159  print '<br>'; Line 160  print '<br>';
160    
161    
162  // Not activated services  // Not activated services
163  $sql = "SELECT cd.rowid as cid, cd.statut, cd.label, cd.description as note, cd.fk_contrat, c.fk_soc, s.nom";  $sql = "SELECT cd.rowid as cid, c.ref, cd.statut, cd.label, cd.description as note, cd.fk_contrat, c.fk_soc, s.nom";
164  $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";  $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
165  $sql.= " WHERE c.statut=1 AND cd.statut = 0";  $sql.= " WHERE c.statut=1 AND cd.statut = 0";
166  $sql.= " AND cd.fk_contrat = c.rowid AND c.fk_soc = s.idp";  $sql.= " AND cd.fk_contrat = c.rowid AND c.fk_soc = s.idp";
# Line 183  if ( $db->query($sql) ) Line 184  if ( $db->query($sql) )
184          $var=!$var;          $var=!$var;
185          print "<tr $bc[$var]>";          print "<tr $bc[$var]>";
186    
187          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 width="50"><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowContract"),"contract").' '
188                    .(isset($obj->ref) ? $obj->ref : $obj->fk_contrat).'</a></td>';
189          print '<td><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");          print '<td><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
190          if ($obj->label) print ' '.dolibarr_trunc($obj->label,20).'</a></td>';          if ($obj->label) print ' '.dolibarr_trunc($obj->label,20).'</a></td>';
191          else print '</a> '.dolibarr_trunc($obj->note,20).'</td>';          else print '</a> '.dolibarr_trunc($obj->note,20).'</td>';
# Line 207  print '<br>'; Line 209  print '<br>';
209  // Last modified services  // Last modified services
210  $max=5;  $max=5;
211    
212  $sql = "SELECT cd.rowid as cid, cd.statut, cd.label, cd.description as note, cd.fk_contrat, c.fk_soc, s.nom";  $sql = "SELECT cd.rowid as cid, c.ref, cd.statut, cd.label, cd.description as note, cd.fk_contrat, c.fk_soc, s.nom";
213  $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";  $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
214  $sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.idp";  $sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.idp";
215  if ($socidp > 0) $sql.= " AND s.idp = ".$socidp;  if ($socidp > 0) $sql.= " AND s.idp = ".$socidp;
# Line 229  if ( $db->query($sql) ) Line 231  if ( $db->query($sql) )
231          $obj = $db->fetch_object();          $obj = $db->fetch_object();
232          $var=!$var;          $var=!$var;
233          print "<tr $bc[$var]>";          print "<tr $bc[$var]>";
234    // width="50" nowrap
235          print '<td width="50" nowrap><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowContract"),"contract").' '.$obj->fk_contrat.'</a>';          print '<td><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowContract"),"contract").' '
236            .(isset($obj->ref) ? $obj->ref : $obj->fk_contrat).'</a>';
237          if ($obj->nb_late) print img_warning($langs->trans("Late"));          if ($obj->nb_late) print img_warning($langs->trans("Late"));
238          print '</td>';          print '</td>';
239          print '<td><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");          print '<td><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");

Legend:
Removed from v.1.43  
changed lines
  Added in v.1.44

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26