From 8eb8984c1cefd422edf007ce01f3ef6b4093c9e4 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 31 May 2006 07:43:13 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20n'affichait=20pas=20la=20date=20pr=E9vu?=
 =?UTF-8?q?=20de=20l'action=20et=20le=20lien=20=E9tait=20sur=20cette=20der?=
 =?UTF-8?q?ni=E8re=20=20=E9tait=20mauvais?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/prospect/fiche.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php
index 85ed0afdd1f..8154da85173 100644
--- a/htdocs/comm/prospect/fiche.php
+++ b/htdocs/comm/prospect/fiche.php
@@ -322,12 +322,12 @@ if ($socid > 0)
         print '<table width="100%" class="noborder">';
         print '<tr class="liste_titre"><td colspan="9"><a href="action/index.php?socid='.$societe->id.'">'.$langs->trans("ActionsToDo").'</a></td><td align="right">&nbsp;</td></tr>';
 
-        $sql = "SELECT a.id, a.label, ".$db->pdate("a.datea")." as da, c.code as acode, c.libelle, u.code, a.propalrowid, a.fk_user_author, fk_contact, u.rowid ";
+        $sql = "SELECT a.id, a.label, ".$db->pdate("a.datep")." as dp, c.code as acode, c.libelle, u.code, a.propalrowid, a.fk_user_author, fk_contact, u.rowid ";
         $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u ";
         $sql .= " WHERE a.fk_soc = ".$societe->id;
         $sql .= " AND u.rowid = a.fk_user_author";
         $sql .= " AND c.id=a.fk_action AND a.percent < 100";
-        $sql .= " ORDER BY a.datea DESC, a.id DESC";
+        $sql .= " ORDER BY a.datep DESC, a.id DESC";
 
         $result=$db->query($sql);
         if ($result)
@@ -343,29 +343,29 @@ if ($socid > 0)
                 $obj = $db->fetch_object($result);
                 print "<tr $bc[$var]>";
 
-                if ($oldyear == strftime("%Y",$obj->da) )
+                if ($oldyear == strftime("%Y",$obj->dp) )
                 {
                     print '<td width="30" align="center">|</td>';
                 }
                 else
                 {
-                    print '<td width="30" align="center">'.strftime("%Y",$obj->da)."</td>\n";
-                    $oldyear = strftime("%Y",$obj->da);
+                    print '<td width="30" align="center">'.strftime("%Y",$obj->dp)."</td>\n";
+                    $oldyear = strftime("%Y",$obj->dp);
                 }
 
-                if ($oldmonth == strftime("%Y%b",$obj->da) )
+                if ($oldmonth == strftime("%Y%b",$obj->dp) )
                 {
                     print '<td width="30" align="center">|</td>';
                 }
                 else
                 {
-                    print '<td width="30" align="center">' .strftime("%b",$obj->da)."</td>\n";
-                    $oldmonth = strftime("%Y%b",$obj->da);
+                    print '<td width="30" align="center">' .strftime("%b",$obj->dp)."</td>\n";
+                    $oldmonth = strftime("%Y%b",$obj->dp);
                 }
 
-                print '<td width="20">'.strftime("%d",$obj->da)."</td>\n";
-                print '<td width="30">'.strftime("%H:%M",$obj->da)."</td>\n";
-				if (date("U",$obj->da) < time())
+                print '<td width="20">'.strftime("%d",$obj->dp)."</td>\n";
+                print '<td width="30">'.strftime("%H:%M",$obj->dp)."</td>\n";
+				if (date("U",$obj->dp) < time())
 				{
 					print "<td>".img_warning("Late")."</td>";
 				}
@@ -387,7 +387,7 @@ if ($socid > 0)
                 }
                 else
                 {
-                    print '<td><a href="action/fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowAction"),"task");
+                    print '<td><a href="../action/fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowAction"),"task");
                       $transcode=$langs->trans("Action".$obj->acode);
                       $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
                       print $libelle;