';
- // Title
- $morehtmlref .= $projectstatic->title;
- // Thirdparty
- if ($projectstatic->thirdparty->id > 0) {
- $morehtmlref .= '
'.$projectstatic->thirdparty->getNomUrl(1, 'project');
- }
- $morehtmlref .= '
';
-
- // Define a complementary filter for search of next/prev ref.
- if (!$user->hasRight('projet', 'all', 'lire')) {
- $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
- $projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
- }
-
- dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
- print '';
+ // Title
+ $morehtmlref .= $projectstatic->title;
+ // Thirdparty
+ if ($projectstatic->thirdparty->id > 0)
+ {
+ $morehtmlref .= '
'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
+ }
+ $morehtmlref .= '
';
+
+ // Define a complementary filter for search of next/prev ref.
+ if (!$user->rights->projet->all->lire)
+ {
+ $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
+ $projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+ }
+
+ dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+ print '';
- $morehtmlref .= $langs->trans("Project").': ';
- $morehtmlref .= $projectstatic->getNomUrl(1);
- $morehtmlref .= '
';
-
- // Third party
- $morehtmlref .= $langs->trans("ThirdParty").': ';
- if (!empty($projectstatic->thirdparty)) {
- $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
- }
- $morehtmlref .= '
';
+ if (empty($withproject))
+ {
+ $morehtmlref .= '';
+ $morehtmlref .= $langs->trans("Project").': ';
+ $morehtmlref .= $projectstatic->getNomUrl(1);
+ $morehtmlref .= '
';
+
+ // Third party
+ $morehtmlref .= $langs->trans("ThirdParty").': ';
+ if (!empty($projectstatic->thirdparty)) {
+ $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
+ }
+ $morehtmlref .= '
';
@@ -338 +325 @@
- print dol_get_fiche_end();
+ dol_fiche_end();
--- /tmp/dsg/dolibarr/htdocs/projet/tasks/github_19.0.3_contact.php
+++ /tmp/dsg/dolibarr/htdocs/projet/tasks/client_contact.php
@@ -38 +38 @@
-$action = GETPOST('action', 'aZ09');
+$action = GETPOST('action', 'alpha');
@@ -42,0 +43,6 @@
+// Security check
+$socid = 0;
+//if ($user->socid > 0) $socid = $user->socid; // For external user, no check is done on company because readability is managed by public status of project and assignement.
+//$result = restrictedArea($user, 'projet', $id, 'projet_task');
+if (!$user->rights->projet->lire) accessforbidden();
+
@@ -45,9 +50,0 @@
-
-if ($id > 0 || $ref) {
- $object->fetch($id, $ref);
-}
-
-// Security check
-$socid = 0;
-
-restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
@@ -61,6 +58,2 @@
-if ($action == 'addcontact' && $user->hasRight('projet', 'creer')) {
- $source = 'internal';
- if (GETPOST("addsourceexternal")) {
- $source = 'external';
- }
-
+if ($action == 'addcontact' && $user->rights->projet->creer)
+{
@@ -69,24 +62,27 @@
- if ($result > 0 && $id > 0) {
- if ($source == 'internal') {
- $idfortaskuser = ((GETPOST("userid") != 0 && GETPOST('userid') != -1) ? GETPOST("userid") : 0); // GETPOST('contactid') may val -1 to mean empty or -2 to means "everybody"
- $typeid = GETPOST('type');
- } else {
- $idfortaskuser = ((GETPOST("contactid") > 0) ? GETPOST("contactid", 'int') : 0); // GETPOST('contactid') may val -1 to mean empty or -2 to means "everybody"
- $typeid = GETPOST('typecontact');
- }
- if ($idfortaskuser == -2) {
- $result = $projectstatic->fetch($object->fk_project);
- if ($result <= 0) {
- dol_print_error($db, $projectstatic->error, $projectstatic->errors);
- } else {
- $contactsofproject = $projectstatic->getListContactId('internal');
- foreach ($contactsofproject as $key => $val) {
- $result = $object->add_contact($val, $typeid, $source);
- }
- }
- } else {
- $result = $object->add_contact($idfortaskuser, $typeid, $source);
- }
- }
-
- if ($result >= 0) {
+ if ($result > 0 && $id > 0)
+ {
+ $idfortaskuser = (GETPOST("contactid") != 0) ?GETPOST("contactid") : GETPOST("userid"); // GETPOST('contactid') may val -1 to mean empty or -2 to means "everybody"
+ if ($idfortaskuser == -2)
+ {
+ $result = $projectstatic->fetch($object->fk_project);
+ if ($result <= 0)
+ {
+ dol_print_error($db, $projectstatic->error, $projectstatic->errors);
+ }
+ else
+ {
+ $contactsofproject = $projectstatic->getListContactId('internal');
+ foreach ($contactsofproject as $key => $val)
+ {
+ $result = $object->add_contact($val, GETPOST("type"), GETPOST("source"));
+ }
+ }
+ }
+ else
+ {
+ $result = $object->add_contact($idfortaskuser, GETPOST("type"), GETPOST("source"));
+ }
+ }
+
+ if ($result >= 0)
+ {
@@ -95,2 +91,5 @@
- } else {
- if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+ }
+ else
+ {
+ if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+ {
@@ -99 +98,3 @@
- } else {
+ }
+ else
+ {
@@ -106,4 +107,8 @@
-if ($action == 'swapstatut' && $user->hasRight('projet', 'creer')) {
- if ($object->fetch($id, $ref)) {
- $result = $object->swapContactStatus(GETPOST('ligne', 'int'));
- } else {
+if ($action == 'swapstatut' && $user->rights->projet->creer)
+{
+ if ($object->fetch($id, $ref))
+ {
+ $result = $object->swapContactStatus(GETPOST('ligne'));
+ }
+ else
+ {
@@ -115 +120,2 @@
-if ($action == 'deleteline' && $user->hasRight('projet', 'creer')) {
+if ($action == 'deleteline' && $user->rights->projet->creer)
+{
@@ -117,3 +123,4 @@
- $result = $object->delete_contact(GETPOST("lineid", 'int'));
-
- if ($result >= 0) {
+ $result = $object->delete_contact($_GET["lineid"]);
+
+ if ($result >= 0)
+ {
@@ -122 +129,3 @@
- } else {
+ }
+ else
+ {
@@ -127,3 +136,5 @@
-// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
-if (!empty($project_ref) && !empty($withproject)) {
- if ($projectstatic->fetch(0, $project_ref) > 0) {
+// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
+if (!empty($project_ref) && !empty($withproject))
+{
+ if ($projectstatic->fetch(0, $project_ref) > 0)
+ {
@@ -131 +142,2 @@
- if (count($tasksarray) > 0) {
+ if (count($tasksarray) > 0)
+ {
@@ -133 +145,3 @@
- } else {
+ }
+ else
+ {
@@ -142,0 +157,3 @@
+
+llxHeader('', $langs->trans("Task"));
+
@@ -147,9 +163,0 @@
-$result = $projectstatic->fetch($object->fk_project);
-
-$title = $object->ref . ' - ' . $langs->trans("Contacts");
-if (!empty($withproject)) {
- $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ;
-}
-$help_url = '';
-
-llxHeader('', $title, $help_url);
@@ -164,13 +172,10 @@
-if ($id > 0 || !empty($ref)) {
- if ($object->fetch($id, $ref) > 0) {
- if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_TASK') && method_exists($object, 'fetchComments') && empty($object->comments)) {
- $object->fetchComments();
- }
- $id = $object->id; // So when doing a search from ref, id is also set correctly.
-
- if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
- $projectstatic->fetchComments();
- }
- if (!empty($projectstatic->socid)) {
- $projectstatic->fetch_thirdparty();
- }
+if ($id > 0 || !empty($ref))
+{
+ if ($object->fetch($id, $ref) > 0)
+ {
+ if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
+ $id = $object->id; // So when doing a search from ref, id is also set correctly.
+
+ $result = $projectstatic->fetch($object->fk_project);
+ if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) $projectstatic->fetchComments();
+ if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
@@ -182,7 +187,8 @@
- if ($withproject) {
- // Tabs for project
- $tab = 'tasks';
- $head = project_prepare_head($projectstatic);
- print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
-
- $param = (!empty($mode) && $mode == 'mine' ? '&mode=mine' : '');
+ if ($withproject)
+ {
+ // Tabs for project
+ $tab = 'tasks';
+ $head = project_prepare_head($projectstatic);
+ dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
+
+ $param = ($mode == 'mine' ? '&mode=mine' : '');
@@ -192,121 +198,112 @@
- $linkback = '';
- // Title
- $morehtmlref .= $projectstatic->title;
- // Thirdparty
- if (isset($projectstatic->thirdparty->id) && $projectstatic->thirdparty->id > 0) {
- $morehtmlref .= '
'.$projectstatic->thirdparty->getNomUrl(1, 'project');
- }
- $morehtmlref .= '
';
-
- // Define a complementary filter for search of next/prev ref.
- if (!$user->hasRight('projet', 'all', 'lire')) {
- $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
- $projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
- }
-
- dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
- print '';
+ // Title
+ $morehtmlref .= $projectstatic->title;
+ // Thirdparty
+ if ($projectstatic->thirdparty->id > 0)
+ {
+ $morehtmlref .= '
'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
+ }
+ $morehtmlref .= '
';
+
+ // Define a complementary filter for search of next/prev ref.
+ if (!$user->rights->projet->all->lire)
+ {
+ $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
+ $projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+ }
+
+ dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+ print '';
- $morehtmlref .= $langs->trans("Project").': ';
- $morehtmlref .= $projectstatic->getNomUrl(1);
- $morehtmlref .= '
';
-
- // Third party
- $morehtmlref .= $langs->trans("ThirdParty").': ';
- if ($projectstatic->socid > 0) {
- $projectstatic->fetch_thirdparty();
- $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
- }
-
- $morehtmlref .= '
';
+ if (empty($withproject))
+ {
+ $result = $projectstatic->fetch($object->fk_project);
+ $morehtmlref .= '';
+ $morehtmlref .= $langs->trans("Project").': ';
+ $morehtmlref .= $projectstatic->getNomUrl(1);
+ $morehtmlref .= '
';
+
+ // Third party
+ $morehtmlref .= $langs->trans("ThirdParty").': ';
+ if ($projectstatic->socid > 0) {
+ $projectstatic->fetch_thirdparty();
+ $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
+ }
+
+ $morehtmlref .= '
';
@@ -356 +354 @@
- print dol_get_fiche_end();
+ dol_fiche_end();
@@ -366,2 +364,2 @@
- $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
- if ($res) break;
+ $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+ if ($res) break;
@@ -374,8 +371,0 @@
- print ''."\n";
+print "";
+print '';
+
+print '';
--- /tmp/dsg/dolibarr/htdocs/projet/tasks/github_19.0.3_note.php
+++ /tmp/dsg/dolibarr/htdocs/projet/tasks/client_note.php
@@ -32 +32 @@
-$action = GETPOST('action', 'aZ09');
+$action = GETPOST('action', 'alpha');
@@ -34 +34 @@
-$mine = GETPOST('mode') == 'mine' ? 1 : 0;
+$mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
@@ -44,6 +44,2 @@
-if (!$user->hasRight('projet', 'lire')) {
- accessforbidden();
-}
-
-$hookmanager->initHooks(array('projettasknote'));
-
+if (!$user->rights->projet->lire) accessforbidden();
+//$result = restrictedArea($user, 'projet', $id, '', 'task'); // TODO ameliorer la verification
@@ -54,5 +50,5 @@
-if ($id > 0 || !empty($ref)) {
- if ($object->fetch($id, $ref) > 0) {
- if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_TASK') && method_exists($object, 'fetchComments') && empty($object->comments)) {
- $object->fetchComments();
- }
+if ($id > 0 || !empty($ref))
+{
+ if ($object->fetch($id, $ref) > 0)
+ {
+ if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
@@ -60,6 +56,2 @@
- if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
- $projectstatic->fetchComments();
- }
- if (!empty($projectstatic->socid)) {
- $projectstatic->fetch_thirdparty();
- }
+ if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) $projectstatic->fetchComments();
+ if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
@@ -68 +60,3 @@
- } else {
+ }
+ else
+ {
@@ -74,3 +68,5 @@
-// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
-if (!empty($project_ref) && !empty($withproject)) {
- if ($projectstatic->fetch(0, $project_ref) > 0) {
+// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
+if (!empty($project_ref) && !empty($withproject))
+{
+ if ($projectstatic->fetch(0, $project_ref) > 0)
+ {
@@ -78 +74,2 @@
- if (count($tasksarray) > 0) {
+ if (count($tasksarray) > 0)
+ {
@@ -81 +78,3 @@
- } else {
+ }
+ else
+ {
@@ -87,8 +86 @@
-if ($id > 0 || $ref) {
- $object->fetch($id, $ref);
-}
-
-//$result = restrictedArea($user, 'projet', $id, '', 'task'); // TODO ameliorer la verification
-restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
-
-$permissionnote = ($user->hasRight('projet', 'creer') || $user->hasRight('projet', 'all', 'creer'));
+$permissionnote = ($user->rights->projet->creer || $user->rights->projet->all->creer);
@@ -101,8 +93 @@
-$parameters = array();
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) {
- setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-}
-if (empty($reshook)) {
- include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
-}
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';
@@ -113,0 +99,3 @@
+
+llxHeader('', $langs->trans("Task"));
+
@@ -119,9 +107,2 @@
-$title = $object->ref . ' - ' . $langs->trans("Notes");
-if (!empty($withproject)) {
- $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ;
-}
-$help_url = '';
-
-llxHeader('', $title, $help_url);
-
-if ($object->id > 0) {
+if ($object->id > 0)
+{
@@ -130 +111,2 @@
- if (!empty($withproject)) {
+ if (!empty($withproject))
+ {
@@ -134,3 +116,3 @@
- print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
-
- $param = (isset($mode) && $mode == 'mine' ? '&mode=mine' : '');
+ dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
+
+ $param = ($mode == 'mine' ? '&mode=mine' : '');
@@ -145,2 +127,3 @@
- if (isset($projectstatic->thirdparty->id) && $projectstatic->thirdparty->id > 0) {
- $morehtmlref .= '| '.$langs->trans("Dates").' | ';
- $start = dol_print_date($projectstatic->date_start, 'day');
- print($start ? $start : '?');
- $end = dol_print_date($projectstatic->date_end, 'day');
- print ' - ';
- print($end ? $end : '?');
- if ($projectstatic->hasDelay()) {
- print img_warning("Late");
- }
+ if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
@@ -233,0 +205 @@
+ print ' ';
@@ -244,4 +216,4 @@
- if (isModEnabled('categorie')) {
- print ' |
| '.$langs->trans("Categories").' | ';
- print $form->showCategories($projectstatic->id, 'project', 1);
- print " |
";
+ if ($conf->categorie->enabled) {
+ print '| '.$langs->trans("Categories").' | ';
+ print $form->showCategories($projectstatic->id, 'project', 1);
+ print " |
";
@@ -253,0 +226 @@
+ print '';
@@ -257 +230 @@
- print dol_get_fiche_end();
+ dol_fiche_end();
@@ -263 +236 @@
- print dol_get_fiche_head($head, 'task_notes', $langs->trans('Task'), -1, 'projecttask', 0, '', 'reposition');
+ dol_fiche_head($head, 'task_notes', $langs->trans('Task'), -1, 'projecttask', 0, '', 'reposition');
@@ -269,6 +242,6 @@
- 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);
- }
+ if (!GETPOST('withproject') || empty($projectstatic->id))
+ {
+ $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
+ $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
+ }
+ else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
@@ -279,10 +252,11 @@
- if (empty($withproject)) {
- $morehtmlref .= '';
- $morehtmlref .= $langs->trans("Project").': ';
- $morehtmlref .= $projectstatic->getNomUrl(1);
- $morehtmlref .= '
';
-
- // Third party
- $morehtmlref .= $langs->trans("ThirdParty").': ';
- $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
- $morehtmlref .= '
';
+ if (empty($withproject))
+ {
+ $morehtmlref .= '';
+ $morehtmlref .= $langs->trans("Project").': ';
+ $morehtmlref .= $projectstatic->getNomUrl(1);
+ $morehtmlref .= '
';
+
+ // Third party
+ $morehtmlref .= $langs->trans("ThirdParty").': ';
+ $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
+ $morehtmlref .= '
';
@@ -295 +269 @@
- print '';
+ print '';
@@ -298 +272 @@
- $moreparam = $param;
+ $moreparam = $param;
@@ -303 +277 @@
- print dol_get_fiche_end();
+ dol_fiche_end();
--- /tmp/dsg/dolibarr/htdocs/projet/tasks/github_19.0.3_task.php
+++ /tmp/dsg/dolibarr/htdocs/projet/tasks/client_task.php
@@ -40,3 +39,0 @@
-$action = GETPOST('action', 'aZ09');
-$confirm = GETPOST('confirm', 'alpha');
-
@@ -45,0 +43,2 @@
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
@@ -48,2 +47,6 @@
-$planned_workload = ((GETPOST('planned_workloadhour', 'int') != '' || GETPOST('planned_workloadmin', 'int') != '') ? (GETPOST('planned_workloadhour', 'int') > 0 ? GETPOST('planned_workloadhour', 'int') * 3600 : 0) + (GETPOST('planned_workloadmin', 'int') > 0 ? GETPOST('planned_workloadmin', 'int') * 60 : 0) : '');
-$mode = GETPOST('mode', 'alpha');
+$planned_workload = ((GETPOST('planned_workloadhour', 'int') != '' || GETPOST('planned_workloadmin', 'int') != '') ? (GETPOST('planned_workloadhour', 'int') > 0 ?GETPOST('planned_workloadhour', 'int') * 3600 : 0) + (GETPOST('planned_workloadmin', 'int') > 0 ?GETPOST('planned_workloadmin', 'int') * 60 : 0) : '');
+
+// Security check
+$socid = 0;
+//if ($user->socid > 0) $socid = $user->socid; // For external user, no check is done on company because readability is managed by public status of project and assignement.
+if (!$user->rights->projet->lire) accessforbidden();
@@ -63,14 +66 @@
-if ($reshook < 0) {
- setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-}
-
-if ($id > 0 || $ref) {
- $object->fetch($id, $ref);
-}
-
-// Security check
-$socid = 0;
-
-restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
-
-
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -82 +72,2 @@
-if ($action == 'update' && !GETPOST("cancel") && $user->hasRight('projet', 'creer')) {
+if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer)
+{
@@ -85 +76,2 @@
- if (empty($taskref)) {
+ if (empty($taskref))
+ {
@@ -89 +81,2 @@
- if (!GETPOST("label")) {
+ if (empty($_POST["label"]))
+ {
@@ -93,4 +86,6 @@
- if (!$error) {
- $object->oldcopy = clone $object;
-
- $tmparray = explode('_', GETPOST('task_parent'));
+ if (!$error)
+ {
+ $object->fetch($id, $ref);
+ $object->oldcopy = clone $object;
+
+ $tmparray = explode('_', $_POST['task_parent']);
@@ -98,3 +93 @@
- if (empty($task_parent)) {
- $task_parent = 0; // If task_parent is ''
- }
+ if (empty($task_parent)) $task_parent = 0; // If task_parent is ''
@@ -103,6 +96,2 @@
- $object->label = GETPOST("label", "alphanohtml");
- if (!getDolGlobalString('FCKEDITOR_ENABLE_SOCIETE')) {
- $object->description = GETPOST('description', "alphanohtml");
- } else {
- $object->description = GETPOST('description', "restricthtml");
- }
+ $object->label = $_POST["label"];
+ $object->description = $_POST['description'];
@@ -111,4 +100,3 @@
- $object->date_start = dol_mktime(GETPOST('dateohour', 'int'), GETPOST('dateomin', 'int'), 0, GETPOST('dateomonth', 'int'), GETPOST('dateoday', 'int'), GETPOST('dateoyear', 'int'));
- $object->date_end = dol_mktime(GETPOST('dateehour', 'int'), GETPOST('dateemin', 'int'), 0, GETPOST('dateemonth', 'int'), GETPOST('dateeday', 'int'), GETPOST('dateeyear', 'int'));
- $object->progress = price2num(GETPOST('progress', 'alphanohtml'));
- $object->budget_amount = price2num(GETPOST('budget_amount', 'alphanohtml'));
+ $object->date_start = dol_mktime($_POST['dateohour'], $_POST['dateomin'], 0, $_POST['dateomonth'], $_POST['dateoday'], $_POST['dateoyear']);
+ $object->date_end = dol_mktime($_POST['dateehour'], $_POST['dateemin'], 0, $_POST['dateemonth'], $_POST['dateeday'], $_POST['dateeyear']);
+ $object->progress = $_POST['progress'];
@@ -117,6 +105,5 @@
- $ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
- if ($ret < 0) {
- $error++;
- }
-
- if (!$error) {
+ $ret = $extrafields->setOptionalsFromPost(null, $object);
+ if ($ret < 0) $error++;
+
+ if (!$error)
+ {
@@ -124,8 +111,8 @@
- if ($result < 0) {
- setEventMessages($object->error, $object->errors, 'errors');
- $action = 'edit';
- }
- } else {
- $action = 'edit';
- }
- } else {
+ if ($result < 0)
+ {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ }
+ }
+ else
+ {
@@ -136,19 +123,17 @@
-if ($action == 'confirm_clone' && $confirm == 'yes') {
- //$clone_contacts = GETPOST('clone_contacts') ? 1 : 0;
- $clone_prog = GETPOST('clone_prog') ? 1 : 0;
- $clone_time = GETPOST('clone_time') ? 1 : 0;
- $clone_affectation = GETPOST('clone_affectation') ? 1 : 0;
- $clone_change_dt = GETPOST('clone_change_dt') ? 1 : 0;
- $clone_notes = GETPOST('clone_notes') ? 1 : 0;
- $clone_file = GETPOST('clone_file') ? 1 : 0;
- $result = $object->createFromClone($user, $object->id, $object->fk_project, $object->fk_task_parent, $clone_change_dt, $clone_affectation, $clone_time, $clone_file, $clone_notes, $clone_prog);
- if ($result <= 0) {
- setEventMessages($object->error, $object->errors, 'errors');
- } else {
- // Load new object
- $newobject = new Task($db);
- $newobject->fetch($result);
- $newobject->fetch_optionals();
- $newobject->fetch_thirdparty(); // Load new object
- $object = $newobject;
- $action = '';
+if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->supprimer)
+{
+ if ($object->fetch($id, $ref) >= 0)
+ {
+ $result = $projectstatic->fetch($object->fk_project);
+ $projectstatic->fetch_thirdparty();
+
+ if ($object->delete($user) > 0)
+ {
+ header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?restore_lastsearch_values=1&id='.$projectstatic->id.($withproject ? '&withproject=1' : ''));
+ exit;
+ }
+ else
+ {
+ setEventMessages($object->error, $object->errors, 'errors');
+ $action = '';
+ }
@@ -158,10 +143,14 @@
-if ($action == 'confirm_delete' && $confirm == "yes" && $user->hasRight('projet', 'supprimer')) {
- $result = $projectstatic->fetch($object->fk_project);
- $projectstatic->fetch_thirdparty();
-
- if ($object->delete($user) > 0) {
- header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?restore_lastsearch_values=1&id='.$projectstatic->id.($withproject ? '&withproject=1' : ''));
- exit;
- } else {
- setEventMessages($object->error, $object->errors, 'errors');
- $action = '';
+// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
+if (!empty($project_ref) && !empty($withproject))
+{
+ if ($projectstatic->fetch('', $project_ref) > 0)
+ {
+ $tasksarray = $object->getTasksArray(0, 0, $projectstatic->id, $socid, 0);
+ if (count($tasksarray) > 0)
+ {
+ $id = $tasksarray[0]->id;
+ }
+ else
+ {
+ header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode));
+ }
@@ -171,12 +159,0 @@
-// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
-if (!empty($project_ref) && !empty($withproject)) {
- if ($projectstatic->fetch('', $project_ref) > 0) {
- $tasksarray = $object->getTasksArray(0, 0, $projectstatic->id, $socid, 0);
- if (count($tasksarray) > 0) {
- $id = $tasksarray[0]->id;
- } else {
- header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode));
- }
- }
-}
-
@@ -184 +161,4 @@
-if ($action == 'builddoc' && $user->hasRight('projet', 'creer')) {
+if ($action == 'builddoc' && $user->rights->projet->creer)
+{
+ $object->fetch($id, $ref);
+
@@ -186,3 +166 @@
- if (GETPOST('model')) {
- $object->setDocModel($user, GETPOST('model', 'alpha'));
- }
+ if (GETPOST('model')) $object->setDocModel($user, GETPOST('model', 'alpha'));
@@ -191 +169,2 @@
- if (GETPOST('lang_id', 'aZ09')) {
+ if (GETPOST('lang_id', 'aZ09'))
+ {
@@ -195,2 +174,3 @@
- $result = $object->generateDocument($object->model_pdf, $outputlangs);
- if ($result <= 0) {
+ $result = $object->generateDocument($object->modelpdf, $outputlangs);
+ if ($result <= 0)
+ {
@@ -198 +178 @@
- $action = '';
+ $action = '';
@@ -203 +183,2 @@
-if ($action == 'remove_file' && $user->hasRight('projet', 'creer')) {
+if ($action == 'remove_file' && $user->rights->projet->creer)
+{
@@ -206,9 +187,9 @@
- $langs->load("other");
- $upload_dir = $conf->project->dir_output;
- $file = $upload_dir.'/'.dol_sanitizeFileName(GETPOST('file'));
-
- $ret = dol_delete_file($file);
- if ($ret) {
- setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
- } else {
- setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+ if ($object->fetch($id, $ref) >= 0)
+ {
+ $langs->load("other");
+ $upload_dir = $conf->projet->dir_output;
+ $file = $upload_dir.'/'.GETPOST('file');
+
+ $ret = dol_delete_file($file);
+ if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+ else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
@@ -217 +197,0 @@
-
@@ -221,0 +202,4 @@
+
+
+llxHeader('', $langs->trans("Task"));
+
@@ -225,431 +209,142 @@
-$result = $projectstatic->fetch($object->fk_project);
-
-$title = $object->ref;
-if (!empty($withproject)) {
- $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ;
-}
-$help_url = '';
-
-llxHeader('', $title, $help_url);
-
-
-if ($id > 0 || !empty($ref)) {
- $res = $object->fetch_optionals();
- if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_TASK') && method_exists($object, 'fetchComments') && empty($object->comments)) {
- $object->fetchComments();
- }
-
-
- if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
- $projectstatic->fetchComments();
- }
- if (!empty($projectstatic->socid)) {
- $projectstatic->fetch_thirdparty();
- }
-
- $object->project = clone $projectstatic;
-
- //$userWrite = $projectstatic->restrictedProjectArea($user, 'write');
-
- if (!empty($withproject)) {
- // Tabs for project
- $tab = 'tasks';
- $head = project_prepare_head($projectstatic);
- print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'), 0, '', '');
-
- $param = ($mode == 'mine' ? '&mode=mine' : '');
-
- // Project card
-
- $linkback = ''.$langs->trans("BackToList").'';
-
- $morehtmlref = '';
- // Title
- $morehtmlref .= $projectstatic->title;
- // Thirdparty
- if (!empty($projectstatic->thirdparty->id) &&$projectstatic->thirdparty->id > 0) {
- $morehtmlref .= '
'.$projectstatic->thirdparty->getNomUrl(1, 'project');
- }
- $morehtmlref .= '
';
-
- // Define a complementary filter for search of next/prev ref.
- if (!$user->hasRight('projet', 'all', 'lire')) {
- $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
- $projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
- }
-
- dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
-
- print '';
- print '
';
- print '
';
-
- print '
';
-
- // Usage
- if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
- print '| ';
- print $langs->trans("Usage");
- print ' | ';
- print '';
- if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
- print 'usage_opportunity ? ' checked="checked"' : '')).'"> ';
- $htmltext = $langs->trans("ProjectFollowOpportunity");
- print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
- print '
';
- }
- if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
- print 'usage_task ? ' checked="checked"' : '')).'"> ';
- $htmltext = $langs->trans("ProjectFollowTasks");
- print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
- print '
';
- }
- if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
- print 'usage_bill_time ? ' checked="checked"' : '')).'"> ';
- $htmltext = $langs->trans("ProjectBillTimeDescription");
- print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
- print '
';
- }
- if (isModEnabled('eventorganization')) {
- print 'usage_organize_event ? ' checked="checked"' : '')).'"> ';
- $htmltext = $langs->trans("EventOrganizationDescriptionLong");
- print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
- }
- print ' |
';
- }
-
- // Visibility
- print '| '.$langs->trans("Visibility").' | ';
- if ($projectstatic->public) {
- print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
- print $langs->trans('SharedProject');
- } else {
- print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
- print $langs->trans('PrivateProject');
- }
- print ' |
';
-
- // Budget
- print '| '.$langs->trans("Budget").' | ';
- if (strcmp($projectstatic->budget_amount, '')) {
- print ''.price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency).'';
- }
- print ' |
';
-
- // Date start - end project
- print '| '.$langs->trans("Dates").' | ';
- $start = dol_print_date($projectstatic->date_start, 'day');
- print($start ? $start : '?');
- $end = dol_print_date($projectstatic->date_end, 'day');
- print ' - ';
- print($end ? $end : '?');
- if ($projectstatic->hasDelay()) {
- print img_warning("Late");
- }
- print ' |
';
-
- // Other attributes
- $cols = 2;
- //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-
- print '
';
-
- print '
';
-
- print '
';
- print '
';
-
- print '
';
-
- // Description
- print '| '.$langs->trans("Description").' | ';
- print nl2br($projectstatic->description);
- print ' | ';
-
- // Categories
- if (isModEnabled('categorie')) {
- print '| '.$langs->trans("Categories").' | ';
- print $form->showCategories($projectstatic->id, 'project', 1);
- print " |
";
- }
-
- print '
';
-
- print '
';
- print '
';
- }
-
- /*
- * Actions
- */
- /*print '';
- */
-
- // To verify role of users
- //$userAccess = $projectstatic->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project
- //$arrayofuseridoftask=$object->getListContactId('internal');
-
- if ($action == 'clone') {
- $formquestion = array(
- 'text' => $langs->trans("ConfirmClone"),
- //array('type' => 'checkbox', 'name' => 'clone_contacts', 'label' => $langs->trans("CloneContacts"), 'value' => true),
- array('type' => 'checkbox', 'name' => 'clone_change_dt', 'label' => $langs->trans("CloneChanges"), 'value' => true),
- array('type' => 'checkbox', 'name' => 'clone_affectation', 'label' => $langs->trans("CloneAffectation"), 'value' => true),
- array('type' => 'checkbox', 'name' => 'clone_prog', 'label' => $langs->trans("CloneProgression"), 'value' => true),
- array('type' => 'checkbox', 'name' => 'clone_time', 'label' => $langs->trans("CloneTimes"), 'value' => true),
- array('type' => 'checkbox', 'name' => 'clone_file', 'label' => $langs->trans("CloneFile"), 'value' => true),
-
- );
-
- print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ToClone"), $langs->trans("ConfirmCloneTask"), "confirm_clone", $formquestion, '', 1, 300, 590);
- }
-
-
- $head = task_prepare_head($object);
-
- if ($action == 'edit' && $user->hasRight('projet', 'creer')) {
- 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 {
- $object->next_prev_filter = "fk_projet = ".((int) $projectstatic->id);
- }
-
- $morehtmlref = '';
-
- // Project
- if (empty($withproject)) {
- $morehtmlref .= '';
- $morehtmlref .= $langs->trans("Project").': ';
- $morehtmlref .= $projectstatic->getNomUrl(1);
- $morehtmlref .= '
';
-
- // Third party
- $morehtmlref .= $langs->trans("ThirdParty").': ';
- if (!empty($projectstatic->thirdparty) && is_object($projectstatic->thirdparty)) {
- $morehtmlref .= $projectstatic->thirdparty->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 ' |
';
-
- // Date start - Date end task
- 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 ' |
';
-
- // Planned workload
- print '| '.$langs->trans("PlannedWorkload").' | ';
- if ($object->planned_workload != '') {
- print convertSecondToTime($object->planned_workload, 'allhourmin');
- }
- print ' |
';
-
- // Description
- print ''.$langs->trans("Description").' | ';
- print dol_htmlentitiesbr($object->description);
- print ' | ';
-
- print '
';
- print '
';
-
- print '
';
-
- print '
';
- print '
';
-
- // Progress declared
- print '| '.$langs->trans("ProgressDeclared").' | ';
- if ($object->progress != '') {
- print $object->progress.' %';
- }
- print ' |
';
-
- // Progress calculated
- 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 ' |
';
-
- // Budget
- print '| '.$langs->trans("Budget").' | ';
- if (!is_null($object->budget_amount) && strcmp($object->budget_amount, '')) {
- print ''.price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).'';
- }
- print ' |
';
-
- // Other attributes
- $cols = 3;
- $parameters = array('socid'=>$socid);
- include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
-
- print '
';
-
- print '
';
-
- print '
';
+ // Title
+ $morehtmlref .= $projectstatic->title;
+ // Thirdparty
+ if ($projectstatic->thirdparty->id > 0)
+ {
+ $morehtmlref .= '
'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
+ }
+ $morehtmlref .= '
';
+
+ // Define a complementary filter for search of next/prev ref.
+ if (!$user->rights->projet->all->lire)
+ {
+ $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
+ $projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+ }
+
+ dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+ print '';
+ print '
';
+ print '
';
+
+ print '
';
+
+ // Usage
+ print '| ';
+ print $langs->trans("Usage");
+ print ' | ';
+ print '';
+ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+ {
+ print 'usage_opportunity ? ' checked="checked"' : '')).'"> ';
+ $htmltext = $langs->trans("ProjectFollowOpportunity");
+ print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+ print '
';
+ }
+ if (empty($conf->global->PROJECT_HIDE_TASKS))
+ {
+ print 'usage_task ? ' checked="checked"' : '')).'"> ';
+ $htmltext = $langs->trans("ProjectFollowTasks");
+ print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+ print '
';
+ }
+ if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+ {
+ print 'usage_bill_time ? ' checked="checked"' : '')).'"> ';
+ $htmltext = $langs->trans("ProjectBillTimeDescription");
+ print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+ print '
';
+ }
+ print ' |
';
+
+ // Visibility
+ print '| '.$langs->trans("Visibility").' | ';
+ if ($projectstatic->public) print $langs->trans('SharedProject');
+ else print $langs->trans('PrivateProject');
+ print ' |
';
+
+ // Date start - end
+ print '| '.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").' | ';
+ $start = dol_print_date($projectstatic->date_start, 'day');
+ print ($start ? $start : '?');
+ $end = dol_print_date($projectstatic->date_end, 'day');
+ print ' - ';
+ print ($end ? $end : '?');
+ if ($projectstatic->hasDelay()) print img_warning("Late");
+ print ' |
';
+
+ // Budget
+ print '| '.$langs->trans("Budget").' | ';
+ if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+ print ' |
';
+
+ // Other attributes
+ $cols = 2;
+ //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
+ print '
';
+
+ print '
';
+
+ print '
';
+ print '
';
+ print '
';
+
+ print '
';
+
+ // Description
+ print '| '.$langs->trans("Description").' | ';
+ print nl2br($projectstatic->description);
+ print ' | ';
+
+ // Categories
+ if ($conf->categorie->enabled) {
+ print '| '.$langs->trans("Categories").' | ';
+ print $form->showCategories($projectstatic->id, 'project', 1);
+ print " |
";
+ }
+
+ print '
';
+
+ print '
';
+ print '
';
+ print '
';
+ }
+
@@ -658,23 +353,255 @@
- */
-
- 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->hasRight('projet', 'creer')) {
- print '
'.$langs->trans('Modify').'';
- print '
'.$langs->trans('Clone').'';
- } else {
- print '
'.$langs->trans('Modify').'';
- }
-
- // Delete
- $permissiontodelete = $user->hasRight('projet', 'supprimer');
- if ($permissiontodelete) {
- if (!$object->hasChildren() && !$object->hasTimeSpent()) {
- print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'&withproject='.((int) $withproject), 'delete', $permissiontodelete);
- } else {
- print dolGetButtonAction($langs->trans("TaskHasChild"), $langs->trans("Delete"), 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'&withproject='.((int) $withproject), 'delete', 0);
+ */
+ /*print '
';
+ */
+
+ // To verify role of users
+ //$userAccess = $projectstatic->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project
+ //$arrayofuseridoftask=$object->getListContactId('internal');
+
+ $head = task_prepare_head($object);
+
+ if ($action == 'edit' && $user->rights->projet->creer)
+ {
+ print '
';
+ }
+ else
+ {
+ /*
+ * Fiche tache en mode visu
+ */
+ $param = ($withproject ? '&withproject=1' : '');
+ $linkback = $withproject ? '
'.$langs->trans("BackToList").'' : '';
+
+ dol_fiche_head($head, 'task_task', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
+
+ if ($action == 'delete')
+ {
+ print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"].'&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 (".$projectsListId.")";
+ }
+ else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+
+ $morehtmlref = '';
+
+ // Project
+ if (empty($withproject))
+ {
+ $morehtmlref .= '
';
+ $morehtmlref .= $langs->trans("Project").': ';
+ $morehtmlref .= $projectstatic->getNomUrl(1);
+ $morehtmlref .= '
';
+
+ // Third party
+ $morehtmlref .= $langs->trans("ThirdParty").': ';
+ if (!empty($projectstatic->thirdparty)) {
+ $morehtmlref .= $projectstatic->thirdparty->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 ' |
';
+
+ // Date start - Date end
+ print '| '.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").' | ';
+ $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 ' |
';
+
+ // Planned workload
+ print '| '.$langs->trans("PlannedWorkload").' | ';
+ if ($object->planned_workload != '')
+ {
+ print convertSecondToTime($object->planned_workload, 'allhourmin');
+ }
+ print ' |
';
+
+ // Description
+ 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 ' |
';
+
+ // Progress calculated
+ 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 ' |
';
+
+ // Other attributes
+ $cols = 3;
+ $parameters = array('socid'=>$socid);
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+ print '
';
+
+ print '
';
+ print '
';
+
+ print '
';
+ print '
';
+
+ dol_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').'';
@@ -682,29 +609,48 @@
- } else {
- print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'&withproject='.((int) $withproject), 'delete', $permissiontodelete);
- }
-
- print '
';
- }
-
- print '
';
- print '
'; // ancre
-
- /*
- * Generated documents
- */
- $filename = dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
- $filedir = $conf->project->dir_output."/".dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
- $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
- $genallowed = ($user->rights->projet->lire);
- $delallowed = ($user->hasRight('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);
- $formactions->showactions($object, 'project_task', 0, 1, '', 10, 'withproject='.$withproject);
-
- print '
';
+ else
+ {
+ print '
'.$langs->trans('Modify').'';
+ }
+
+ // 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 '
'; // ancre
+
+ /*
+ * Documents generes
+ */
+ $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->modelpdf);
+
+ print '
';
+
+ // List of actions on element
+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+ $formactions = new FormActions($db);
+ $somethingshown = $formactions->showactions($object, 'task', $socid, 1, '', 10, 'withproject='.$withproject);
+
+ print '
' . $projectstatic->thirdparty->getNomUrl(1, 'project');
+ if ($projectstatic->thirdparty->id > 0)
+ {
+ $morehtmlref .= '
'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
@@ -957 +647,2 @@
- if (!$user->hasRight('projet', 'all', 'lire')) {
+ if (!$user->rights->projet->all->lire)
+ {
@@ -959,4 +650,4 @@
- $projectstatic->next_prev_filter = "rowid IN (" . $db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0') . ")";
- }
-
- dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
+ $projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+ }
+
+ dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -971,30 +662,26 @@
- if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
- print '| ';
- print $langs->trans("Usage");
- print ' | ';
- print '';
- if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
- print 'usage_opportunity ? ' checked="checked"' : '')) . '"> ';
- $htmltext = $langs->trans("ProjectFollowOpportunity");
- print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
- print '
';
- }
- if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
- print 'usage_task ? ' checked="checked"' : '')) . '"> ';
- $htmltext = $langs->trans("ProjectFollowTasks");
- print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
- print '
';
- }
- if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
- print 'usage_bill_time ? ' checked="checked"' : '')) . '"> ';
- $htmltext = $langs->trans("ProjectBillTimeDescription");
- print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
- print '
';
- }
- if (isModEnabled('eventorganization')) {
- print 'usage_organize_event ? ' checked="checked"' : '')) . '"> ';
- $htmltext = $langs->trans("EventOrganizationDescriptionLong");
- print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
- }
- print ' |
';
- }
+ print '| ';
+ print $langs->trans("Usage");
+ print ' | ';
+ print '';
+ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+ {
+ print 'usage_opportunity ? ' checked="checked"' : '')).'"> ';
+ $htmltext = $langs->trans("ProjectFollowOpportunity");
+ print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+ print '
';
+ }
+ if (empty($conf->global->PROJECT_HIDE_TASKS))
+ {
+ print 'usage_task ? ' checked="checked"' : '')).'"> ';
+ $htmltext = $langs->trans("ProjectFollowTasks");
+ print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+ print '
';
+ }
+ if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+ {
+ print 'usage_bill_time ? ' checked="checked"' : '')).'"> ';
+ $htmltext = $langs->trans("ProjectBillTimeDescription");
+ print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+ print '
';
+ }
+ print ' |
';
@@ -1003,8 +690,3 @@
- print '| ' . $langs->trans("Visibility") . ' | ';
- if ($projectstatic->public) {
- print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
- print $langs->trans('SharedProject');
- } else {
- print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
- print $langs->trans('PrivateProject');
- }
+ print ' |
| '.$langs->trans("Visibility").' | ';
+ if ($projectstatic->public) print $langs->trans('SharedProject');
+ else print $langs->trans('PrivateProject');
@@ -1013,9 +695,2 @@
- // Budget
- print ' |
| ' . $langs->trans("Budget") . ' | ';
- if (!is_null($projectstatic->budget_amount) && strcmp($projectstatic->budget_amount, '')) {
- print '' . price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency) . '';
- }
- print ' |
';
-
- // Date start - end project
- print '| ' . $langs->trans("Dates") . ' | ';
+ // Date start - end
+ print ' |
| '.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").' | ';
@@ -1023 +698 @@
- print($start ? $start : '?');
+ print ($start ? $start : '?');
@@ -1026,4 +701,7 @@
- print($end ? $end : '?');
- if ($projectstatic->hasDelay()) {
- print img_warning("Late");
- }
+ print ($end ? $end : '?');
+ if ($projectstatic->hasDelay()) print img_warning("Late");
+ print ' |
';
+
+ // Budget
+ print '| '.$langs->trans("Budget").' | ';
+ if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
@@ -1034,4 +712 @@
- $savobject = $object;
- $object = $projectstatic;
- include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
- $object = $savobject;
+ //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
@@ -1042,0 +718 @@
+ print '';
@@ -1045 +721 @@
- print ' ';
+ print '';
@@ -1049 +725 @@
- print dol_htmlentitiesbr($projectstatic->description);
+ print nl2br($projectstatic->description);
@@ -1053,2 +729,2 @@
- if (isModEnabled('categorie')) {
- print '| ' . $langs->trans("Categories") . ' | ';
+ if ($conf->categorie->enabled) {
+ print ' | | '.$langs->trans("Categories").' | ';
@@ -1062,0 +739 @@
+ print '';
@@ -1066 +743 @@
- print dol_get_fiche_end();
+ dol_fiche_end();
@@ -1070,2 +746,0 @@
-
- $param = '';
@@ -1077,2 +752,4 @@
- if ($user->hasRight('projet', 'time')) {
- if ($projectstatic->public || $userRead > 0) {
+ if ($user->rights->projet->all->lire || $user->rights->projet->lire) // To enter time, read permission is enough
+ {
+ if ($projectstatic->public || $userRead > 0)
+ {
@@ -1081,10 +758,13 @@
- if (!empty($projectidforalltimes)) {
- // We are on tab 'Time Spent' of project
- $backtourl = $_SERVER['PHP_SELF'] . '?projectid=' . $projectstatic->id . ($withproject ? '&withproject=1' : '');
- $linktocreatetimeUrl = $_SERVER['PHP_SELF'] . '?' . ($withproject ? 'withproject=1' : '') . '&projectid=' . $projectstatic->id . '&action=createtime&token=' . newToken() . $param . '&backtopage=' . urlencode($backtourl);
- } else {
- // We are on tab 'Time Spent' of task
- $backtourl = $_SERVER['PHP_SELF'] . '?id=' . $object->id . ($withproject ? '&withproject=1' : '');
- $linktocreatetimeUrl = $_SERVER['PHP_SELF'] . '?' . ($withproject ? 'withproject=1' : '') . ($object->id > 0 ? '&id=' . $object->id : '&projectid=' . $projectstatic->id) . '&action=createtime&token=' . newToken() . $param . '&backtopage=' . urlencode($backtourl);
- }
- } else {
+ if (!empty($projectidforalltimes)) // We are on tab 'Time Spent' of project
+ {
+ $backtourl = $_SERVER['PHP_SELF'].'?projectid='.$projectstatic->id.($withproject ? '&withproject=1' : '');
+ $linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').'&projectid='.$projectstatic->id.'&action=createtime'.$param.'&backtopage='.urlencode($backtourl);
+ }
+ else // We are on tab 'Time Spent' of task
+ {
+ $backtourl = $_SERVER['PHP_SELF'].'?id='.$object->id.($withproject ? '&withproject=1' : '');
+ $linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').($object->id > 0 ? '&id='.$object->id : '&projectid='.$projectstatic->id).'&action=createtime'.$param.'&backtopage='.urlencode($backtourl);
+ }
+ }
+ else
+ {
@@ -1094,7 +774,3 @@
- } else {
- $linktocreatetimeBtnStatus = -2;
- $linktocreatetimeHelpText = $langs->trans("NotEnoughPermissions");
- }
-
- $paramsbutton = array('morecss' => 'reposition');
- $linktocreatetime = dolGetButtonTitle($langs->trans('AddTimeSpent'), $linktocreatetimeHelpText, 'fa fa-plus-circle', $linktocreatetimeUrl, '', $linktocreatetimeBtnStatus, $paramsbutton);
+ }
+
+ $linktocreatetime = dolGetButtonTitle($langs->trans('AddTimeSpent'), $linktocreatetimeHelpText, 'fa fa-plus-circle', $linktocreatetimeUrl, '', $linktocreatetimeBtnStatus);
@@ -1104,14 +780,9 @@
- $arrayofmassactions = array();
-
- if ($projectstatic->id > 0) {
- // If we are on a given project.
- if ($projectstatic->usage_bill_time) {
- $arrayofmassactions = array(
- 'generateinvoice' => $langs->trans("GenerateBill"),
- //'builddoc'=>$langs->trans("PDFMerge"),
- );
- }
- if (isModEnabled('ficheinter') && $user->hasRight('ficheinter', 'creer')) {
- $langs->load("interventions");
- $arrayofmassactions['generateinter'] = $langs->trans("GenerateInter");
- }
+ if ($projectstatic->usage_bill_time)
+ {
+ $arrayofmassactions = array(
+ 'generateinvoice'=>$langs->trans("GenerateBill"),
+ //'builddoc'=>$langs->trans("PDFMerge"),
+ );
+ //if ($user->rights->projet->creer) $arrayofmassactions['predelete']=''.$langs->trans("Delete");
+ if (in_array($massaction, array('presend', 'predelete', 'generateinvoice'))) $arrayofmassactions = array();
+ $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -1119,7 +789,0 @@
- //if ($user->rights->projet->creer) $arrayofmassactions['predelete']=''.$langs->trans("Delete");
- if (in_array($massaction, array('presend', 'predelete', 'generateinvoice', 'generateinter'))) {
- $arrayofmassactions = array();
- }
- $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
-
- // Task
@@ -1128 +792,2 @@
- if (empty($projectidforalltimes) && empty($allprojectforuser)) {
+ if (empty($projectidforalltimes))
+ {
@@ -1130,5 +795,5 @@
- print dol_get_fiche_head($head, 'task_time', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
-
- if ($action == 'deleteline') {
- $urlafterconfirm = $_SERVER["PHP_SELF"] . "?" . ($object->id > 0 ? "id=" . $object->id : 'projectid=' . $projectstatic->id) . '&lineid=' . GETPOST("lineid", 'int') . ($withproject ? '&withproject=1' : '');
- print $form->formconfirm($urlafterconfirm, $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_deleteline", '', '', 1);
+ dol_fiche_head($head, 'task_time', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
+
+ if ($action == 'deleteline')
+ {
+ print $form->formconfirm($_SERVER["PHP_SELF"]."?".($object->id > 0 ? "id=".$object->id : 'projectid='.$projectstatic->id).'&lineid='.GETPOST("lineid", 'int').($withproject ? '&withproject=1' : ''), $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_delete", '', '', 1);
@@ -1138,4 +803,4 @@
- $param .= ($param ? '&' : '') . 'id=' . $object->id; // ID of task
- $linkback = $withproject ? '' . $langs->trans("BackToList") . '' : '';
-
- if (!GETPOST('withproject') || empty($projectstatic->id)) {
+ $linkback = $withproject ? ''.$langs->trans("BackToList").'' : '';
+
+ if (!GETPOST('withproject') || empty($projectstatic->id))
+ {
@@ -1143,4 +808,3 @@
- $object->next_prev_filter = "fk_projet IN (" . $db->sanitize($projectsListId) . ")";
- } else {
- $object->next_prev_filter = "fk_projet = " . ((int) $projectstatic->id);
- }
+ $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
+ }
+ else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
@@ -1151 +815,2 @@
- if (empty($withproject)) {
+ if (empty($withproject))
+ {
@@ -1153 +818 @@
- $morehtmlref .= $langs->trans("Project") . ': ';
+ $morehtmlref .= $langs->trans("Project").': ';
@@ -1158,2 +823,2 @@
- $morehtmlref .= $langs->trans("ThirdParty") . ': ';
- if (!empty($projectstatic->thirdparty) && is_object($projectstatic->thirdparty)) {
+ $morehtmlref .= $langs->trans("ThirdParty").': ';
+ if (is_object($projectstatic->thirdparty)) {
@@ -1171,13 +836,4 @@
- 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 ' | ';
-
- // Date start - Date end task
- print '| ' . $langs->trans("DateStart") . ' - ' . $langs->trans("Deadline") . ' | ';
+ print '';
+
+ // Date start - Date end
+ print '| '.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").' | ';
@@ -1185 +841 @@
- print($start ? $start : '?');
+ print ($start ? $start : '?');
@@ -1188,4 +844,2 @@
- print($end ? $end : '?');
- if ($object->hasDelay()) {
- print img_warning("Late");
- }
+ print ($end ? $end : '?');
+ if ($object->hasDelay()) print img_warning("Late");
@@ -1195,2 +849,3 @@
- print ' | | ' . $langs->trans("PlannedWorkload") . ' | ';
- if ($object->planned_workload) {
+ print ' | | '.$langs->trans("PlannedWorkload").' | ';
+ if ($object->planned_workload)
+ {
@@ -1204 +859 @@
- print '';
+ print ' ';
@@ -1210,2 +865,2 @@
- print ' | ' . $langs->trans("ProgressDeclared") . ' | ';
- print $object->progress != '' ? $object->progress . ' %' : '';
+ print ' | | '.$langs->trans("ProgressDeclared").' | ';
+ print $object->progress != '' ? $object->progress.' %' : '';
@@ -1215,2 +870,3 @@
- print ' | | ' . $langs->trans("ProgressCalculated") . ' | ';
- if ($object->planned_workload) {
+ print ' | | '.$langs->trans("ProgressCalculated").' | ';
+ if ($object->planned_workload)
+ {
@@ -1218,8 +874,4 @@
- if ($tmparray['total_duration'] > 0) {
- print round($tmparray['total_duration'] / $object->planned_workload * 100, 2) . ' %';
- } else {
- print '0 %';
- }
- } else {
- print '' . $langs->trans("WorkloadNotDefined") . '';
- }
+ if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %';
+ else print '0 %';
+ }
+ else print ''.$langs->trans("WorkloadNotDefined").'';
@@ -1231,0 +884 @@
+ print '';
@@ -1237,6 +890 @@
- print dol_get_fiche_end();
- } else {
- if ($action == 'deleteline') {
- $urlafterconfirm = $_SERVER["PHP_SELF"] . "?" . ($object->id > 0 ? "id=" . $object->id : 'projectid=' . $projectstatic->id) . '&lineid=' . GETPOST("lineid", 'int') . ($withproject ? '&withproject=1' : '');
- print $form->formconfirm($urlafterconfirm, $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_deleteline", '', '', 1);
- }
+ dol_fiche_end();
@@ -1246 +894,7 @@
- if ($projectstatic->id > 0 || $allprojectforuser > 0) {
+ if ($projectstatic->id > 0)
+ {
+ if ($action == 'deleteline' && !empty($projectidforalltimes))
+ {
+ print $form->formconfirm($_SERVER["PHP_SELF"]."?".($object->id > 0 ? "id=".$object->id : 'projectid='.$projectstatic->id).'&lineid='.GETPOST('lineid', 'int').($withproject ? '&withproject=1' : ''), $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_delete", '', '', 1);
+ }
+
@@ -1250,20 +903,0 @@
- $formconfirm = '';
-
- if ($action == 'deleteline' && !empty($projectidforalltimes)) {
- // We must use projectidprojectid if on list of timespent of project and id=taskid if on list of timespent of a task
- $urlafterconfirm = $_SERVER["PHP_SELF"] . "?" . ($projectstatic->id > 0 ? 'projectid=' . $projectstatic->id : ($object->id > 0 ? "id=" . $object->id : '')) . '&lineid=' . GETPOST('lineid', 'int') . ($withproject ? '&withproject=1' : '') . "&contextpage=" . urlencode($contextpage);
- $formconfirm = $form->formconfirm($urlafterconfirm, $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_deleteline", '', '', 1);
- }
-
- // Call Hook formConfirm
- $parameters = array('formConfirm' => $formconfirm, "projectstatic" => $projectstatic, "withproject" => $withproject);
- $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
- if (empty($reshook)) {
- $formconfirm .= $hookmanager->resPrint;
- } elseif ($reshook > 0) {
- $formconfirm = $hookmanager->resPrint;
- }
-
- // Print form confirm
- print $formconfirm;
-
@@ -1272,19 +906,11 @@
- $arrayfields['t.element_date'] = array('label'=>$langs->trans("Date"), 'checked'=>1);
- $arrayfields['p.fk_soc'] = array('label'=>$langs->trans("ThirdParty"), 'type'=>'integer:Societe:/societe/class/societe.class.php:1','checked'=>1);
- $arrayfields['s.name_alias'] = array('label'=>$langs->trans("AliasNameShort"), 'type'=>'integer:Societe:/societe/class/societe.class.php:1');
- if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) { // Not a dedicated task
- if (! empty($allprojectforuser)) {
- $arrayfields['p.project_ref'] = ['label' => $langs->trans('RefProject'), 'checked' => 1];
- $arrayfields['p.project_label'] = ['label' => $langs->trans('ProjectLabel'), 'checked' => 1];
- }
- $arrayfields['t.element_ref'] = array('label'=>$langs->trans("RefTask"), 'checked'=>1);
- $arrayfields['t.element_label'] = array('label'=>$langs->trans("LabelTask"), 'checked'=>1);
- }
- $arrayfields['author'] = array('label' => $langs->trans("By"), 'checked' => 1);
- $arrayfields['t.note'] = array('label' => $langs->trans("Note"), 'checked' => 1);
- if (isModEnabled('service') && !empty($projectstatic->thirdparty) && $projectstatic->thirdparty->id > 0 && $projectstatic->usage_bill_time) {
- $arrayfields['t.fk_product'] = array('label' => $langs->trans("Product"), 'checked' => 1);
- }
- $arrayfields['t.element_duration'] = array('label'=>$langs->trans("Duration"), 'checked'=>1);
- $arrayfields['value'] = array('label'=>$langs->trans("Value"), 'checked'=>1, 'enabled'=>isModEnabled("salaries"));
- $arrayfields['valuebilled'] = array('label'=>$langs->trans("Billed"), 'checked'=>1, 'enabled'=>(((getDolGlobalInt('PROJECT_HIDE_TASKS') || !getDolGlobalInt('PROJECT_BILL_TIME_SPENT')) ? 0 : 1) && $projectstatic->usage_bill_time));
+ $arrayfields['t.task_date'] = array('label'=>$langs->trans("Date"), 'checked'=>1);
+ if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) // Not a dedicated task
+ {
+ $arrayfields['t.task_ref'] = array('label'=>$langs->trans("RefTask"), 'checked'=>1);
+ $arrayfields['t.task_label'] = array('label'=>$langs->trans("LabelTask"), 'checked'=>1);
+ }
+ $arrayfields['author'] = array('label'=>$langs->trans("By"), 'checked'=>1);
+ $arrayfields['t.note'] = array('label'=>$langs->trans("Note"), 'checked'=>1);
+ $arrayfields['t.task_duration'] = array('label'=>$langs->trans("Duration"), 'checked'=>1);
+ $arrayfields['value'] = array('label'=>$langs->trans("Value"), 'checked'=>1, 'enabled'=>(empty($conf->salaries->enabled) ? 0 : 1));
+ $arrayfields['valuebilled'] = array('label'=>$langs->trans("Billed"), 'checked'=>1, 'enabled'=>(((!empty($conf->global->PROJECT_HIDE_TASKS) || empty($conf->global->PROJECT_BILL_TIME_SPENT)) ? 0 : 1) && $projectstatic->usage_bill_time));
@@ -1292,2 +918,8 @@
- include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
-
+ if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
+ {
+ foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
+ {
+ if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
+ $arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+ }
+ }
@@ -1297,73 +929,10 @@
- if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
- $param .= '&contextpage=' . urlencode($contextpage);
- }
- if ($limit > 0 && $limit != $conf->liste_limit) {
- $param .= '&limit='.((int) $limit);
- }
- if ($search_month > 0) {
- $param .= '&search_month=' . urlencode($search_month);
- }
- if ($search_year > 0) {
- $param .= '&search_year=' . urlencode($search_year);
- }
- if (!empty($search_user)) { // We keep param if -1 because default value is forced to user id if not set
- $param .= '&search_user='.urlencode($search_user);
- }
- if ($search_task_ref != '') {
- $param .= '&search_task_ref=' . urlencode($search_task_ref);
- }
- if ($search_company != '') {
- $param .= '&$search_company=' . urlencode($search_company);
- }
- if ($search_company_alias != '') {
- $param .= '&$search_company_alias=' . urlencode($search_company_alias);
- }
- if ($search_project_ref != '') {
- $param .= '&$search_project_ref=' . urlencode($search_project_ref);
- }
- if ($search_project_label != '') {
- $param .= '&$search_project_label=' . urlencode($search_project_label);
- }
- if ($search_task_label != '') {
- $param .= '&search_task_label=' . urlencode($search_task_label);
- }
- if ($search_note != '') {
- $param .= '&search_note=' . urlencode($search_note);
- }
- if ($search_duration != '') {
- $param .= '&search_field2=' . urlencode($search_duration);
- }
- if ($optioncss != '') {
- $param .= '&optioncss=' . urlencode($optioncss);
- }
- if ($search_date_startday) {
- $param .= '&search_date_startday=' . urlencode($search_date_startday);
- }
- if ($search_date_startmonth) {
- $param .= '&search_date_startmonth=' . urlencode($search_date_startmonth);
- }
- if ($search_date_startyear) {
- $param .= '&search_date_startyear=' . urlencode($search_date_startyear);
- }
- if ($search_date_endday) {
- $param .= '&search_date_endday=' . urlencode($search_date_endday);
- }
- if ($search_date_endmonth) {
- $param .= '&search_date_endmonth=' . urlencode($search_date_endmonth);
- }
- if ($search_date_endyear) {
- $param .= '&search_date_endyear=' . urlencode($search_date_endyear);
- }
- if ($search_timespent_starthour) {
- $param .= '&search_timespent_duration_starthour=' . urlencode($search_timespent_starthour);
- }
- if ($search_timespent_startmin) {
- $param .= '&search_timespent_duration_startmin=' . urlencode($search_timespent_startmin);
- }
- if ($search_timespent_endhour) {
- $param .= '&search_timespent_duration_endhour=' . urlencode($search_timespent_endhour);
- }
- if ($search_timespent_endmin) {
- $param .= '&search_timespent_duration_endmin=' . urlencode($search_timespent_endmin);
- }
-
+ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+ if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+ if ($search_month > 0) $param .= '&search_month='.urlencode($search_month);
+ if ($search_year > 0) $param .= '&search_year='.urlencode($search_year);
+ if ($search_user > 0) $param .= '&search_user='.urlencode($search_user);
+ if ($search_task_ref != '') $param .= '&search_task_ref='.urlencode($search_task_ref);
+ if ($search_task_label != '') $param .= '&search_task_label='.urlencode($search_task_label);
+ if ($search_note != '') $param .= '&search_note='.urlencode($search_note);
+ if ($search_duration != '') $param .= '&search_field2='.urlencode($search_duration);
+ if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
@@ -1374,19 +943,7 @@
- if ($id) {
- $param .= '&id=' . urlencode($id);
- }
- if ($projectid) {
- $param .= '&projectid=' . urlencode($projectid);
- }
- if ($withproject) {
- $param .= '&withproject=' . urlencode($withproject);
- }
- // Add $param from hooks
- $parameters = array('param' => &$param);
- $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
- $param .= $hookmanager->resPrint;
-
- print ' | | | | |