diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 7838a3597d1c8..9316c2bcf68c3 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -342,12 +342,12 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t // Date start print ''; - print dol_print_date($lines[$i]->date_start,'day'); + print dol_print_date($lines[$i]->date_start,'dayhour'); print ''; // Date end print ''; - print dol_print_date($lines[$i]->date_end,'day'); + print dol_print_date($lines[$i]->date_end,'dayhour'); print ''; // Planned Workload (in working hours) @@ -500,12 +500,12 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr // Date start print ''; - print dol_print_date($lines[$i]->date_start,'day'); + print dol_print_date($lines[$i]->date_start,'dayhour'); print ''; // Date end print ''; - print dol_print_date($lines[$i]->date_end,'day'); + print dol_print_date($lines[$i]->date_end,'dayhour'); print ''; // Planned Workload diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index db473165d5421..33520901f168f 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -83,8 +83,8 @@ { $error=0; - $date_start = dol_mktime(0,0,0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']); - $date_end = dol_mktime(0,0,0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']); + $date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyeassskr'],'user'); + $date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user'); if (empty($_POST["cancel"])) { @@ -232,12 +232,12 @@ // Date start print ''.$langs->trans("DateStart").''; - print dol_print_date($object->date_start,'day'); + print dol_print_date($object->date_start,'dayhour'); print ''; // Date end print ''.$langs->trans("DateEnd").''; - print dol_print_date($object->date_end,'day'); + print dol_print_date($object->date_end,'dayhour'); print ''; // Other options @@ -302,12 +302,12 @@ // Date start print ''.$langs->trans("DateStart").''; - print $form->select_date(($date_start?$date_start:''),'dateo',0,0,0,'',1,1); + print $form->select_date(($date_start?$date_start:''),'dateo',1,1,0,'',1,1); print ''; // Date end print ''.$langs->trans("DateEnd").''; - print $form->select_date(($date_end?$date_end:-1),'datee',0,0,0,'',1,1); + print $form->select_date(($date_end?$date_end:-1),'datee',1,1,0,'',1,1); print ''; // planned workload diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 5e16715445c47..1dc4edf7ee8fa 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -83,8 +83,8 @@ $object->description = $_POST['description']; $object->fk_task_parent = $task_parent; $object->planned_workload = $planned_workload; - $object->date_start = dol_mktime(0,0,0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']); - $object->date_end = dol_mktime(0,0,0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']); + $object->date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear'],'user'); + $object->date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user'); $object->progress = $_POST['progress']; // Fill array 'array_options' with data from add form @@ -322,12 +322,12 @@ // Date start print ''.$langs->trans("DateStart").''; - print $form->select_date($object->date_start,'dateo'); + print $form->select_date($object->date_start,'dateo',1,1); print ''; // Date end print ''.$langs->trans("DateEnd").''; - print $form->select_date($object->date_end?$object->date_end:-1,'datee'); + print $form->select_date($object->date_end?$object->date_end:-1,'datee',1,1); print ''; // Planned workload @@ -411,12 +411,12 @@ // Date start print ''.$langs->trans("DateStart").''; - print dol_print_date($object->date_start,'day'); + print dol_print_date($object->date_start,'dayhour'); print ''; // Date end print ''.$langs->trans("DateEnd").''; - print dol_print_date($object->date_end,'day'); + print dol_print_date($object->date_end,'dayhour'); print ''; // Planned workload