From 901bdf365c8d61eddefbfdedd49907f7d7b51176 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 5 Dec 2007 11:00:43 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20l'id=20du=20contact=20pour=20un=20rdv=20?=
 =?UTF-8?q?n'=E9tait=20pas=20r=E9cup=E9r=E9=20Fix:=20le=20code=20AC=5FRDV?=
 =?UTF-8?q?=20n'=E9tait=20pas=20r=E9cup=E9r=E9=20dans=20une=20fiche=20four?=
 =?UTF-8?q?nisseur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/action/fiche.php | 4 +++-
 htdocs/fourn/fiche.php       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index f04b873eb9f..7855fc0f32f 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Simon TOSSER         <simon@kornog-computing.com>
+ * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -339,8 +340,9 @@ if ($_GET["action"] == 'create')
 		// Si la societe est imposée, on propose ces contacts
 		if ($_REQUEST["socid"])
 		{
+			$contactid = $_REQUEST["contactid"]?$_REQUEST["contactid"]:'';
 			print '<tr><td>'.$langs->trans("ActionOnContact").'</td><td>';
-			$html->select_contacts($_REQUEST["socid"],'','contactid',1,1);
+			$html->select_contacts($_REQUEST["socid"],$contactid,'contactid',1,1);
 			print '</td></tr>';
 		}
 
diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php
index 22b3597cddd..d61ed36a982 100644
--- a/htdocs/fourn/fiche.php
+++ b/htdocs/fourn/fiche.php
@@ -351,7 +351,7 @@ if ( $societe->fetch($socid) )
 			print "<td align=\"center\"><a href=\"../contact/fiche.php?action=edit&amp;id=".$obj->rowid."\">".img_edit()."</a></td>";
 		}
 
-		print '<td align="center"><a href="../comm/action/fiche.php?action=create&actionid=5&contactid='.$obj->rowid.'&socid='.$societe->id.'">';
+		print '<td align="center"><a href="../comm/action/fiche.php?action=create&actioncode=AC_RDV&contactid='.$obj->rowid.'&socid='.$societe->id.'">';
 		print img_object($langs->trans("Rendez-Vous"),"action");
 		print '</a></td>';