diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 92f268a76f9339b0875fd8b72e046f1fdaee5244..9bc46cd4a9060bf7dee701b7bb068127bd2118c3 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -25,7 +25,9 @@ * \version $Id$ */ -require("./pre.inc.php"); +require ("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $mine = $_REQUEST['mode']=='mine' ? 1 : 0; diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php index 76f2b39f09cdf8ca5733416fbdace5210faebdb3..b8225b7c251e07062461bcb02b698dab827077b4 100644 --- a/htdocs/projet/activity/list.php +++ b/htdocs/projet/activity/list.php @@ -25,7 +25,9 @@ * \version $Id$ */ -require("./pre.inc.php"); +require ("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $mode=$_REQUEST["mode"]; diff --git a/htdocs/projet/activity/pre.inc.php b/htdocs/projet/activity/pre.inc.php deleted file mode 100644 index e97b47c2b8b4533245d925e4cfddc9ecc8f932d6..0000000000000000000000000000000000000000 --- a/htdocs/projet/activity/pre.inc.php +++ /dev/null @@ -1,69 +0,0 @@ -<?php -/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/** - * \file htdocs/projet/activity/pre.inc.php - * \ingroup projet - * \brief Fichier de gestion du menu gauche du module projet - * \version $Id$ - */ - -require ("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); - -$langs->load("projects"); -$langs->load("companies"); - -/** - * Enter description here... - * - * @param unknown_type $head - * @param unknown_type $title - * @param unknown_type $help_url - */ -function llxHeader($head = "", $title="", $help_url='') -{ - global $langs, $user; - - top_menu($head, $title); - - $menu = new Menu(); - - $menu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects", $langs->trans("List"), 1, $user->rights->projet->lire); - - $menu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects&mode=mine", $langs->trans("MyProjects"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create&mode=mine", $langs->trans("NewProject"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects&mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); - - $menu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("List"), 1, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); - - $menu->add(DOL_URL_ROOT."/projet/activity/index.php?mode=mine", $langs->trans("MyActivities"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create&mode=mine", $langs->trans("NewTask"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php?mode=mine", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); - - left_menu($menu->liste, $help_url); -} - -?> diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index 9c782ff0d10ded475c68ec03d8bedda92cd78fa0..bda75869b855a1875ed83be962fa57644bd572c3 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -23,7 +23,7 @@ * \version $Id$ */ -require ("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 18d4104a38dbbdfda2715f451cda7cb86b3a1ac6..fcb189eff6b2e933463efdc0bbb91454c16464d6 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -25,8 +25,10 @@ * \version $Id$ */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); +require("../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture-rec.class.php"); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); @@ -34,7 +36,6 @@ if ($conf->fournisseur->enabled) require_once(DOL_DOCUMENT_ROOT."/fourn/fourniss if ($conf->fournisseur->enabled) require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); if ($conf->agenda->enabled) require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $langs->load("projects"); $langs->load("companies"); diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index d6649056d408b725533d9a4a4ddbe9c4c6ef8e63..f134dfdfa546f628d2e5f480714fbba0e33dd540 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -25,11 +25,11 @@ * \version $Id$ */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/project/modules_project.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); +require_once(DOL_DOCUMENT_ROOT."/includes/modules/project/modules_project.php"); $langs->load("projects"); $langs->load('companies'); diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 5ad54a94c00091f9ac61c89333c6d374413f7131..3bccf17953eae25e52363646ae1636319295886c 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -25,7 +25,8 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $mine = $_REQUEST['mode']=='mine' ? 1 : 0; diff --git a/htdocs/projet/liste.php b/htdocs/projet/liste.php index daac7fca6a5fe084315420c11d38024290b5417c..d277865f291e34b2c468d1002ff47a7a66289951 100644 --- a/htdocs/projet/liste.php +++ b/htdocs/projet/liste.php @@ -26,7 +26,8 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); if (!$user->rights->projet->lire) accessforbidden(); diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php index b9cee76ca511ed7df6a8e7e822fdf1d576be0921..a580cc6d3db18f2a975019a5c167cc9a95b7b686 100644 --- a/htdocs/projet/note.php +++ b/htdocs/projet/note.php @@ -23,7 +23,7 @@ * \version $Id$ */ -require('./pre.inc.php'); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); diff --git a/htdocs/projet/pre.inc.php b/htdocs/projet/pre.inc.php deleted file mode 100644 index 47b3a83d5be9f3ad2e198e6cb4565c55dc94dd61..0000000000000000000000000000000000000000 --- a/htdocs/projet/pre.inc.php +++ /dev/null @@ -1,72 +0,0 @@ -<?php -/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> - * Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/** - * \file htdocs/projet/pre.inc.php - * \ingroup projet - * \brief Fichier de gestion du menu gauche du module projet - * \version $Id$ - */ - -require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); - -$langs->load("projects"); -$langs->load("companies"); -$langs->load("bills"); -$langs->load("orders"); -$langs->load("commercial"); - -/** - * Enter description here... - * - * @param unknown_type $head - * @param unknown_type $title - * @param unknown_type $help_url - */ -function llxHeader($head = '', $title='', $help_url='') -{ - global $langs, $user; - - top_menu($head, $title); - - $menu = new Menu(); - - $menu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects", $langs->trans("List"), 1, $user->rights->projet->lire); - - $menu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects&mode=mine", $langs->trans("MyProjects"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create&mode=mine", $langs->trans("NewProject"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects&mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); - - $menu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("List"), 1, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); - - $menu->add(DOL_URL_ROOT."/projet/activity/index.php?mode=mine", $langs->trans("MyActivities"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create&mode=mine", $langs->trans("NewTask"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php?mode=mine", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); - - - left_menu($menu->liste, $help_url); -} -?> diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index add9f35dec8b65d66e2e1106d2f3b8da77a1d910..d4c1f50e4a41ab40be7f5888daa4526ef1e0420e 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -25,7 +25,9 @@ * \version $Id$ */ -require ("./pre.inc.php"); +require ("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); diff --git a/htdocs/projet/tasks/fiche.php b/htdocs/projet/tasks/fiche.php index 16389a65b731665a00da5304c362b8b558f6bbf5..8b106d0499e9294592cda68e44f6602ea19ea23a 100644 --- a/htdocs/projet/tasks/fiche.php +++ b/htdocs/projet/tasks/fiche.php @@ -25,10 +25,10 @@ * \version $Id$ */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/html.formother.class.php"); $projectid=''; diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php index f95f406eecfe55d40c6053aa4ea1c84633f70728..1de86ba0385f4b45121dc0f1d752753fd0b59ad0 100644 --- a/htdocs/projet/tasks/index.php +++ b/htdocs/projet/tasks/index.php @@ -25,10 +25,10 @@ * \version $Id$ */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $langs->load('projects'); diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index 6a7b8b202fc5f6d092c2ced3320f7271d8b51836..ec31ee9bd92327d899f756f8c7ad045fc575afa7 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -23,7 +23,8 @@ * \version $Id$ */ -require('./pre.inc.php'); +require ("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); diff --git a/htdocs/projet/tasks/pre.inc.php b/htdocs/projet/tasks/pre.inc.php deleted file mode 100644 index a7cd6186d9f82f2d3fd848a7b8666e621a5a824f..0000000000000000000000000000000000000000 --- a/htdocs/projet/tasks/pre.inc.php +++ /dev/null @@ -1,69 +0,0 @@ -<?php -/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/** - * \file htdocs/projet/tasks/pre.inc.php - * \ingroup projet - * \brief Fichier de gestion du menu gauche du module projet - * \version $Id$ - */ -require ("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); - -$langs->load("projects"); -$langs->load("companies"); - -/** - * Enter description here... - * - * @param unknown_type $head - * @param unknown_type $title - * @param unknown_type $help_url - */ -function llxHeader($head = "", $title="", $help_url='') -{ - global $langs, $user; - - top_menu($head, $title); - - $menu = new Menu(); - - $menu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects", $langs->trans("List"), 1, $user->rights->projet->lire); - - $menu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects&mode=mine", $langs->trans("MyProjects"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create&mode=mine", $langs->trans("NewProject"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects&mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); - - $menu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("List"), 1, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); - - $menu->add(DOL_URL_ROOT."/projet/activity/index.php?mode=mine", $langs->trans("MyActivities"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create&mode=mine", $langs->trans("NewTask"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php?mode=mine", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); - - - left_menu($menu->liste, $help_url); -} - -?> diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 908569c809ccdc6c1e7f0ba5a88a084fe5eddc1d..e2a893726f4d249becdbffaf9387300eb766e694 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -25,7 +25,9 @@ * \version $Id$ */ -require("./pre.inc.php"); +require ("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/html.formother.class.php"); diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 0c64cf8d441bf0682f48ad4b684b5f397620ce6f..55f421f0fef6f791fee381e50f049cb5e6404649 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -25,7 +25,9 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");