bugfix sur actionid

This commit is contained in:
Rodolphe Quiedeville 2003-08-29 20:22:27 +00:00
parent 12e9ef5bb3
commit 73e2981a7d

View File

@ -39,7 +39,7 @@ if ($user->societe_id > 0)
* *
* *
*/ */
if ($action=='add_action') if ($HTTP_POST_VARS["action"] == 'add_action')
{ {
if ($contactid) if ($contactid)
{ {
@ -51,9 +51,11 @@ if ($action=='add_action')
if ($HTTP_POST_VARS["afaire"] <> 1) if ($HTTP_POST_VARS["afaire"] <> 1)
{ {
$actioncomm = new ActionComm($db); $actioncomm = new ActionComm($db);
$actioncomm->priority = 2;
$actioncomm->type = $HTTP_POST_VARS["actionid"];
$actioncomm->date = $db->idate(mktime($HTTP_POST_VARS["achour"], $actioncomm->date = $db->idate(mktime($HTTP_POST_VARS["achour"],
$HTTP_POST_VARS["acmin"], $HTTP_POST_VARS["acmin"],
0, 0,
@ -61,7 +63,7 @@ if ($action=='add_action')
$HTTP_POST_VARS["acday"], $HTTP_POST_VARS["acday"],
$HTTP_POST_VARS["acyear"]) $HTTP_POST_VARS["acyear"])
); );
if ($actionid == 5) if ($HTTP_POST_VARS["actionid"] == 5)
{ {
$actioncomm->percent = 0; $actioncomm->percent = 0;
} }
@ -69,8 +71,7 @@ if ($action=='add_action')
{ {
$actioncomm->percent = 100; $actioncomm->percent = 100;
} }
$actioncomm->priority = 2;
$actioncomm->type = $actionid;
$actioncomm->contact = $contactid; $actioncomm->contact = $contactid;
$actioncomm->user = $user; $actioncomm->user = $user;
@ -85,7 +86,7 @@ if ($action=='add_action')
{ {
$todo = new ActionComm($db); $todo = new ActionComm($db);
$todo->type = $actionid; $todo->type = $HTTP_POST_VARS["nextactionid"];
$todo->date = $db->idate(mktime(12,0,0,$remonth, $reday, $reyear)); $todo->date = $db->idate(mktime(12,0,0,$remonth, $reday, $reyear));
$todo->libelle = $todo_label; $todo->libelle = $todo_label;
$todo->priority = 2; $todo->priority = 2;
@ -165,17 +166,19 @@ if ($action=='create')
$societe = new Societe($db); $societe = new Societe($db);
$societe->get_nom($socid); $societe->get_nom($socid);
print '<form action="'.$PHP_SELF.'?socid='.$socid.'" method="post">';
print '<input type="hidden" name="action" value="add_action">';
print '<input type="hidden" name="actionid" value="'.$actionid.'">'."\n";
/* /*
* Rendez-vous * Rendez-vous
* *
*/ */
if ($actionid == 5) if ($actionid == 5)
{ {
print '<form action="'.$PHP_SELF.'?socid='.$socid.'" method="post">';
print '<input type="hidden" name="action" value="add_action">';
print '<input type="hidden" name="date" value="'.$db->idate(time()).'">'; print '<input type="hidden" name="date" value="'.$db->idate(time()).'">'."\n";
print '<input type="hidden" name="actionid" value="'.$actionid.'">';
print '<input type="hidden" name="contactid" value="'.$contactid.'">'; print '<input type="hidden" name="contactid" value="'.$contactid.'">';
print '<input type="hidden" name="socid" value="'.$socid.'">'; print '<input type="hidden" name="socid" value="'.$socid.'">';
@ -208,10 +211,8 @@ if ($action=='create')
*/ */
else else
{ {
print '<form action="'.$PHP_SELF.'?socid='.$socid.'" method="post">';
print '<input type="hidden" name="action" value="add_action">';
print '<input type="hidden" name="actionid" value="'.$actionid.'">';
print '<input type="hidden" name="contactid" value="'.$contactid.'">'; print '<input type="hidden" name="contactid" value="'.$contactid.'">';
print '<input type="hidden" name="socid" value="'.$socid.'">'; print '<input type="hidden" name="socid" value="'.$socid.'">';
@ -252,7 +253,7 @@ if ($action=='create')
print $html->select_date(); print $html->select_date();
print '</td></tr>'; print '</td></tr>';
print '<tr><td width="10%">Action</td><td>'; print '<tr><td width="10%">Action</td><td>';
$html->select_array("actionid", $caction->liste_array(), 0); $html->select_array("nextactionid", $caction->liste_array(), 0);
print '</td></tr>'; print '</td></tr>';
print '<tr><td width="10%">Action</td><td><input type="text" name="todo_label" size="30"></td></tr>'; print '<tr><td width="10%">Action</td><td><input type="text" name="todo_label" size="30"></td></tr>';
print '<tr><td width="10%">Calendrier</td><td><input type="checkbox" name="todo_webcal"></td></tr>'; print '<tr><td width="10%">Calendrier</td><td><input type="checkbox" name="todo_webcal"></td></tr>';