/[dolibarr]/dolibarr/htdocs/comm/action/index.php
ViewVC logotype

Diff of /dolibarr/htdocs/comm/action/index.php

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

revision 1.32 by eldy, Wed Sep 7 21:50:10 2005 UTC revision 1.33 by eldy, Sun Sep 18 18:23:44 2005 UTC
# Line 64  llxHeader(); Line 64  llxHeader();
64   *   *
65   */   */
66    
67  $sql = "SELECT s.nom as societe, s.idp as socidp, s.client, a.id,".$db->pdate("a.datea")." as da, c.code as acode, c.libelle, u.code, a.fk_contact, a.note, a.percent as percent";  $sql = "SELECT s.nom as societe, s.idp as socidp, s.client,";
68  $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."user as u";  $sql.= " a.id,".$db->pdate("a.datea")." as da, a.fk_contact, a.note, a.percent as percent,";
69  $sql .= " WHERE a.fk_soc = s.idp AND c.id=a.fk_action AND a.fk_user_author = u.rowid";  $sql.= " c.code as acode, c.libelle, u.code, u.rowid as userid";
70    $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."user as u";
71    $sql.= " WHERE a.fk_soc = s.idp AND c.id=a.fk_action AND a.fk_user_author = u.rowid";
72  if ($_GET["type"])  if ($_GET["type"])
73  {  {
74    $sql .= " AND c.id = ".$_GET["type"];    $sql .= " AND c.id = ".$_GET["type"];
# Line 146  if ($resql) Line 148  if ($resql)
148          print "<td width=\"20\">" .strftime("%d",$obj->da)."</td>\n";          print "<td width=\"20\">" .strftime("%d",$obj->da)."</td>\n";
149          print "<td width=\"30\">" .strftime("%H:%M",$obj->da)."</td>\n";          print "<td width=\"30\">" .strftime("%H:%M",$obj->da)."</td>\n";
150    
151            // Status/Percent
152          if ($obj->percent < 100) {          if ($obj->percent < 100) {
153              print "<td align=\"center\">".$obj->percent."%</td>";              print "<td align=\"center\">".$obj->percent."%</td>";
154          }          }
# Line 153  if ($resql) Line 156  if ($resql)
156              print "<td align=\"center\">".$langs->trans("Done")."</td>";              print "<td align=\"center\">".$langs->trans("Done")."</td>";
157          }          }
158    
159          print '<td><a href="fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowTask"),"task").' ';          // Action
160            print '<td><a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowTask"),"task").' ';
161          $transcode=$langs->trans("Action".$obj->acode);          $transcode=$langs->trans("Action".$obj->acode);
162          $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);          $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
163          print dolibarr_trunc($libelle,16);          print dolibarr_trunc($libelle,16);
164          print '</a></td>';          print '</a></td>';
165    
166          // Sociét          // Société
167          print '<td>';          print '<td>';
168          if ($obj->client == 1) $url=DOL_URL_ROOT.'/comm/fiche.php?socid=';          if ($obj->client == 1) $url=DOL_URL_ROOT.'/comm/fiche.php?socid=';
169          elseif ($obj->client == 2) $url=DOL_URL_ROOT.'/comm/prospect/fiche.php?id=';          elseif ($obj->client == 2) $url=DOL_URL_ROOT.'/comm/prospect/fiche.php?id=';
# Line 184  if ($resql) Line 188  if ($resql)
188          print '<td>'.dolibarr_trunc($obj->note, 16).'</td>';          print '<td>'.dolibarr_trunc($obj->note, 16).'</td>';
189    
190          // Auteur          // Auteur
191          print '<td align="center">'.$obj->code.'</td>';          print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->code.'</a></td>';
192    
193          print "</tr>\n";          print "</tr>\n";
194          $i++;          $i++;

Legend:
Removed from v.1.32  
changed lines
  Added in v.1.33

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