diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index c4e99df7c7c..8d329c527cb 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -1,6 +1,7 @@ * Copyright (C) 2005-2006 Regis Houssin + * Copyright (C) 2006 Laurent Destailleur * * 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 @@ -18,14 +19,13 @@ * * $Id$ * $Source$ - * */ /** - \file htdocs/projet/index.php - \ingroup projet - \brief Page d'accueil du module projet - \version $Revision$ + \file htdocs/projet/activity/index.php + \ingroup projet + \brief Page activite du module projet + \version $Revision$ */ require("./pre.inc.php"); @@ -45,10 +45,11 @@ llxHeader("",$langs->trans("Activity")); $now = time(); -print_titre($langs->trans("Activity")); +print_fiche_titre($langs->trans("Activity")); -print ''; -print ''; + print ' '; print "\n'; @@ -265,7 +265,10 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer) print ''; print ''; print '
'; + +print ''; +print '
'; /* * @@ -98,7 +99,7 @@ else } print "
"; -print '
'; +print ''; /* Affichage de la liste des projets du mois */ print ''; diff --git a/htdocs/projet/activity/myactivity.php b/htdocs/projet/activity/myactivity.php index 0317b32f8e0..62b1e085024 100644 --- a/htdocs/projet/activity/myactivity.php +++ b/htdocs/projet/activity/myactivity.php @@ -1,5 +1,6 @@ + * Copyright (C) 2006 Laurent Destailleur * * 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 @@ -17,14 +18,13 @@ * * $Id$ * $Source$ - * */ /** - \file htdocs/projet/index.php - \ingroup projet - \brief Page d'accueil du module projet - \version $Revision$ + \file htdocs/projet/activity/myactivity.php + \ingroup projet + \brief Page activite perso du module projet + \version $Revision$ */ require("./pre.inc.php"); @@ -47,10 +47,10 @@ llxHeader("",$langs->trans("MyActivity")); $now = time(); -print_titre($langs->trans("MyActivity")); +print_fiche_titre($langs->trans("MyActivity")); -print '
'; -print ''; - print '"; print "\n"; diff --git a/htdocs/projet/propal.php b/htdocs/projet/propal.php index f41a8e0bd2a..fc721c717e0 100644 --- a/htdocs/projet/propal.php +++ b/htdocs/projet/propal.php @@ -18,7 +18,6 @@ * * $Id$ * $Source$ - * */ /** @@ -113,9 +112,9 @@ $propales = array(); $projet->societe->fetch($projet->societe->id); print '
'; +print ''; +print ''; print "\n"; print "
'; /* * @@ -192,7 +192,7 @@ print ''.$total.'
"; -print '
'; +print ''; /* Affichage de la liste des projets de la semaine */ print ''; diff --git a/htdocs/projet/commandes.php b/htdocs/projet/commandes.php index 225f3b0d9ac..f7243ab6598 100644 --- a/htdocs/projet/commandes.php +++ b/htdocs/projet/commandes.php @@ -110,9 +110,12 @@ dolibarr_fiche_head($head, $hselected, $langs->trans("Project").": ".$projet->re $projet->societe->fetch($projet->societe->id); print '
'; -print ''; + print ''; print ''; + +print ''; + print '
'.$langs->trans("Company").''.$projet->societe->nom.'
'.$langs->trans("Ref").''.$projet->ref.'
'.$langs->trans("Label").''.$projet->title.'
'.$langs->trans("Company").''.$projet->societe->getNomUrl(1).'
'; print ''; diff --git a/htdocs/projet/facture.php b/htdocs/projet/facture.php index de7b468a657..199344136e5 100644 --- a/htdocs/projet/facture.php +++ b/htdocs/projet/facture.php @@ -111,9 +111,12 @@ dolibarr_fiche_head($head, $hselected, $langs->trans("Project").": ".$projet->re $projet->societe->fetch($projet->societe->id); print ''; -print ''; + print ''; print ''; + +print ''; + print '
'.$langs->trans("Company").''.$projet->societe->nom.'
'.$langs->trans("Ref").''.$projet->ref.'
'.$langs->trans("Label").''.$projet->title.'
'.$langs->trans("Company").''.$projet->societe->getNomUrl(1,'compta').'
'; print ''; diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 0bb5aa95996..a2f12939c9d 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2004-2006 Laurent Destailleur * Copyright (C) 2005-2006 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -33,10 +33,7 @@ $langs->load("projects"); if (!$user->rights->projet->lire) accessforbidden(); -/* - * Sécurité accés client - */ - +// Sécurité accés client if ($user->societe_id > 0) { $socidp = $user->societe_id; diff --git a/htdocs/projet/liste.php b/htdocs/projet/liste.php index eacb9ccc7aa..bc3a65eea27 100644 --- a/htdocs/projet/liste.php +++ b/htdocs/projet/liste.php @@ -122,8 +122,7 @@ if ($resql) print '
'; print ''; print ''; - print ''; + print ''; print "
'; -print ''; print ''; print ''; +print ''; print '
'.$langs->trans("Company").''.$projet->societe->nom.'
'.$langs->trans("Ref").''.$projet->ref.'
'.$langs->trans("Label").''.$projet->title.'
'.$langs->trans("Company").''.$projet->societe->getNomUrl(1).'
'; print ''; diff --git a/htdocs/projet/tasks/fiche.php b/htdocs/projet/tasks/fiche.php index 48ec8bc8d7a..28571f78def 100644 --- a/htdocs/projet/tasks/fiche.php +++ b/htdocs/projet/tasks/fiche.php @@ -93,7 +93,7 @@ Function PLines(&$inc, $parent, $lines, &$level, $actors) if ($actors[$lines[$i][2]] == 'admin') { print '
'; - print ' "; print $form->select_date('',$lines[$i][2],'','','',"addtime"); print '
'; - print ''; + + print ''; + print ''; + print ''; @@ -332,7 +335,7 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer) print ''; PLineSelect($j, 0, $tasks, $level); print ' '; - print ''; + print ''; print ''; print '
'.$langs->trans("Project").''.$projet->title.'
'.$langs->trans("Ref").''.$projet->ref.'
'.$langs->trans("Label").''.$projet->title.'
'.$langs->trans("Company").''.$projet->societe->getNomUrl(1).'

'; diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php index 859ad007f33..06967181d36 100644 --- a/htdocs/projet/tasks/index.php +++ b/htdocs/projet/tasks/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2004-2006 Laurent Destailleur * Copyright (C) 2005-2006 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -19,13 +19,12 @@ * * $Id$ * $Source$ - * */ /** - \file htdocs/projet/index.php + \file htdocs/projet/tasks/index.php \ingroup projet - \brief Page d'accueil du module projet + \brief Page des taches du module projet \version $Revision$ */ @@ -33,9 +32,7 @@ require("./pre.inc.php"); if (!$user->rights->projet->lire) accessforbidden(); -/* - * Sécurité accés client - */ +// Sécurité accés client if ($user->societe_id > 0) { $action = ''; @@ -44,10 +41,11 @@ if ($user->societe_id > 0) llxHeader("",$langs->trans("Projects"),"Projet"); -print_titre($langs->trans("ProjectsArea")); +print_fiche_titre($langs->trans("ProjectsArea")); -print ''; -print '
'; + +print ''; +print '
'; /* * @@ -101,7 +99,7 @@ else } print "
"; -print '
'; +print ''; /* * diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 1348c9a85ea..50cbfff432f 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -1,5 +1,6 @@ + * Copyright (C) 2006 Laurent Destailleur * * 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 @@ -17,11 +18,10 @@ * * $Id$ * $Source$ - * */ /** - \file htdocs/projet/tasks/fiche.php + \file htdocs/projet/tasks/task.php \ingroup projet \brief Fiche tâches d'un projet \version $Revision$ @@ -87,7 +87,10 @@ if ($_GET["id"] > 0) print '
'; print ''; print ''; - print ''; + + print ''; + print ''; + print ''; print '';
'.$langs->trans("Project").''.$projet->title.'
'.$langs->trans("Ref").''.$projet->ref.'
'.$langs->trans("Label").''.$projet->title.'
'.$langs->trans("Company").''.$projet->societe->getNomUrl(1).'
'.$langs->trans("Task").''.$task->title.'