diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index d5b296b4932..40454ed1302 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -174,6 +174,8 @@ $message=$langs->trans("AgendaUrlOptions1",$user->login,$user->login).'
';
$message.=$langs->trans("AgendaUrlOptions2",$user->login,$user->login).'
';
$message.=$langs->trans("AgendaUrlOptions3",$user->login,$user->login).'
';
$message.=$langs->trans("AgendaUrlOptions4",$user->login,$user->login).'
';
+$message.=$langs->trans("AgendaUrlOptionsProject",$user->login,$user->login);
+
print info_admin($message);
if (! empty($conf->use_javascript_ajax))
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index b31f686c9fe..b4a5fdeed60 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -987,6 +987,7 @@ class ActionComm extends CommonObject
if ($key == 'id') $sql.=" AND a.id=".(is_numeric($value)?$value:0);
if ($key == 'idfrom') $sql.=" AND a.id >= ".(is_numeric($value)?$value:0);
if ($key == 'idto') $sql.=" AND a.id <= ".(is_numeric($value)?$value:0);
+ if ($key == 'project') $sql.=" AND a.fk_project=".(is_numeric($value)?$value:0);
if ($key == 'login')
{
$login=$value;
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 84383b46f1f..e1ca9d2a5c3 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -70,9 +70,9 @@ DateActionStart= Start date
DateActionEnd= End date
AgendaUrlOptions1=You can also add following parameters to filter output:
AgendaUrlOptions2=login=%s to restrict output to actions created by, assigned to or done by user %s.
-AgendaUrlOptions3=logina=%s to restrict output to actions created by user %s.
+AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s.
AgendaUrlOptions4=logint=%s to restrict output to actions assigned to user %s.
-AgendaUrlOptions5=logind=%s to restrict output to actions done by user %s.
+AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID.
AgendaShowBirthdayEvents=Show birthday's contacts
AgendaHideBirthdayEvents=Hide birthday's contacts
Busy=Busy
@@ -90,4 +90,4 @@ ExtSiteNoLabel=No Description
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
AddEvent=Create event
-MyAvailability=My availability
\ No newline at end of file
+MyAvailability=My availability
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index bf7386a448c..2e765e5e765 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -73,6 +73,7 @@ AgendaUrlOptions2=login=%s pour limiter l'export aux actions créées, af
AgendaUrlOptions3=logina=%s pour limiter l'export aux actions créées par l'utilisateur %s.
AgendaUrlOptions4=logint=%s pour limiter l'export aux actions affectées à l'utilisateur %s.
AgendaUrlOptions5=logind=%s pour limiter l'export aux actions réalisées par l'utilisateur %s.
+AgendaUrlOptionsProject=project=PROJECT_ID pour limiter l'export aux actions associées au projet dont l'identifiant est PROJECT_ID.
AgendaShowBirthdayEvents=Afficher l'anniversaire des contacts
AgendaHideBirthdayEvents=Cacher l'anniversaire des contacts
Busy=Occupé
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index 3443f08788f..c36766e2777 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -65,6 +65,7 @@ if (! empty($_GET["year"])) $filters['year']=$_GET["year"];
if (! empty($_GET["id"])) $filters['id']=$_GET["id"];
if (! empty($_GET["idfrom"])) $filters['idfrom']=$_GET["idfrom"];
if (! empty($_GET["idto"])) $filters['idto']=$_GET["idto"];
+if (! empty($_GET["project"])) $filters['project']=$_GET["project"];
if (! empty($_GET["login"])) $filters['login']=$_GET["login"];
if (! empty($_GET["logina"])) $filters['logina']=$_GET["logina"];
if (! empty($_GET["logint"])) $filters['logint']=$_GET["logint"];
@@ -107,6 +108,7 @@ foreach ($filters as $key => $value)
if ($key == 'id') $filename.='-id'.$value;
if ($key == 'idfrom') $filename.='-idfrom'.$value;
if ($key == 'idto') $filename.='-idto'.$value;
+ if ($key == 'project') $filename.='-project'.$value;
if ($key == 'login') $filename.='-login'.$value;
if ($key == 'logina') $filename.='-logina'.$value; // Author
if ($key == 'logind') $filename.='-logind'.$value; // Affected to