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

Merge pull request #210 from FHenry/develop

Browse Source 
Correct start date and end date to be midnight rather than midday
This commit is contained in:
Laurent Destailleur 2012-05-23 05:37:08 -07:00
commit 5c995a421c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/projet/fiche.php
View File

@ -124,8 +124,8 @@ if ($action == 'add' && $user->rights->projet->creer)
$project->description = GETPOST('description','alpha'); $project->description = GETPOST('description','alpha');
$project->public = GETPOST('public','alpha'); $project->public = GETPOST('public','alpha');
$project->datec=dol_now(); $project->datec=dol_now();
$project->date_start=dol_mktime(12,0,0,GETPOST('projectmonth','int'),GETPOST('projectday','int'),GETPOST('projectyear','int')); $project->date_start=dol_mktime(0,0,0,GETPOST('projectmonth','int'),GETPOST('projectday','int'),GETPOST('projectyear','int'));
$project->date_end=dol_mktime(12,0,0,GETPOST('projectendmonth','int'),GETPOST('projectendday','int'),GETPOST('projectendyear','int')); $project->date_end=dol_mktime(0,0,0,GETPOST('projectendmonth','int'),GETPOST('projectendday','int'),GETPOST('projectendyear','int'));
$result = $project->create($user); $result = $project->create($user);
if ($result > 0) if ($result > 0)

4
htdocs/projet/tasks/task.php
View File

@ -69,8 +69,8 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer)
$object->label = $_POST["label"]; $object->label = $_POST["label"];
$object->description = $_POST['description']; $object->description = $_POST['description'];
$object->fk_task_parent = $task_parent; $object->fk_task_parent = $task_parent;
$object->date_start = dol_mktime(12,0,0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']); $object->date_start = dol_mktime(0,0,0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']);
$object->date_end = dol_mktime(12,0,0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']); $object->date_end = dol_mktime(0,0,0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']);
$object->progress = $_POST['progress']; $object->progress = $_POST['progress'];
$result=$object->update($user); $result=$object->update($user);