';
+ print '
';
- $head = task_prepare_head($object);
+ print '
';
- if ($action == 'edit' && $user->rights->projet->creer) {
- print '
';
- print '
';
- print '
';
+ print dol_get_fiche_end();
- print '';
+ print '
';
+ print '
';
+
+ print '';
+ } else {
+ /*
+ * Fiche tache en mode visu
+ */
+ $param = ($withproject ? '&withproject=1' : '');
+ $linkback = $withproject ? '
'.$langs->trans("BackToList").' ' : '';
+
+ print dol_get_fiche_head($head, 'task_task', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
+
+ if ($action == 'delete') {
+ print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".GETPOST("id", 'int').'&withproject='.$withproject, $langs->trans("DeleteATask"), $langs->trans("ConfirmDeleteATask"), "confirm_delete");
+ }
+
+ if (!GETPOST('withproject') || empty($projectstatic->id)) {
+ $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
+ $object->next_prev_filter = " fk_projet IN (".$db->sanitize($projectsListId).")";
} else {
- /*
- * Fiche tache en mode visu
- */
- $param = ($withproject ? '&withproject=1' : '');
- $linkback = $withproject ? '
'.$langs->trans("BackToList").' ' : '';
-
- print dol_get_fiche_head($head, 'task_task', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
-
- if ($action == 'delete') {
- print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".GETPOST("id", 'int').'&withproject='.$withproject, $langs->trans("DeleteATask"), $langs->trans("ConfirmDeleteATask"), "confirm_delete");
- }
-
- if (!GETPOST('withproject') || empty($projectstatic->id)) {
- $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
- $object->next_prev_filter = " fk_projet IN (".$db->sanitize($projectsListId).")";
- } else {
- $object->next_prev_filter = " fk_projet = ".((int) $projectstatic->id);
- }
-
- $morehtmlref = '';
-
- // Project
- if (empty($withproject)) {
- $morehtmlref .= '
';
- $morehtmlref .= $langs->trans("Project").': ';
- $morehtmlref .= $projectstatic->getNomUrl(1);
- $morehtmlref .= '
';
- }
-
- dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
-
- print '
';
- print '
';
-
- print '
';
- print '
';
-
- // Task parent
- print ''.$langs->trans("ChildOfTask").' ';
- if ($object->fk_task_parent > 0) {
- $tasktmp = new Task($db);
- $tasktmp->fetch($object->fk_task_parent);
- print $tasktmp->getNomUrl(1);
- }
- print ' '.$langs->trans("DateStart").' - '.$langs->trans("Deadline").' ';
- $start = dol_print_date($object->date_start, 'dayhour');
- print ($start ? $start : '?');
- $end = dol_print_date($object->date_end, 'dayhour');
- print ' - ';
- print ($end ? $end : '?');
- if ($object->hasDelay()) {
- print img_warning("Late");
- }
- print ' '.$langs->trans("PlannedWorkload").' ';
- if ($object->planned_workload != '') {
- print convertSecondToTime($object->planned_workload, 'allhourmin');
- }
- print ' '.$langs->trans("Description").' ';
- print nl2br($object->description);
- print ' ';
-
- print '
';
- print '
';
-
- print '
';
-
- print '
';
- print '
';
-
- // Progress declared
- print ''.$langs->trans("ProgressDeclared").' ';
- if ($object->progress != '') {
- print $object->progress.' %';
- }
- print ' '.$langs->trans("ProgressCalculated").' ';
- if ($object->planned_workload != '') {
- $tmparray = $object->getSummaryOfTimeSpent();
- if ($tmparray['total_duration'] > 0 && !empty($object->planned_workload)) {
- print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %';
- } else {
- print '0 %';
- }
- } else {
- print ''.$langs->trans("WorkloadNotDefined").' ';
- }
- print '
';
-
- print '
';
- print '
';
-
- print '
';
- print '
';
-
- print dol_get_fiche_end();
+ $object->next_prev_filter = " fk_projet = ".((int) $projectstatic->id);
}
+ $morehtmlref = '';
- if ($action != 'edit') {
- /*
- * Actions
- */
+ // Project
+ if (empty($withproject)) {
+ $morehtmlref .= '
';
+ $morehtmlref .= $langs->trans("Project").': ';
+ $morehtmlref .= $projectstatic->getNomUrl(1);
+ $morehtmlref .= '
';
- print '
';
+ // Third party
+ $morehtmlref .= $langs->trans("ThirdParty").': ';
+ if (!empty($projectstatic->thirdparty)) {
+ $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
+ }
+ $morehtmlref .= '
';
+ }
- $parameters = array();
- $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
- // modified by hook
- if (empty($reshook)) {
- // Modify
- if ($user->rights->projet->creer) {
- print '
'.$langs->trans('Modify').' ';
- } else {
- print '
'.$langs->trans('Modify').' ';
- }
+ dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
- // Delete
- if ($user->rights->projet->supprimer) {
- if (!$object->hasChildren() && !$object->hasTimeSpent()) {
- print '
'.$langs->trans('Delete').' ';
- } else {
- print '
'.$langs->trans('Delete').' ';
- }
- } else {
- print '
'.$langs->trans('Delete').' ';
- }
+ print '
';
+ print '
';
- print '
';
+ print '
';
+ print '
';
+
+ // Task parent
+ print ''.$langs->trans("ChildOfTask").' ';
+ if ($object->fk_task_parent > 0) {
+ $tasktmp = new Task($db);
+ $tasktmp->fetch($object->fk_task_parent);
+ print $tasktmp->getNomUrl(1);
+ }
+ print ' '.$langs->trans("DateStart").' - '.$langs->trans("Deadline").' ';
+ $start = dol_print_date($object->date_start, 'dayhour');
+ print ($start ? $start : '?');
+ $end = dol_print_date($object->date_end, 'dayhour');
+ print ' - ';
+ print ($end ? $end : '?');
+ if ($object->hasDelay()) {
+ print img_warning("Late");
+ }
+ print ' '.$langs->trans("PlannedWorkload").' ';
+ if ($object->planned_workload != '') {
+ print convertSecondToTime($object->planned_workload, 'allhourmin');
+ }
+ print ' '.$langs->trans("Description").' ';
+ print nl2br($object->description);
+ print ' ';
+
+ print '
';
+ print '
';
+
+ print '
';
+
+ print '
';
+ print '
';
+
+ // Progress declared
+ print ''.$langs->trans("ProgressDeclared").' ';
+ if ($object->progress != '') {
+ print $object->progress.' %';
+ }
+ print ' '.$langs->trans("ProgressCalculated").' ';
+ if ($object->planned_workload != '') {
+ $tmparray = $object->getSummaryOfTimeSpent();
+ if ($tmparray['total_duration'] > 0 && !empty($object->planned_workload)) {
+ print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %';
+ } else {
+ print '0 %';
+ }
+ } else {
+ print ''.$langs->trans("WorkloadNotDefined").' ';
+ }
+ print '
';
+
+ print '
';
+ print '
';
+
+ print '
';
+ print '
';
+
+ print dol_get_fiche_end();
+ }
+
+
+ if ($action != 'edit') {
+ /*
+ * Actions
+ */
+
+ print '
';
+
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+ // modified by hook
+ if (empty($reshook)) {
+ // Modify
+ if ($user->rights->projet->creer) {
+ print '
'.$langs->trans('Modify').' ';
+ } else {
+ print '
'.$langs->trans('Modify').' ';
}
- print '
';
- print '
'; // ancre
+ // Delete
+ if ($user->rights->projet->supprimer) {
+ if (!$object->hasChildren() && !$object->hasTimeSpent()) {
+ print '
'.$langs->trans('Delete').' ';
+ } else {
+ print '
'.$langs->trans('Delete').' ';
+ }
+ } else {
+ print '
'.$langs->trans('Delete').' ';
+ }
- /*
- * Generated documents
- */
- $filename = dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
- $filedir = $conf->projet->dir_output."/".dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
- $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
- $genallowed = ($user->rights->projet->lire);
- $delallowed = ($user->rights->projet->creer);
-
- print $formfile->showdocuments('project_task', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf);
-
- print '
';
-
- // List of actions on element
- include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
- $formactions = new FormActions($db);
- $defaultthirdpartyid = $socid > 0 ? $socid : $object->project->socid;
- $formactions->showactions($object, 'task', $defaultthirdpartyid, 1, '', 10, 'withproject='.$withproject);
-
- print '
';
+ print '
';
}
+
+ print '
';
+ print '
'; // ancre
+
+ /*
+ * Generated documents
+ */
+ $filename = dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
+ $filedir = $conf->projet->dir_output."/".dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
+ $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+ $genallowed = ($user->rights->projet->lire);
+ $delallowed = ($user->rights->projet->creer);
+
+ print $formfile->showdocuments('project_task', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf);
+
+ print '
';
+
+ // List of actions on element
+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+ $formactions = new FormActions($db);
+ $defaultthirdpartyid = $socid > 0 ? $socid : $object->project->socid;
+ $formactions->showactions($object, 'task', $defaultthirdpartyid, 1, '', 10, 'withproject='.$withproject);
+
+ print '
';
}
}
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index a85fdcf2db1..8e5877c7d0d 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -107,6 +107,13 @@ $extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($projectstatic->table_element);
$extrafields->fetch_name_optionals_label($object->table_element);
+if ($id > 0 || $ref) {
+ $object->fetch($id, $ref);
+}
+
+restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
+
+
/*
* Actions