diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index e815ca8438d..76bcccd936d 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -728,244 +728,12 @@ if ($socid > 0)
     /*
      *      Listes des actions a faire
      */
-    if ($conf->agenda->enabled)
-    {
-	    print_titre($langs->trans("ActionsOnCompany"));
-		
-	    print '<table width="100%" class="noborder">';
-	    print '<tr class="liste_titre">';
-	    print '<td colspan="11"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$objsoc->id.'&amp;status=todo">'.$langs->trans("ActionsToDoShort").'</a></td><td align="right">&nbsp;</td>';
-	    print '</tr>';
+	show_actions_todo($conf,$langs,$db,$objsoc);
 	
-	    $sql = "SELECT a.id, a.label,";
-	    $sql.= " ".$db->pdate("a.datep")." as dp,";
-	    $sql.= " ".$db->pdate("a.datea")." as da,";
-	    $sql.= " a.percent,";
-	    $sql.= " c.code as acode, c.libelle, a.propalrowid, a.fk_user_author, a.fk_contact,";
-		$sql.= " u.login, u.rowid,";
-		$sql.= " sp.name, sp.firstname";
-	    $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
-	    $sql.= " WHERE a.fk_soc = ".$objsoc->id;
-	    $sql.= " AND u.rowid = a.fk_user_author";
-	    $sql.= " AND c.id=a.fk_action AND a.percent < 100";
-	    $sql.= " ORDER BY a.datep DESC, a.id DESC";
-	
-		dolibarr_syslog("comm/fiche.php sql=".$sql);
-	    $result=$db->query($sql);
-	    if ($result)
-	    {
-	        $i = 0 ;
-	        $num = $db->num_rows($result);
-	        $var=true;
-	        
-	        if ($num)
-	        {
-	            while ($i < $num)
-	            {
-	                $var = !$var;
-	
-	                $obj = $db->fetch_object($result);
-	                print "<tr $bc[$var]>";
-	
-                    print '<td width="30" align="center">'.strftime("%Y",$obj->dp)."</td>\n";
-                    $oldyear = strftime("%Y",$obj->dp);
-	
-                    print '<td width="30" align="center">' .strftime("%b",$obj->dp)."</td>\n";
-                    $oldmonth = strftime("%Y%b",$obj->dp);
-	
-	                print '<td width="20">'.strftime("%d",$obj->dp)."</td>\n";
-	               	print '<td width="30" nowrap="nowrap">'.strftime("%H:%M",$obj->dp).'</td>';
-					
-					// Picto warning
-					print '<td width="16">';
-					if (date("U",$obj->dp) < time()) print ' '.img_warning("Late");
-					else print '&nbsp;';
-					print '</td>';
-	
-	                // Status/Percent
-	                print '<td width="30">&nbsp;</td>';
-	
-	                if ($obj->propalrowid)
-	                {
-	                    print '<td><a href="propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowAction"),"task");
-	                    $transcode=$langs->trans("Action".$obj->acode);
-	                    $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
-	                    print $libelle;
-	                    print '</a></td>';
-	                }
-	                else
-	                {
-			            $actionstatic->code=$obj->acode;
-			            $actionstatic->libelle=$obj->libelle;
-			            $actionstatic->id=$obj->id;
-			            print '<td>'.$actionstatic->getNomUrl(1,16).'</td>';
-	                }
-	                print '<td colspan="2">'.$obj->label.'</td>';
-	
-	                // Contact pour cette action
-	                if ($obj->fk_contact > 0)
-	                {
-	                    $contactstatic->name=$obj->name;
-	                    $contactstatic->firstname=$obj->firstname;
-	                    $contactstatic->id=$obj->fk_contact;
-		                print '<td>'.$contactstatic->getNomUrl(1).'</td>';
-	                }
-	                else
-	                {
-	                    print '<td>&nbsp;</td>';
-	                }
-	
-	                print '<td width="80" nowrap="nowrap">';
-					$userstatic->id=$obj->fk_user_author;
-					$userstatic->login=$obj->login;
-					print $userstatic->getLoginUrl(1);
-					print '</td>';
-	
-					// Statut
-	                print '<td nowrap="nowrap" width="20">'.$actionstatic->LibStatut($obj->percent,3).'</td>';
-	
-	                print "</tr>\n";
-	                $i++;
-	            }
-			}
-			else
-			{
-				// Aucun action a faire
-					
-			}
-	        $db->free($result);
-	    }
-	    else
-	    {
-	        dolibarr_print_error($db);
-	    }
-	    print "</table>";
-	
-	    print "<br>";
-    }
-
     /*
      *      Listes des actions effectuees
      */
