lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: edit of percentage

Browse Source
This commit is contained in:
Laurent Destailleur 2012-09-02 14:10:51 +02:00
parent 1ccb8f3363
commit b891975b7d
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/comm/action/fiche.php
View File

@ -266,7 +266,7 @@ if ($action == 'confirm_delete' && GETPOST("confirm") == 'yes')
} }
/* /*
* Action mise a jour de l'action * Action update event
*/ */
if ($action == 'update') if ($action == 'update')
{ {
@ -277,14 +277,13 @@ if ($action == 'update')
$apmin=GETPOST('apmin'); $apmin=GETPOST('apmin');
$p2hour=GETPOST('p2hour'); $p2hour=GETPOST('p2hour');
$p2min=GETPOST('p2min'); $p2min=GETPOST('p2min');
$percentage=in_array(GETPOST('status'),array(-1,100))?GETPOST('status'):GETPOST("percentage"); // If status is -1 or 100, percentage is not defined and we must use status
// Clean parameters // Clean parameters
if ($aphour == -1) $aphour='0'; if ($aphour == -1) $aphour='0';
if ($apmin == -1) $apmin='0'; if ($apmin == -1) $apmin='0';
if ($p2hour == -1) $p2hour='0'; if ($p2hour == -1) $p2hour='0';
if ($p2min == -1) $p2min='0'; if ($p2min == -1) $p2min='0';
//if ($_POST["adhour"] == -1) $_POST["adhour"]='0';
//if ($_POST["admin"] == -1) $_POST["admin"]='0';
$actioncomm = new Actioncomm($db); $actioncomm = new Actioncomm($db);
$actioncomm->fetch($id); $actioncomm->fetch($id);
@ -295,9 +294,7 @@ if ($action == 'update')
$actioncomm->label = $_POST["label"]; $actioncomm->label = $_POST["label"];
$actioncomm->datep = $datep; $actioncomm->datep = $datep;
$actioncomm->datef = $datef; $actioncomm->datef = $datef;
//$actioncomm->date = $datea; $actioncomm->percentage = $percentage;
//$actioncomm->dateend = $datea2;
$actioncomm->percentage = $_POST["percentage"];
$actioncomm->priority = $_POST["priority"]; $actioncomm->priority = $_POST["priority"];
$actioncomm->fulldayevent= $_POST["fullday"]?1:0; $actioncomm->fulldayevent= $_POST["fullday"]?1:0;
$actioncomm->location = isset($_POST["location"])?$_POST["location"]:''; $actioncomm->location = isset($_POST["location"])?$_POST["location"]:'';
@ -307,7 +304,7 @@ if ($action == 'update')
$actioncomm->note = $_POST["note"]; $actioncomm->note = $_POST["note"];
$actioncomm->pnote = $_POST["note"]; $actioncomm->pnote = $_POST["note"];
if (! $datef && $_POST["percentage"] == 100) if (! $datef && $percentage == 100)
{ {
$error=$langs->trans("ErrorFieldRequired",$langs->trans("DateEnd")); $error=$langs->trans("ErrorFieldRequired",$langs->trans("DateEnd"));
$action = 'edit'; $action = 'edit';