From cf8d15fd5f23efe4b35810038a4e6cc9b4c908cd Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 16 Feb 2007 13:56:17 +0000
Subject: [PATCH] =?UTF-8?q?corrections=20propos=E9es=20par=20Jean-Ren=E9?=
 =?UTF-8?q?=20Athanase?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/action/fiche.php   |  6 +++---
 htdocs/comm/prospect/fiche.php | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index cec21712ec0..c0b3cc73e20 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -509,11 +509,11 @@ if ($_GET["action"] == 'create')
 		print '<tr><td>'.$langs->trans("DateActionPlanned").'</td><td>';
 		if ($_GET["afaire"] == 1 || $_GET["afaire"] == 2)
 		{
-			$html->select_date(-1,'ap',1,1,1,"action");
+			$html->select_date('','ap',1,1,0,"action");
 		}
 		else
 		{
-			$html->select_date(-1,'ap',1,1,1,"action");
+			$html->select_date('','ap',1,1,0,"action");
 		}
 		print '</td></tr>';
 
@@ -523,7 +523,7 @@ if ($_GET["action"] == 'create')
 		{
 			$html->select_date(-1,'ad',1,1,1,"action");
 		}
-		else
+		elseif ($_GET["afaire"] != 1)
 		{
 			$html->select_date(-1,'ad',1,1,1,"action");
 		}
diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php
index 141ea3cc192..c380c915626 100644
--- a/htdocs/comm/prospect/fiche.php
+++ b/htdocs/comm/prospect/fiche.php
@@ -221,9 +221,9 @@ if ($socid > 0)
 
     print '<div class="tabsAction">';
 
-    print '<a class="tabAction" href="../../contact/fiche.php?socid='.$societe->id.'&amp;action=create">'.$langs->trans("AddContact").'</a>';
+    print '<a class="tabAction" href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$societe->id.'&amp;action=create">'.$langs->trans("AddContact").'</a>';
 
-    print '<a class="tabAction" href="../action/fiche.php?action=create&socid='.$socid.'&afaire=1">'.$langs->trans("AddAction").'</a>';
+    print '<a class="tabAction" href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&socid='.$socid.'&afaire=1">'.$langs->trans("AddAction").'</a>';
 
 
     if ($conf->propal->enabled && defined("MAIN_MODULE_PROPALE") && MAIN_MODULE_PROPALE && $user->rights->propale->creer)
@@ -326,7 +326,7 @@ 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>';
+        print '<tr class="liste_titre"><td colspan="9"><a href="'.DOL_URL_ROOT.'/comm/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.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 ";
@@ -393,7 +393,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="'.DOL_URL_ROOT.'/comm/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;
@@ -425,7 +425,7 @@ if ($socid > 0)
          *      Listes des actions effectuées
          */
         print '<table width="100%" class="noborder">';
-        print '<tr class="liste_titre"><td colspan="9"><a href="action/index.php?socid='.$societe->id.'">'.$langs->trans("ActionsDone").'</a></td></tr>';
+        print '<tr class="liste_titre"><td colspan="9"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$societe->id.'">'.$langs->trans("ActionsDone").'</a></td></tr>';
 
         $sql = "SELECT a.id, ".$db->pdate("a.datea")." as da, c.code as acode, c.libelle, a.propalrowid, a.fk_user_author, fk_contact, u.code, u.rowid ";
         $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u ";