-    if ($conf->agenda->enabled)
-    {
-	    print '<table class="noborder" width="100%">';
-	    print '<tr class="liste_titre">';
-	    print '<td colspan="12"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$objsoc->id.'&amp;status=done">'.$langs->trans("ActionsDoneShort").'</a></td>';
-	    print '</tr>';
-	
-	    $sql = "SELECT a.id, a.label,";
-	    $sql.= " ".$db->pdate("a.datep")." as dp,";
-	    $sql.= " ".$db->pdate("a.datea")." as da,";
-	    $sql.= " a.percent,";
-	    $sql.= " a.propalrowid, a.fk_facture, a.fk_user_author, a.fk_contact,";
-	    $sql.= " c.code as acode, c.libelle,";
-	    $sql.= " u.login, u.rowid,";
-	    $sql.= " sp.name, sp.firstname";
-	    $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
-	    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
-	    $sql.= " WHERE a.fk_soc = ".$objsoc->id;
-	    $sql.= " AND u.rowid = a.fk_user_author";
-	    $sql.= " AND c.id=a.fk_action AND a.percent = 100";
-	    $sql.= " ORDER BY a.datea DESC, a.id DESC";
-	
-		dolibarr_syslog("comm/fiche.php sql=".$sql);
-	    $result=$db->query($sql);
-	    if ($result)
-	    {
-	        $i = 0 ;
-	        $num = $db->num_rows($result);
-	        $oldyear='';
-	        $oldmonth='';
-	        $var=true;
-	
-	        while ($i < $num)
-	        {
-	            $var = !$var;
-	
-	            $obj = $db->fetch_object($result);
-	            print "<tr $bc[$var]>";
-	
-	            // Champ date
-                print '<td width="30" align="center">'.strftime("%Y",$obj->da)."</td>\n";
-                $oldyear = strftime("%Y",$obj->da);
-                print '<td width="30" align="center">'.strftime("%b",$obj->da)."</td>\n";
-                $oldmonth = strftime("%Y%b",$obj->da);
-	            print '<td width="20">'.strftime("%d",$obj->da)."</td>\n";
-	            print '<td width="30">'.strftime("%H:%M",$obj->da)."</td>\n";
-	
-				// Picto
-	            print '<td width="16">&nbsp;</td>';
-	
-	            // Espace
-	            print '<td width="30">&nbsp;</td>';
-	
-				// Action
-	    		print '<td>';
-	            $actionstatic->code=$obj->acode;
-	            $actionstatic->libelle=$obj->libelle;
-	            $actionstatic->id=$obj->id;
-	            print $actionstatic->getNomUrl(1,16);
-				print '</td>';
-	
-	    		// Objet lie
-	    		print '<td>';
-				if ($obj->propalrowid)
-				{
-					print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowPropal"),"propal");
-					print $langs->trans("Propal");
-					print '</a>';
-				}
-				if ($obj->fk_facture)
-				{
-					$facturestatic->ref=$langs->trans("Invoice");
-					$facturestatic->id=$obj->fk_facture;
-					$facturestatic->type=$obj->type;
-					print $facturestatic->getNomUrl(1,'compta');
-				}
-				else print '&nbsp;';
-	    		print '</td>';
-	
-				// Libelle
-	      print '<td>'.$obj->label.'</td>';
-	
-	            // Contact pour cette action
-	            if ($obj->fk_contact > 0)
-	            {
-					$contactstatic->name=$obj->name;
-					$contactstatic->firstname=$obj->firstname;
-					$contactstatic->id=$obj->fk_contact;
-	                print '<td>'.$contactstatic->getNomUrl(1).'</td>';
-	            }
-	            else
-	            {
-	                print '<td>&nbsp;</td>';
-	            }
-	
-				// Auteur
-	            print '<td nowrap="nowrap" width="80">';
-				$userstatic->id=$obj->rowid;
-				$userstatic->login=$obj->login;
-				print $userstatic->getLoginUrl(1);
-				print '</td>';
-	
-				// Statut
-	      print '<td nowrap="nowrap" width="20">'.$actionstatic->LibStatut($obj->percent,3).'</td>';
-				
-	            print "</tr>\n";
-	            $i++;
-	        }
-	
-	        $db->free($result);
-	    }
-	    else
-	    {
-	        dolibarr_print_error($db);
-	    }
-	 
-	    print "</table><br>";
-    }
+	show_actions_done($conf,$langs,$db,$objsoc);
 }
 else
 {
diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php
index 483f22dde90..da328ec7a59 100644
--- a/htdocs/compta/fiche.php
+++ b/htdocs/compta/fiche.php
@@ -300,7 +300,7 @@ if ($socid > 0)
     }
 
     /*
-     * Derniers projets associ�s
+     * Derniers projets associes
      */
     if ($conf->projet->enabled)
     {
@@ -471,250 +471,13 @@ if ($socid > 0)
 
     /*
      *      Listes des actions a faire
-     *
      */
-    if ($conf->agenda->enabled)
-    {
-	    print_titre($langs->trans("ActionsOnCompany"));
-	    print '<table width="100%" class="noborder">';
-	    print '<tr class="liste_titre">';
-	    print '<td colspan="11"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$societe->id.'&amp;status=todo">'.$langs->trans("ActionsToDoShort").'</a></td><td align="right">&nbsp;</td>';
-	    print '</tr>';
+	show_actions_todo($conf,$langs,$db,$societe);
 	
-	    $sql = "SELECT a.id, a.label,";
-	    $sql.= " ".$db->pdate("a.datep")." as dp,";
-	    $sql.= " ".$db->pdate("a.datea")." as da,";
-	    $sql.= " a.percent,";
-	    $sql.= " c.code as acode, c.libelle, u.login, a.propalrowid, a.fk_user_author, a.fk_contact,";
-	    $sql.= " u.login, u.rowid,";
-		$sql.= " sp.name, sp.firstname";
-	    $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
-	    $sql.= " WHERE a.fk_soc = ".$societe->id;
-	    $sql.= " AND u.rowid = a.fk_user_author";
-	    $sql.= " AND c.id=a.fk_action AND a.percent < 100";
-	    $sql.= " ORDER BY a.datea DESC, a.id DESC";
-	
-		dolibarr_syslog("compta/fiche.php sql=".$sql);
-	    $result=$db->query($sql);
-	    if ($result)
-	    {
-	        $i = 0 ;
-	        $num = $db->num_rows($result);
-	        $var=true;
-	        
-	        while ($i < $num)
-	        {
-	            $var = !$var;
-	
-	            $obj = $db->fetch_object($result);
-	            print "<tr $bc[$var]>";
-	
-	            if ($oldyear == strftime("%Y",$obj->dp) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
-	            {
-	                print '<td width="30" align="center">|</td>';
-	            }
-	            else
-	            {
-	                print '<td width="30" align="center">'.strftime("%Y",$obj->dp)."</td>\n";
-	                $oldyear = strftime("%Y",$obj->dp);
-	            }
-	
-	            if ($oldmonth == strftime("%Y%b",$obj->dp) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
-	            {
-	                print '<td width="30" align="center">|</td>';
-	            }
-	            else
-	            {
-	                print '<td width="30" align="center">' .strftime("%b",$obj->dp)."</td>\n";
-	                $oldmonth = strftime("%Y%b",$obj->dp);
-	            }
-	
-	            print '<td width="20">'.strftime("%d",$obj->dp)."</td>\n";
-	            print '<td width="30" nowrap="nowrap">'.strftime("%H:%M",$obj->dp).'</td>';
-				
-				// Picto warning
-				print '<td width="16">';
-				if (date("U",$obj->dp) < time()) print ' '.img_warning("Late");
-				else print '&nbsp;';
-				print '</td>';
-				
-	            // Status/Percent
-	            print '<td width="30">&nbsp;</td>';
-	
-	            if ($obj->propalrowid)
-	            {
-	                print '<td><a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowAction"),"task");
-	                  $transcode=$langs->trans("Action".$obj->acode);
-	                  $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
-	                  print $libelle;
-	                print '</a></td>';
-	            }
-	            else
-	            {
-			            $actionstatic->code=$obj->acode;
-			            $actionstatic->libelle=$obj->libelle;
-			            $actionstatic->id=$obj->id;
-			            print '<td>'.$actionstatic->getNomUrl(1,16).'</td>';
-	            }
-	
-	            print '<td colspan="2">'.$obj->label.'</td>';
-	
-	            // Contact pour cette action
-	            if ($obj->fk_contact > 0)
-	            {
-					$contactstatic->name=$obj->name;
-					$contactstatic->firstname=$obj->firstname;
-					$contactstatic->id=$obj->fk_contact;
-	                print '<td>'.$contactstatic->getNomUrl(1).'</td>';
-	            }
-	            else
-	            {
-	                print '<td>&nbsp;</td>';
-	            }
-	
-	            // Auteur
-	            print '<td width="50" nowrap="nowrap"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->fk_user_author.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.'</a></td>';
-	
-				// Statut
-	            print '<td nowrap="nowrap" width="20">'.$actionstatic->LibStatut($obj->percent,3).'</td>';
-	
-	            print "</tr>\n";
-	            $i++;
-	        }
-	
-	        $db->free($result);
-	    }
-	    else
-	    {
-	        dolibarr_print_error($db);
-	    }
-	    print "</table><br>";
-    }
-    
     /*
      *      Listes des actions effectuees
      */
-    if ($conf->agenda->enabled)
-    {
-	    print '<table width="100%" class="noborder">';
-	    print '<tr class="liste_titre">';
-	    print '<td colspan="12"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$societe->id.'&amp;status=done">'.$langs->trans("ActionsDoneShort").'</a>';
-	    print '</td></tr>';
-	
-	    $sql = "SELECT a.id, a.label,";
-	    $sql.= " ".$db->pdate("a.datep")." as dp,";
-	    $sql.= " ".$db->pdate("a.datea")." as da,";
-	    $sql.= " a.percent,";
-	    $sql.= " a.propalrowid, a.fk_facture, a.fk_user_author, a.fk_contact,";
-	    $sql.= " c.code as acode, c.libelle,";
-	    $sql.= " u.login, u.rowid,";
-		$sql.= " sp.name, sp.firstname";
-	    $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
-	    $sql.= " WHERE a.fk_soc = ".$societe->id;
-	    $sql.= " AND u.rowid = a.fk_user_author";
-	    $sql.= " AND c.id=a.fk_action AND a.percent = 100";
-	    $sql.= " ORDER BY a.datea DESC, a.id DESC";
-	
-		dolibarr_syslog("compta/fiche.php sql=".$sql);
-	    $result=$db->query($sql);
-	    if ($result)
-	    {
-	        $i = 0 ;
-	        $num = $db->num_rows($result);
-	        $var=true;
-	        
-	        while ($i < $num)
-	        {
-	            $var = !$var;
-	
-	            $obj = $db->fetch_object($result);
-	            print "<tr $bc[$var]>";
-	
-	            if ($oldyear == strftime("%Y",$obj->da) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS) {
-	                print '<td width="30" align="center">|</td>';
-	            } else {
-	                print '<td width="30" align="center">'.strftime("%Y",$obj->da)."</td>\n";
-	                $oldyear = strftime("%Y",$obj->da);
-	            }
-	
-	            if ($oldmonth == strftime("%Y%b",$obj->da) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS) {
-	                print '<td width="30" align="center">|</td>';
-	            } else {
-	                print '<td width="30" align="center">'.strftime("%b",$obj->da)."</td>\n";
-	                $oldmonth = strftime("%Y%b",$obj->da);
-	            }
-	
-	            print '<td width="20">'.strftime("%d",$obj->da)."</td>\n";
-	            print '<td width="30">'.strftime("%H:%M",$obj->da)."</td>\n";
-	
-				// Picto
-	            print '<td width="16">&nbsp;</td>';
-	
-	            // Espace
-	            print '<td width="30">&nbsp;</td>';
-	
-				// Action
-	    		print '<td>';
-	            $actionstatic->code=$obj->acode;
-	            $actionstatic->libelle=$obj->libelle;
-	            $actionstatic->id=$obj->id;
-	            print $actionstatic->getNomUrl(1,16);
-				print '</td>';
-	
-	    		// Objet li�
-	    		print '<td>';
-				if ($obj->propalrowid)
-				{
-					print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowPropal"),"propal");
-					print $langs->trans("Propal");
-					print '</a>';
-				}
-				if ($obj->fk_facture)
-				{
-					$facturestatic->ref=$langs->trans("Invoice");
-					$facturestatic->id=$obj->rowid;
-					$facturestatic->type=$obj->type;
-					print $facturestatic->getNomUrl(1,'compta');
-				}
-				else print '&nbsp;';
-	    		print '</td>';
-	
-				// Libell�
-	            print "<td>$obj->label</td>";
-	
-	            // Contact pour cette action
-	            if ($obj->fk_contact > 0)
-	            {
-					$contactstatic->name=$obj->name;
-					$contactstatic->firstname=$obj->firstname;
-					$contactstatic->id=$obj->fk_contact;
-	                print '<td>'.$contactstatic->getNomUrl(1).'</td>';
-	            }
-	            else
-	            {
-	                print '<td>&nbsp;</td>';
-	            }
-	
-				// Auteur
-	            print '<td nowrap="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
-	
-				// Statut
-	            print '<td nowrap="nowrap" width="20">'.$actionstatic->LibStatut($obj->percent,3).'</td>';
-	
-	            print "</tr>\n";
-	            $i++;
-	        }
-	
-	        $db->free($result);
-	    }
-	    else
-	    {
-	        dolibarr_print_error($db);
-	    }
-	    print "</table><br>";
-    }
+	show_actions_done($conf,$langs,$db,$societe);
 }
 else
 {
diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php
index e5f06ac663e..94748a78cb3 100644
--- a/htdocs/fourn/fiche.php
+++ b/htdocs/fourn/fiche.php
@@ -367,242 +367,15 @@ if ( $societe->fetch($socid) )
 	print '</table>';
 	print '<br>';
 
-	/*
-	 *  Listes des actions a faire
-	 *	\TODO Mutualise ce code avec page compta et client de tiers
-	 */
-    if ($conf->agenda->enabled)
-    {
-		print_titre($langs->trans("ActionsOnCompany"));
-		print '<table width="100%" class="noborder">';
-		print '<tr class="liste_titre"><td colspan="11"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$societe->id.'&amp;status=todo">'.$langs->trans("ActionsToDoShort").'</a></td><td align="right">&nbsp;</td></tr>';
+    /*
+     *      Listes des actions a faire
+     */
+	show_actions_todo($conf,$langs,$db,$societe);
 	
-		$sql = "SELECT a.id, a.label, ".$db->pdate("a.datep")." as dp, c.code as acode, c.libelle, u.login,";
-		$sql.= " a.propalrowid, a.fk_user_author, a.fk_contact, u.rowid,";
-		$sql.= " sp.name, sp.firstname";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
-		$sql.= " WHERE a.fk_soc = ".$societe->id;
-		$sql.= " AND u.rowid = a.fk_user_author";
-		$sql.= " AND c.id=a.fk_action AND a.percent < 100";
-		$sql.= " ORDER BY a.datep DESC, a.id DESC";
-	
-		$result=$db->query($sql);
-		if ($result)
-		{
-			$i = 0 ;
-			$num = $db->num_rows($result);
-			$var=true;
-	
-			while ($i < $num)
-			{
-				$var = !$var;
-	
-				$obj = $db->fetch_object($result);
-				print "<tr $bc[$var]>";
-	
-				if ($oldyear == strftime("%Y",$obj->dp) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
-				{
-					print '<td width="30" align="center">|</td>';
-				}
-				else
-				{
-					print '<td width="30" align="center">'.strftime("%Y",$obj->dp)."</td>\n";
-					$oldyear = strftime("%Y",$obj->dp);
-				}
-	
-				if ($oldmonth == strftime("%Y%b",$obj->dp) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
-				{
-					print '<td width="30" align="center">|</td>';
-				}
-				else
-				{
-					print '<td width="30" align="center">' .strftime("%b",$obj->dp)."</td>\n";
-					$oldmonth = strftime("%Y%b",$obj->dp);
-				}
-	
-				print '<td width="20">'.strftime("%d",$obj->dp)."</td>\n";
-				print '<td width="30" nowrap="nowrap">'.strftime("%H:%M",$obj->dp).'</td>';
-	
-				// Picto warning
-				print '<td width="16">';
-				if (date("U",$obj->dp) < time()) print ' '.img_warning("Late");
-				else print '&nbsp;';
-				print '</td>';
-	
-				// Status/Percent
-				print '<td width="30">&nbsp;</td>';
-	
-				if ($obj->propalrowid)
-				{
-					print '<td><a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowAction"),"task");
-					$transcode=$langs->trans("Action".$obj->acode);
-					$libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
-					print $libelle;
-					print '</a></td>';
-				}
-				else
-				{
-					print '<td><a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowAction"),"task");
-					$transcode=$langs->trans("Action".$obj->acode);
-					$libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
-					print $libelle;
-					print '</a></td>';
-				}
-	
-				print '<td colspan="2">'.$obj->label.'</td>';
-	
-				// Contact pour cette action
-	      if ($obj->fk_contact > 0)
-	      {
-	      	$contactstatic->name=$obj->name;
-					$contactstatic->firstname=$obj->firstname;
-					$contactstatic->id=$obj->fk_contact;
-	        print '<td>'.$contactstatic->getNomUrl(1).'</td>';
-	      }
-	      else
-	      {
-	      	print '<td>&nbsp;</td>';
-	      }
-	
-				// Auteur
-				print '<td width="80" nowrap="nowrap"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->fk_user_author.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.'</a></td>';
-				
-				// Statut
-	      print '<td nowrap="nowrap" width="20">'.$actionstatic->LibStatut($obj->percent,3).'</td>';
-	      
-				print "</tr>\n";
-				$i++;
-			}
-	
-			$db->free($result);
-		} else {
-			dolibarr_print_error($db);
-		}
-		print "</table><br>";
-    }
-    
-	/*
-	 *      Listes des actions effectuees
-	 */
-    if ($conf->agenda->enabled)
-    {
-		print '<table width="100%" class="noborder">';
-		print '<tr class="liste_titre">';
-		print '<td colspan="12"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$societe->id.'&amp;status=done">'.$langs->trans("ActionsDoneShort").'</a></td></tr>';
-	
-		$sql = "SELECT a.id, a.label, ".$db->pdate("a.datea")." as da, a.percent,";
-		$sql.= " a.propalrowid, a.fk_facture, a.fk_user_author, a.fk_contact,";
-		$sql.= " c.code as acode, c.libelle,";
-		$sql.= " u.login, u.rowid,";
-		$sql.= " sp.name, sp.firstname";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
-		$sql.= " WHERE a.fk_soc = ".$societe->id;
-		$sql.= " AND u.rowid = a.fk_user_author";
-		$sql.= " AND c.id=a.fk_action AND a.percent = 100";
-		$sql.= " ORDER BY a.datea DESC, a.id DESC";
-	
-		$result=$db->query($sql);
-		if ($result)
-		{
-			$i = 0 ;
-			$num = $db->num_rows($result);
-			$var=true;
-	
-			while ($i < $num)
-			{
-				$var = !$var;
-	
-				$obj = $db->fetch_object($result);
-				print "<tr $bc[$var]>";
-	
-				if ($oldyear == strftime("%Y",$obj->da) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
-				{
-					print '<td width="30" align="center">|</td>';
-				} else {
-					print '<td width="30" align="center">'.strftime("%Y",$obj->da)."</td>\n";
-					$oldyear = strftime("%Y",$obj->da);
-				}
-	
-				if ($oldmonth == strftime("%Y%b",$obj->da) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
-				{
-					print '<td width="30" align="center">|</td>';
-				} else {
-					print '<td width="30" align="center">'.strftime("%b",$obj->da)."</td>\n";
-					$oldmonth = strftime("%Y%b",$obj->da);
-				}
-	
-				print '<td width="20">'.strftime("%d",$obj->da)."</td>\n";
-				print '<td width="30">'.strftime("%H:%M",$obj->da)."</td>\n";
-	
-				// Picto
-				print '<td width="16">&nbsp;</td>';
-	
-				// Espace
-				print '<td width="30">&nbsp;</td>';
-	
-				// Action
-				print '<td>';
-				print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowTask"),"task");
-				$transcode=$langs->trans("Action".$obj->acode);
-				$libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
-				print $libelle;
-				print '</a>';
-				print '</td>';
-	
-				// Objet lie
-				print '<td>';
-				if ($obj->propalrowid)
-				{
-					print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowPropal"),"propal");
-					print $langs->trans("Propal");
-					print '</a>';
-				}
-				if ($obj->fk_facture)
-				{
-					print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->fk_facture.'">'.img_object($langs->trans("ShowBill"),"bill");
-					print $langs->trans("Invoice");
-					print '</a>';
-				}
-				else print '&nbsp;';
-				print '</td>';
-	
-				// Libelle
-				print "<td>$obj->label</td>";
-	
-				// Contact pour cette action
-	      if ($obj->fk_contact > 0)
-	      {
-	      	$contactstatic->name=$obj->name;
-					$contactstatic->firstname=$obj->firstname;
-					$contactstatic->id=$obj->fk_contact;
-	        print '<td>'.$contactstatic->getNomUrl(1).'</td>';
-	      }
-	      else
-	      {
-	      	print '<td>&nbsp;</td>';
-	      }
-	
-				// Auteur
-				print '<td width="80" nowrap="nowrap"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
-				
-				// Statut
-	      print '<td nowrap="nowrap" width="20">'.$actionstatic->LibStatut($obj->percent,3).'</td>';
-	      
-				print "</tr>\n";
-				$i++;
-			}
-			$db->free();
-		}
-		else
-		{
-			dolibarr_print_error($db);
-		}
-	
-	
-		print "</table>";
-    }
+    /*
+     *      Listes des actions effectuees
+     */
+	show_actions_done($conf,$langs,$db,$societe);
 }
 else
 {
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index cc5225c9017..5d33324b14c 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -405,6 +405,7 @@ PartialWoman=Partial
 PartialMan=Partial
 TotalWoman=Total
 TotalMan=Total
+YouCanChangeValuesForThisListFromDictionnarySetup=You can change values for this list from menu setup - dictionnary
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 5fdd6a91699..4e65d7298a8 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -406,6 +406,7 @@ PartialWoman=Partielle
 PartialMan=Partiel
 TotalWoman=Totale
 TotalMan=Total
+YouCanChangeValuesForThisListFromDictionnarySetup=Vous pouvez changer ces valeurs depuis le menu configuration - dictionnaires
 # Week day
 Monday=Lundi
 Tuesday=Mardi
diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php
index bc8c21d5f72..27260082074 100644
--- a/htdocs/lib/company.lib.php
+++ b/htdocs/lib/company.lib.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
+/* Copyright (C) 2006-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2006      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2007      Patrick Raguin <patrick.raguin@gmail.com>
  *
  * 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
@@ -19,7 +19,6 @@
  * or see http://www.gnu.org/
  *
  * $Id$
- * $Source$
  */
 
 /**
@@ -71,7 +70,7 @@ function societe_prepare_head($objsoc)
     $head[$h][2] = 'compta';
     $h++;
   }
-  //affichage onglet catégorie
+  //affichage onglet cat�gorie
 	if ($conf->categorie->enabled)
   {
 		$head[$h][0] = DOL_URL_ROOT.'/categories/categorie.php?socid='.$objsoc->id;
@@ -129,4 +128,245 @@ function societe_prepare_head($objsoc)
   return $head;
 }
 
+function show_actions_todo($conf,$langs,$db,$objsoc)
+{
+    if ($conf->agenda->enabled)
+    {
+	    print_titre($langs->trans("ActionsOnCompany"));
+		
+	    print '<table width="100%" class="noborder">';
+	    print '<tr class="liste_titre">';
+	    print '<td colspan="11"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$objsoc->id.'&amp;status=todo">'.$langs->trans("ActionsToDoShort").'</a></td><td align="right">&nbsp;</td>';
+	    print '</tr>';
+	
+	    $sql = "SELECT a.id, a.label,";
+	    $sql.= " ".$db->pdate("a.datep")." as dp,";
+	    $sql.= " ".$db->pdate("a.datea")." as da,";
+	    $sql.= " a.percent,";
+	    $sql.= " c.code as acode, c.libelle, a.propalrowid, a.fk_user_author, a.fk_contact,";
+		$sql.= " u.login, u.rowid,";
+		$sql.= " sp.name, sp.firstname";
+	    $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
+	    $sql.= " WHERE a.fk_soc = ".$objsoc->id;
+	    $sql.= " AND u.rowid = a.fk_user_author";
+	    $sql.= " AND c.id=a.fk_action AND a.percent < 100";
+	    $sql.= " ORDER BY a.datep DESC, a.id DESC";
+	
+		dolibarr_syslog("company.lib::show_actions_todo sql=".$sql);
+	    $result=$db->query($sql);
+	    if ($result)
+	    {
+	        $i = 0 ;
+	        $num = $db->num_rows($result);
+	        $var=true;
+	        
+	        if ($num)
+	        {
+	            while ($i < $num)
+	            {
+	                $var = !$var;
+	
+	                $obj = $db->fetch_object($result);
+	                print "<tr $bc[$var]>";
+	
+                    print '<td width="30" align="center">'.strftime("%Y",$obj->dp)."</td>\n";
+                    $oldyear = strftime("%Y",$obj->dp);
+	
+                    print '<td width="30" align="center">' .strftime("%b",$obj->dp)."</td>\n";
+                    $oldmonth = strftime("%Y%b",$obj->dp);
+	
+	                print '<td width="20">'.strftime("%d",$obj->dp)."</td>\n";
+	               	print '<td width="30" nowrap="nowrap">'.strftime("%H:%M",$obj->dp).'</td>';
+					
+					// Picto warning
+					print '<td width="16">';
+					if (date("U",$obj->dp) < time()) print ' '.img_warning("Late");
+					else print '&nbsp;';
+					print '</td>';
+	
+	                // Status/Percent
+	                print '<td width="30">&nbsp;</td>';
+	
+	                if ($obj->propalrowid)
+	                {
+	                    print '<td><a href="propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowAction"),"task");
+	                    $transcode=$langs->trans("Action".$obj->acode);
+	                    $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
+	                    print $libelle;
+	                    print '</a></td>';
+	                }
+	                else
+	                {
+			            $actionstatic->code=$obj->acode;
+			            $actionstatic->libelle=$obj->libelle;
+			            $actionstatic->id=$obj->id;
+			            print '<td>'.$actionstatic->getNomUrl(1,16).'</td>';
+	                }
+	                print '<td colspan="2">'.$obj->label.'</td>';
+	
+	                // Contact pour cette action
+	                if ($obj->fk_contact > 0)
+	                {
+	                    $contactstatic->name=$obj->name;
+	                    $contactstatic->firstname=$obj->firstname;
+	                    $contactstatic->id=$obj->fk_contact;
+		                print '<td>'.$contactstatic->getNomUrl(1).'</td>';
+	                }
+	                else
+	                {
+	                    print '<td>&nbsp;</td>';
+	                }
+	
+	                print '<td width="80" nowrap="nowrap">';
+					$userstatic->id=$obj->fk_user_author;
+					$userstatic->login=$obj->login;
+					print $userstatic->getLoginUrl(1);
+					print '</td>';
+	
+					// Statut
+	                print '<td nowrap="nowrap" width="20">'.$actionstatic->LibStatut($obj->percent,3).'</td>';
+	
+	                print "</tr>\n";
+	                $i++;
+	            }
+			}
+			else
+			{
+				// Aucun action a faire
+					
+			}
+	        $db->free($result);
+	    }
+	    else
+	    {
+	        dolibarr_print_error($db);
+	    }
+	    print "</table>";
+	
+	    print "<br>";
+    }
+}
+
+function show_actions_done($conf,$langs,$db,$objsoc)
+{
+	if ($conf->agenda->enabled)
+    {
+	    print '<table class="noborder" width="100%">';
+	    print '<tr class="liste_titre">';
+	    print '<td colspan="12"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$objsoc->id.'&amp;status=done">'.$langs->trans("ActionsDoneShort").'</a></td>';
+	    print '</tr>';
+	
+	    $sql = "SELECT a.id, a.label,";
+	    $sql.= " ".$db->pdate("a.datep")." as dp,";
+	    $sql.= " ".$db->pdate("a.datea")." as da,";
+	    $sql.= " a.percent,";
+	    $sql.= " a.propalrowid, a.fk_facture, a.fk_user_author, a.fk_contact,";
+	    $sql.= " c.code as acode, c.libelle,";
+	    $sql.= " u.login, u.rowid,";
+	    $sql.= " sp.name, sp.firstname";
+	    $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
+	    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
+	    $sql.= " WHERE a.fk_soc = ".$objsoc->id;
+	    $sql.= " AND u.rowid = a.fk_user_author";
+	    $sql.= " AND c.id=a.fk_action AND a.percent = 100";
+	    $sql.= " ORDER BY a.datea DESC, a.id DESC";
+	
+		dolibarr_syslog("comm/fiche.php sql=".$sql);
+	    $result=$db->query($sql);
+	    if ($result)
+	    {
+	        $i = 0 ;
+	        $num = $db->num_rows($result);
+	        $oldyear='';
+	        $oldmonth='';
+	        $var=true;
+	
+	        while ($i < $num)
+	        {
+	            $var = !$var;
+	
+	            $obj = $db->fetch_object($result);
+	            print "<tr $bc[$var]>";
+	
+	            // Champ date
+                print '<td width="30" align="center">'.strftime("%Y",$obj->da)."</td>\n";
+                $oldyear = strftime("%Y",$obj->da);
+                print '<td width="30" align="center">'.strftime("%b",$obj->da)."</td>\n";
+                $oldmonth = strftime("%Y%b",$obj->da);
+	            print '<td width="20">'.strftime("%d",$obj->da)."</td>\n";
+	            print '<td width="30">'.strftime("%H:%M",$obj->da)."</td>\n";
+	
+				// Picto
+	            print '<td width="16">&nbsp;</td>';
+	
+	            // Espace
+	            print '<td width="30">&nbsp;</td>';
+	
+				// Action
+	    		print '<td>';
+	            $actionstatic->code=$obj->acode;
+	            $actionstatic->libelle=$obj->libelle;
+	            $actionstatic->id=$obj->id;
+	            print $actionstatic->getNomUrl(1,16);
+				print '</td>';
+	
+	    		// Objet lie
+	    		print '<td>';
+				if ($obj->propalrowid)
+				{
+					print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowPropal"),"propal");
+					print $langs->trans("Propal");
+					print '</a>';
+				}
+				if ($obj->fk_facture)
+				{
+					$facturestatic->ref=$langs->trans("Invoice");
+					$facturestatic->id=$obj->fk_facture;
+					$facturestatic->type=$obj->type;
+					print $facturestatic->getNomUrl(1,'compta');
+				}
+				else print '&nbsp;';
+	    		print '</td>';
+	
+				// Libelle
+	      print '<td>'.$obj->label.'</td>';
+	
+	            // Contact pour cette action
+	            if ($obj->fk_contact > 0)
+	            {
+					$contactstatic->name=$obj->name;
+					$contactstatic->firstname=$obj->firstname;
+					$contactstatic->id=$obj->fk_contact;
+	                print '<td>'.$contactstatic->getNomUrl(1).'</td>';
+	            }
+	            else
+	            {
+	                print '<td>&nbsp;</td>';
+	            }
+	
+				// Auteur
+	            print '<td nowrap="nowrap" width="80">';
+				$userstatic->id=$obj->rowid;
+				$userstatic->login=$obj->login;
+				print $userstatic->getLoginUrl(1);
+				print '</td>';
+	
+				// Statut
+	      print '<td nowrap="nowrap" width="20">'.$actionstatic->LibStatut($obj->percent,3).'</td>';
+				
+	            print "</tr>\n";
+	            $i++;
+	        }
+	
+	        $db->free($result);
+	    }
+	    else
+	    {
+	        dolibarr_print_error($db);
+	    }
+	 
+	    print "</table><br>";
+    }
+}
 ?>