Fix: Choose of contact for actions was lost

This commit is contained in:
Laurent Destailleur 2009-03-07 01:19:28 +00:00
parent 8faa018266
commit 8811d50769

View File

@ -428,10 +428,12 @@ $htmlactions = new FormActions($db);
if ($_GET["action"] == 'create') if ($_GET["action"] == 'create')
{ {
if ($_GET["contactid"]) $contact = new Contact($db);
if ($_REQUEST["contactid"])
{ {
$contact = new Contact($db); $result=$contact->fetch($_REQUEST["contactid"]);
$result=$contact->fetch($_GET["contactid"]); if ($result < 0) dol_print_error($db,$contact->error);
} }
print '<form name="formaction" action="fiche.php" method="post">'; print '<form name="formaction" action="fiche.php" method="post">';
@ -481,10 +483,8 @@ if ($_GET["action"] == 'create')
} }
print '</td></tr>'; print '</td></tr>';
// Si la societe est imposee, on propose ces contacts // If company is forced, we propose contacts (may be contact is also forced)
if ($_REQUEST["socid"] > 0)
// If company is forced propose contacts
if ($_REQUEST["socid"] > 0 && !($_REQUEST['contactid'] > 0))
{ {
print '<tr><td nowrap>'.$langs->trans("ActionOnContact").'</td><td>'; print '<tr><td nowrap>'.$langs->trans("ActionOnContact").'</td><td>';
$html->select_contacts($_REQUEST["socid"],$_REQUEST['contactid'],'contactid',1,1); $html->select_contacts($_REQUEST["socid"],$_REQUEST['contactid'],'contactid',1,1);