Trad: Traduction espace projets
This commit is contained in:
parent
e1327f2ec0
commit
51b8ef37c6
@ -1,6 +1,7 @@
|
|||||||
# Dolibarr language file - en_US - projects
|
# Dolibarr language file - en_US - projects
|
||||||
Project=Project
|
Project=Project
|
||||||
Projects=Projects
|
Projects=Projects
|
||||||
|
Myprojects=My projects
|
||||||
ProjectsArea=Projects area
|
ProjectsArea=Projects area
|
||||||
NewProject=New project
|
NewProject=New project
|
||||||
AddProject=Add project
|
AddProject=Add project
|
||||||
@ -11,3 +12,10 @@ AllProjects=All projects
|
|||||||
ShowProject=Show project
|
ShowProject=Show project
|
||||||
SetProject=Set project
|
SetProject=Set project
|
||||||
NoProject=No project defined
|
NoProject=No project defined
|
||||||
|
NbOpenTasks=Nb of opened tasks
|
||||||
|
Mytasks=My tasks
|
||||||
|
Tasks=Tasks
|
||||||
|
Task=Task
|
||||||
|
NewTask=New task
|
||||||
|
Activity=Activity
|
||||||
|
MyActivity=My activity
|
||||||
@ -12,10 +12,10 @@ AllProjects=Tous les projets
|
|||||||
ShowProject=Afficher projet
|
ShowProject=Afficher projet
|
||||||
SetProject=Définir projet
|
SetProject=Définir projet
|
||||||
NoProject=Aucun projet défini
|
NoProject=Aucun projet défini
|
||||||
NbOpenTasks=Nb Tâche Ouverte
|
NbOpenTasks=Nb Tâches Ouvertes
|
||||||
Mytasks=Mes tâches
|
Mytasks=Mes tâches
|
||||||
Tasks=Tâches
|
Tasks=Tâches
|
||||||
Task=Tâche
|
Task=Tâche
|
||||||
NewTask=Nouvelle tâche
|
NewTask=Nouvelle tâche
|
||||||
Activity=Activité
|
Activity=Activité
|
||||||
Myactivity=Mon activité
|
MyActivity=Mon activité
|
||||||
@ -18,7 +18,6 @@
|
|||||||
*
|
*
|
||||||
* $Id$
|
* $Id$
|
||||||
* $Source$
|
* $Source$
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -33,9 +32,7 @@ $langs->load("projects");
|
|||||||
|
|
||||||
if (!$user->rights->projet->lire) accessforbidden();
|
if (!$user->rights->projet->lire) accessforbidden();
|
||||||
|
|
||||||
/*
|
// Sécurité accés client
|
||||||
* Sécurité accés client
|
|
||||||
*/
|
|
||||||
if ($user->societe_id > 0)
|
if ($user->societe_id > 0)
|
||||||
{
|
{
|
||||||
$action = '';
|
$action = '';
|
||||||
@ -57,19 +54,19 @@ print '<tr><td width="30%" valign="top" class="notopnoleft">';
|
|||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print_liste_field_titre($langs->trans("Project"),"index.php","s.nom","","","",$sortfield);
|
print_liste_field_titre($langs->trans("Project"),"index.php","s.nom","","","",$sortfield);
|
||||||
print '<td align="center">'.$langs->trans("NbOpenTasks").'</td>';
|
print '<td align="right">'.$langs->trans("NbOpenTasks").'</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
$sql = "SELECT p.title, p.rowid, count(t.rowid)";
|
$sql = "SELECT p.title, p.rowid, count(t.rowid)";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
|
$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
|
||||||
$sql .= " , ".MAIN_DB_PREFIX."projet_task as t";
|
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
|
||||||
$sql .= " WHERE t.fk_projet = p.rowid";
|
//$sql.= " , ".MAIN_DB_PREFIX."projet_task as t";
|
||||||
|
//$sql.= " WHERE t.fk_projet = p.rowid";
|
||||||
if ($socidp)
|
if ($socidp)
|
||||||
{
|
{
|
||||||
$sql .= " AND s.idp = $socidp";
|
$sql .= " AND s.idp = $socidp";
|
||||||
}
|
}
|
||||||
$sql .= " GROUP BY p.rowid";
|
$sql.= " GROUP BY p.rowid";
|
||||||
|
|
||||||
$var=true;
|
$var=true;
|
||||||
$resql = $db->query($sql);
|
$resql = $db->query($sql);
|
||||||
@ -83,8 +80,8 @@ if ( $resql )
|
|||||||
$row = $db->fetch_row( $resql);
|
$row = $db->fetch_row( $resql);
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
print "<tr $bc[$var]>";
|
print "<tr $bc[$var]>";
|
||||||
print '<td><a href="'.DOL_URL_ROOT.'/projet/tasks/fiche.php?id='.$row[1].'">'.$row[0].'</a></td>';
|
print '<td><a href="'.DOL_URL_ROOT.'/projet/fiche.php?id='.$row[1].'">'.img_object($langs->trans("ShowProject"),"project")." ".$row[0].'</a></td>';
|
||||||
print '<td align="center">'.$row[2].'</td>';
|
print '<td align="right">'.$row[2].'</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
@ -108,13 +105,12 @@ print '</td><td width="70%" valign="top" class="notopnoleft">';
|
|||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","","",$sortfield);
|
print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","","",$sortfield);
|
||||||
print '<td>Nb</td>';
|
print '<td align="right">'.$langs->trans("Nb").'</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
$sql = "SELECT s.nom, s.idp, count(p.rowid)";
|
$sql = "SELECT s.nom, s.idp, count(p.rowid)";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."projet as p";
|
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."projet as p";
|
||||||
$sql .= " WHERE p.fk_soc = s.idp";
|
$sql .= " WHERE p.fk_soc = s.idp";
|
||||||
|
|
||||||
if ($socidp)
|
if ($socidp)
|
||||||
{
|
{
|
||||||
$sql .= " AND s.idp = $socidp";
|
$sql .= " AND s.idp = $socidp";
|
||||||
@ -134,8 +130,8 @@ if ( $resql )
|
|||||||
$row = $db->fetch_row( $resql);
|
$row = $db->fetch_row( $resql);
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
print "<tr $bc[$var]>";
|
print "<tr $bc[$var]>";
|
||||||
print '<td><a href="'.DOL_URL_ROOT.'/projet/liste.php?socid='.$row[1].'">'.$row[0].'</a></td>';
|
print '<td><a href="'.DOL_URL_ROOT.'/projet/liste.php?socid='.$row[1].'">'.img_object($langs->trans("ShowCompany"),"company")." ".$row[0].'</a></td>';
|
||||||
print '<td>'.$row[2].'</td>';
|
print '<td align="right">'.$row[2].'</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
|
|||||||
@ -19,14 +19,13 @@
|
|||||||
*
|
*
|
||||||
* $Id$
|
* $Id$
|
||||||
* $Source$
|
* $Source$
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\file htdocs/projet/liste.php
|
\file htdocs/projet/liste.php
|
||||||
\ingroup projet
|
\ingroup projet
|
||||||
\brief Page liste des projets
|
\brief Page liste des projets
|
||||||
\version $Revision$
|
\version $Revision$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
@ -68,6 +67,8 @@ $pageprev = $page - 1;
|
|||||||
$pagenext = $page + 1;
|
$pagenext = $page + 1;
|
||||||
|
|
||||||
|
|
||||||
|
llxHeader();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* Affichage de la liste des projets
|
* 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 .= " , s.nom, s.idp, s.client";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."projet as p";
|
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."projet as p";
|
||||||
$sql .= " WHERE p.fk_soc = s.idp";
|
$sql .= " WHERE p.fk_soc = s.idp";
|
||||||
|
|
||||||
if ($socid)
|
if ($socid)
|
||||||
{
|
{
|
||||||
$sql .= " AND s.idp = $socid";
|
$sql .= " AND s.idp = $socid";
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($_GET["search_ref"])
|
if ($_GET["search_ref"])
|
||||||
{
|
{
|
||||||
$sql .= " AND p.ref LIKE '%".$_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 .= " AND s.nom LIKE '%".$_GET["search_societe"]."%'";
|
||||||
}
|
}
|
||||||
|
|
||||||
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
|
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
|
||||||
|
|
||||||
$var=true;
|
$var=true;
|
||||||
@ -105,12 +103,8 @@ if ($resql)
|
|||||||
$num = $db->num_rows($resql);
|
$num = $db->num_rows($resql);
|
||||||
$i = 0;
|
$i = 0;
|
||||||
|
|
||||||
//llxHeader("",$title,"Projet");
|
|
||||||
llxHeader();
|
|
||||||
|
|
||||||
print_barre_liste($langs->trans("Projects"), $page, "liste.php", "", $sortfield, $sortorder, "", $num);
|
print_barre_liste($langs->trans("Projects"), $page, "liste.php", "", $sortfield, $sortorder, "", $num);
|
||||||
|
|
||||||
print '<br>';
|
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print_liste_field_titre($langs->trans("Ref"),"liste.php","p.ref","","","",$sortfield);
|
print_liste_field_titre($langs->trans("Ref"),"liste.php","p.ref","","","",$sortfield);
|
||||||
@ -140,10 +134,10 @@ if ($resql)
|
|||||||
$objp = $db->fetch_object($resql);
|
$objp = $db->fetch_object($resql);
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
print "<tr $bc[$var]>";
|
print "<tr $bc[$var]>";
|
||||||
print "<td><a href=\"fiche.php?id=$objp->projectid\">$objp->title</a></td>\n";
|
print "<td><a href=\"fiche.php?id=$objp->projectid\">".img_object($langs->trans("ShowProject"),"project")." ".$objp->ref."</a></td>\n";
|
||||||
print "<td><a href=\"fiche.php?id=$objp->projectid\">$objp->ref</a></td>\n";
|
print "<td><a href=\"fiche.php?id=$objp->projectid\">".$objp->title."</a></td>\n";
|
||||||
print '<td>';
|
print '<td>';
|
||||||
print img_object($langs->trans("ShowCompanie"),"company");
|
print img_object($langs->trans("ShowCompany"),"company");
|
||||||
|
|
||||||
print ' <a href="'.DOL_URL_ROOT.'/soc.php?socid='.$objp->idp.'">'.$objp->nom.'</a></td>';
|
print ' <a href="'.DOL_URL_ROOT.'/soc.php?socid='.$objp->idp.'">'.$objp->nom.'</a></td>';
|
||||||
print '<td> </td>';
|
print '<td> </td>';
|
||||||
@ -163,5 +157,7 @@ print "</table>";
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter("<em>Dernière modification $Date$ révision $Revision$</em>");
|
|
||||||
|
llxFooter('$Date$ - $Revision$');
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user