diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 7df2a04cc01..a08229f100b 100755 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -1,6 +1,7 @@ # Dolibarr language file - en_US - projects Project=Project Projects=Projects +Myprojects=My projects ProjectsArea=Projects area NewProject=New project AddProject=Add project @@ -10,4 +11,11 @@ LastProjects=Last %s projects AllProjects=All projects ShowProject=Show project SetProject=Set project -NoProject=No project defined \ No newline at end of file +NoProject=No project defined +NbOpenTasks=Nb of opened tasks +Mytasks=My tasks +Tasks=Tasks +Task=Task +NewTask=New task +Activity=Activity +MyActivity=My activity \ No newline at end of file diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index af7eda67807..b6c01430ad1 100755 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -12,10 +12,10 @@ AllProjects=Tous les projets ShowProject=Afficher projet SetProject=Définir projet NoProject=Aucun projet défini -NbOpenTasks=Nb Tâche Ouverte +NbOpenTasks=Nb Tâches Ouvertes Mytasks=Mes tâches Tasks=Tâches Task=Tâche NewTask=Nouvelle tâche Activity=Activité -Myactivity=Mon activité \ No newline at end of file +MyActivity=Mon activité \ No newline at end of file diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index bda98148afc..3899a86c202 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -18,7 +18,6 @@ * * $Id$ * $Source$ - * */ /** @@ -33,9 +32,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) { $action = ''; @@ -57,19 +54,19 @@ print ''; print ''; print ''; print_liste_field_titre($langs->trans("Project"),"index.php","s.nom","","","",$sortfield); -print ''; +print ''; print "\n"; $sql = "SELECT p.title, p.rowid, count(t.rowid)"; -$sql .= " FROM ".MAIN_DB_PREFIX."projet as p"; -$sql .= " , ".MAIN_DB_PREFIX."projet_task as t"; -$sql .= " WHERE t.fk_projet = p.rowid"; - +$sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet"; +//$sql.= " , ".MAIN_DB_PREFIX."projet_task as t"; +//$sql.= " WHERE t.fk_projet = p.rowid"; if ($socidp) { $sql .= " AND s.idp = $socidp"; } -$sql .= " GROUP BY p.rowid"; +$sql.= " GROUP BY p.rowid"; $var=true; $resql = $db->query($sql); @@ -83,8 +80,8 @@ if ( $resql ) $row = $db->fetch_row( $resql); $var=!$var; print ""; - print ''; - print ''; + print ''; + print ''; print "\n"; $i++; @@ -108,13 +105,12 @@ print '
'.$langs->trans("NbOpenTasks").''.$langs->trans("NbOpenTasks").'
'.$row[0].''.$row[2].''.img_object($langs->trans("ShowProject"),"project")." ".$row[0].''.$row[2].'
'; print ''; print ''; print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","","",$sortfield); -print ''; +print ''; print "\n"; $sql = "SELECT s.nom, s.idp, count(p.rowid)"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."projet as p"; $sql .= " WHERE p.fk_soc = s.idp"; - if ($socidp) { $sql .= " AND s.idp = $socidp"; @@ -134,8 +130,8 @@ if ( $resql ) $row = $db->fetch_row( $resql); $var=!$var; print ""; - print ''; - print ''; + print ''; + print ''; print "\n"; $i++; diff --git a/htdocs/projet/liste.php b/htdocs/projet/liste.php index b95c426eb91..9a24912cfc1 100644 --- a/htdocs/projet/liste.php +++ b/htdocs/projet/liste.php @@ -19,14 +19,13 @@ * * $Id$ * $Source$ - * */ /** - \file htdocs/projet/liste.php - \ingroup projet - \brief Page liste des projets - \version $Revision$ + \file htdocs/projet/liste.php + \ingroup projet + \brief Page liste des projets + \version $Revision$ */ require("./pre.inc.php"); @@ -68,6 +67,8 @@ $pageprev = $page - 1; $pagenext = $page + 1; +llxHeader(); + /* * * Affichage de la liste des projets @@ -77,12 +78,10 @@ $sql = "SELECT p.rowid as projectid, p.ref, p.title, ".$db->pdate("p.dateo")." a $sql .= " , s.nom, s.idp, s.client"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."projet as p"; $sql .= " WHERE p.fk_soc = s.idp"; - if ($socid) { $sql .= " AND s.idp = $socid"; } - if ($_GET["search_ref"]) { $sql .= " AND p.ref LIKE '%".$_GET["search_ref"]."%'"; @@ -95,7 +94,6 @@ if ($_GET["search_societe"]) { $sql .= " AND s.nom LIKE '%".$_GET["search_societe"]."%'"; } - $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset); $var=true; @@ -105,12 +103,8 @@ if ($resql) $num = $db->num_rows($resql); $i = 0; - //llxHeader("",$title,"Projet"); - llxHeader(); - print_barre_liste($langs->trans("Projects"), $page, "liste.php", "", $sortfield, $sortorder, "", $num); - print '
'; print '
Nb'.$langs->trans("Nb").'
'.$row[0].''.$row[2].''.img_object($langs->trans("ShowCompany"),"company")." ".$row[0].''.$row[2].'
'; print ''; print_liste_field_titre($langs->trans("Ref"),"liste.php","p.ref","","","",$sortfield); @@ -140,10 +134,10 @@ if ($resql) $objp = $db->fetch_object($resql); $var=!$var; print ""; - print "\n"; - print "\n"; + print "\n"; + print "\n"; print ''; print ''; @@ -163,5 +157,7 @@ print "
projectid\">$objp->titleprojectid\">$objp->refprojectid\">".img_object($langs->trans("ShowProject"),"project")." ".$objp->ref."projectid\">".$objp->title."'; - print img_object($langs->trans("ShowCompanie"),"company"); + print img_object($langs->trans("ShowCompany"),"company"); print ' '.$objp->nom.' 
"; $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); + +llxFooter('$Date$ - $Revision$'); + ?>