';
$projectstatic->id=$row->rowid;
@@ -205,7 +207,7 @@ if ( $resql )
while ($row = $db->fetch_object($resql))
{
-
+
print '
';
print '
';
$projectstatic->id=$row->rowid;
@@ -237,14 +239,14 @@ print "";
if ($db->type != 'pgsql')
{
print ' ';
-
+
// Affichage de la liste des projets de la semaine
print '
';
print '
';
print '
'.$langs->trans("ActivityOnProjectThisWeek").'
';
print '
'.$langs->trans("Time").'
';
print "
\n";
-
+
$sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql.= " , ".MAIN_DB_PREFIX."projet_task as t";
@@ -256,16 +258,16 @@ if ($db->type != 'pgsql')
$sql.= " AND task_date >= '".$db->idate(dol_get_first_day($year, $month)).'" AND ...";
$sql.= " AND p.rowid in (".$projectsListId.")";
$sql.= " GROUP BY p.rowid, p.ref, p.title";
-
+
$resql = $db->query($sql);
if ( $resql )
{
$total = 0;
$var=true;
-
+
while ($row = $db->fetch_object($resql))
{
-
+
print '
';
print "\n";
-
+
}
$db->free($resql);
}
@@ -430,12 +432,12 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S
}
else dol_print_error($db);
if (count($listoftaskcontacttype) == 0) $listoftaskcontacttype[0]='0'; // To avoid sql syntax error if not found
-
+
// Tasks for all resources of all opened projects and time spent for each task/resource
// This list can be very long, so we don't show it by default on task area. We prefer to use the list page.
// Add constant PROJECT_SHOW_TASK_LIST_ON_PROJECT_AREA to show this list
-
+
$max = (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?1000:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA);
$sql = "SELECT p.ref, p.title, p.rowid as projectid, p.fk_statut as status, p.fk_opp_status as opp_status, p.public, p.dateo as projdateo, p.datee as projdatee,";
@@ -489,7 +491,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S
while ($i < $num && $i < $max)
{
$obj = $db->fetch_object($resql);
-
+
$username='';
if ($obj->userid && $userstatic->id != $obj->userid) // We have a user and it is not last loaded user
@@ -509,7 +511,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S
$projectstatic->public = $obj->public;
$projectstatic->dateo = $db->jdate($obj->projdateo);
$projectstatic->datee = $db->jdate($obj->projdatee);
-
+
print $projectstatic->getNomUrl(1,'',0,'',' ');
print '';
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
@@ -536,7 +538,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S
$taskstatic->datee = $db->jdate($obj->datee);
print '
';
if ($obj->socid)
@@ -217,9 +218,9 @@ if (! empty($conf->global->PROJECT_SHOW_PROJECT_LIST_ON_PROJECT_AREA))
{
// This list can be very long, so we don't show it by default on task area. We prefer to use the list page.
// Add constant PROJECT_SHOW_PROJECT_LIST_ON_PROJECT_AREA to show this list
-
+
print ' ';
-
+
print_projecttasks_array($db, $form, $socid, $projectsListId, 0, 1, $listofoppstatus, array());
}
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 9e2971195e3..7ee41fcd024 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -261,8 +261,8 @@ if ($search_project_user > 0)
}
$sql.= " WHERE p.entity IN (".getEntity('project').')';
if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
-// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
-if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+// No need to check if company is external user, as filtering of projects must be done by getProjectsAuthorizedForUser
+if ($socid > 0) $sql.= " AND (p.fk_soc = ".$socid.")";
if ($search_categ > 0) $sql.= " AND cs.fk_categorie = ".$db->escape($search_categ);
if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL";
if ($search_ref) $sql .= natural_search('p.ref', $search_ref);
@@ -487,19 +487,25 @@ print '
';
if (! empty($arrayfields['p.ref']['checked']))
{
print '
';
- print '';
+ print '';
print '
';
}
if (! empty($arrayfields['p.title']['checked']))
{
print '
';
- print '';
+ print '';
print '
';
}
if (! empty($arrayfields['s.nom']['checked']))
{
print '