diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index ca8ed73e10de6ef0a3abdad7c6e049078d93a5fb..6ffb876bb7c18a82211ab73310e0986a84204442 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -586,7 +586,7 @@ class Task extends CommonObject $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec2"; $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2"; } - $sql.= " WHERE p.entity = ".$conf->entity; + $sql.= " WHERE p.entity IN (".getEntity('project',1).")"; $sql.= " AND t.fk_projet = p.rowid"; } elseif ($mode == 1) @@ -607,7 +607,7 @@ class Task extends CommonObject { $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid"; } - $sql.= " WHERE p.entity = ".$conf->entity; + $sql.= " WHERE p.entity IN (".getEntity('project',1).")"; } else return 'BadValueForParameterMode'; diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index ebfad425cf8de395ce7750e49a382973d0fff2a2..3ef4f777124f29059133652b5e4e932ed3b03c8f 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -47,7 +47,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be inclu // Security check $socid=0; if ($user->societe_id > 0) $socid=$user->societe_id; -$result = restrictedArea($user, 'projet', $id); +$result = restrictedArea($user, 'projet', $id,'projet&project'); /* diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php index ce033f0e1937c57558c45bbd1d9f275a14ac8e1c..3834a6e7f6ab11bd8326f441285ab301b4958bf7 100644 --- a/htdocs/projet/document.php +++ b/htdocs/projet/document.php @@ -43,7 +43,7 @@ $mine = (GETPOST('mode','alpha') == 'mine' ? 1 : 0); // Security check $socid=0; if ($user->societe_id > 0) $socid=$user->societe_id; -$result=restrictedArea($user,'projet',$id,''); +$result=restrictedArea($user,'projet',$id,'projet&project'); $object = new Project($db); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 3839a9b0b06964675280b5a7e8d097aa51d22c16..d10c7f2441fdfa3cabbc95331f9254f5881444e1 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -92,7 +92,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be inclu // Security check $socid=0; if ($user->societe_id > 0) $socid=$user->societe_id; -$result = restrictedArea($user, 'projet', $projectid); +$result = restrictedArea($user, 'projet', $projectid, 'projet&project'); /* diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 091059d76e3d9e61d6367d77b3d601563e48f1b8..822489b643a626c5399a97186376bf632df26355 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -44,7 +44,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be inclu // Security check $socid=0; if ($user->societe_id > 0) $socid=$user->societe_id; -$result = restrictedArea($user, 'projet', $id); +$result = restrictedArea($user, 'projet', $id,'projet&project'); $langs->load("users"); $langs->load("projects"); diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php index 45c4cffd65bc7d39bc58e3faa41d152f4e9edc6a..4742349193099c512ced003c75d8ae17f75f816a 100644 --- a/htdocs/projet/note.php +++ b/htdocs/projet/note.php @@ -42,7 +42,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be inclu // Security check $socid=0; if ($user->societe_id > 0) $socid=$user->societe_id; -$result = restrictedArea($user, 'projet', $id); +$result = restrictedArea($user, 'projet', $id,'projet&project'); $permissionnote=$user->rights->projet->creer; // Used by the include of actions_setnotes.inc.php diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index eb95fd336241aedc1246aaadd9f03a0a96bdc03e..648871be6db572ac72aeb19762643262a69b466a 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -61,7 +61,7 @@ $extralabels_task=$extrafields_task->fetch_name_optionals_label($taskstatic->tab // Security check $socid=0; if ($user->societe_id > 0) $socid = $user->societe_id; -$result = restrictedArea($user, 'projet', $id); +$result = restrictedArea($user, 'projet', $id,'projet&project'); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('projecttaskcard','globalcard'));