diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index e412f64061f777bfec1c1e4a585bf1a9faac00b7..993ada95a4eb549d0f3e8a96eb5e50758d0c7760 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  *
@@ -19,11 +19,11 @@
  */
 
 /**
-	    \file       htdocs/admin/confexped.php
-		\ingroup    produit
-		\brief      Page d'administration/configuration du module Expedition
-		\version    $Id$
-*/
+ *	    \file       htdocs/admin/confexped.php
+ *		\ingroup    produit
+ *		\brief      Page to setup sending module
+ *		\version    $Id$
+ */
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
@@ -112,28 +112,22 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Feature").'</td>';
 print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="center" width="100">'.$langs->trans("Action").'</td>';
+print '<td align="center" width="100">'.$langs->trans("Status").'</td>';
 print "</tr>\n";
 print "<input type=\"hidden\" name=\"action\" value=\"sending\">";
 print "<tr ".$bc[$var].">";
 print '<td>'.$langs->trans("SendingsAbility").'</td>';
 print '<td align="center" width="20">';
-
-if($conf->global->MAIN_SUBMODULE_EXPEDITION == 1)
-{
-	print img_tick();
-}
-
 print '</td>';
 print '<td align="center" width="100">';
 
 if($conf->global->MAIN_SUBMODULE_EXPEDITION == 0)
 {
-	print '<a href="confexped.php?action=activate_sending">'.$langs->trans("Activate").'</a>';
+	print '<a href="confexped.php?action=activate_sending">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 }
 else if($conf->global->MAIN_SUBMODULE_EXPEDITION == 1)
 {
-	print '<a href="confexped.php?action=disable_sending">'.$langs->trans("Disable").'</a>';
+	print '<a href="confexped.php?action=disable_sending">'.img_picto($langs->trans("Enabled"),'on').'</a>';
 }
 
 print "</td>";
@@ -150,22 +144,16 @@ print "<input type=\"hidden\" name=\"action\" value=\"delivery\">";
 print "<tr ".$bc[$var].">";
 print '<td>'.$langs->trans("DeliveriesOrderAbility").'</td>';
 print '<td align="center" width="20">';
-
-if($conf->global->MAIN_SUBMODULE_LIVRAISON == 1)
-{
-	print img_tick();
-}
-
 print '</td>';
 print '<td align="center" width="100">';
 
 if($conf->global->MAIN_SUBMODULE_LIVRAISON == 0)
 {
-	print '<a href="confexped.php?action=activate_delivery">'.$langs->trans("Activate").'</a>';
+	print '<a href="confexped.php?action=activate_delivery">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 }
 else if($conf->global->MAIN_SUBMODULE_LIVRAISON == 1)
 {
-	print '<a href="confexped.php?action=disable_delivery">'.$langs->trans("Disable").'</a>';
+	print '<a href="confexped.php?action=disable_delivery">'.img_picto($langs->trans("Enabled"),'on').'</a>';
 }
 
 print "</td>";
diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php
index ea8d19efc9aeeb6b8c7d4c470a9b276547c73eb7..beeb541ee1f9ac5f8a03e311c3b7f335beff7a3a 100644
--- a/htdocs/admin/dons.php
+++ b/htdocs/admin/dons.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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
@@ -122,7 +122,7 @@ if ($_GET["action"] == 'del')
 
 
 /*
- * Affiche page
+ * View
  */
 
 $dir = "../includes/modules/dons/";
@@ -207,20 +207,20 @@ while (($file = readdir($handle))!==false)
 		        print "<td align=\"center\">\n";
 				if ($conf->global->DON_ADDON_MODEL == $name)
 		        {
-		            print img_tick($langs->trans("Enabled"));
+		            print img_picto($langs->trans("Enabled"),'on');
 		        }
 		        else
 		        {
 		            print '&nbsp;';
 		            print '</td><td align="center">';
-		            print '<a href="dons.php?action=setdoc&value='.$name.'">'.$langs->trans("Activate").'</a>';
+		            print '<a href="dons.php?action=setdoc&value='.$name.'">'.img_picto($langs->trans("Enabled"),'on').'</a>';
 		        }
 		        print '</td>';
 			}
 			else
 			{
 				print "<td align=\"center\">\n";
-				print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.$langs->trans("Activate").'</a>';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 				print "</td>";
 			}
 
@@ -228,11 +228,11 @@ while (($file = readdir($handle))!==false)
 			print "<td align=\"center\">";
 			if ($conf->global->DON_ADDON_MODEL == "$name")
 			{
-				print img_tick($langs->trans("Default"));
+				print img_picto($langs->trans("Default"),'on');
 			}
 			else
 			{
-				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'" alt="'.$langs->trans("Default").'">'.$langs->trans("Default").'</a>';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 			}
 			print '</td>';
 
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 85d76777e2cbbdc7c2c9e3c360aa1036b7ab22d5..bb9e0175756e605395a0b0a51d66d174a3f7ab62 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2008 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
@@ -22,10 +22,10 @@
  */
 
 /**
- \file       htdocs/admin/expedition.php
- \ingroup    expedition
- \brief      Page d'administration/configuration du module Expedition
- \version    $Id$
+ *	\file       htdocs/admin/expedition.php
+ *	\ingroup    expedition
+ *	\brief      Page d'administration/configuration du module Expedition
+ *	\version    $Id$
  */
 
 require("./pre.inc.php");
@@ -97,7 +97,7 @@ if ($_GET["action"] == 'del')
 	$sql.= " WHERE nom = '".$_GET["value"]."'";
 	$sql.= " AND type = '".$type."'";
 	$sql.= " AND entity = ".$conf->entity;
-	
+
 	if ($db->query($sql))
 	{
 
@@ -146,7 +146,7 @@ if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod')
 
 	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."expedition_methode";
 	$sql.= " WHERE rowid = ".$moduleid;
-	
+
 	$resql = $db->query($sql);
 	if ($resql && ($statut == 1 || $_GET["action"] == 'setmod'))
 	{
@@ -155,7 +155,7 @@ if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod')
 		$sqlu = "UPDATE ".MAIN_DB_PREFIX."expedition_methode";
 		$sqlu.= " SET statut=1";
 		$sqlu.= " WHERE rowid=".$moduleid;
-		
+
 		$result=$db->query($sqlu);
 		if ($result)
 		{
@@ -288,7 +288,7 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td width="140">'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Activated").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
 print '<td align="center" width="32" colspan="2">'.$langs->trans("Infos").'</td>';
 print "</tr>\n";
@@ -319,26 +319,26 @@ if(is_dir($dir))
 			print $module->description;
 			print '</td>';
 
-			// Activ
+			// Active
 			if (in_array($name, $def))
 			{
 				print "<td align=\"center\">\n";
 				if ($conf->global->EXPEDITION_ADDON_PDF != $name)
 				{
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'">';
-					print img_tick($langs->trans("Disable"));
+					print img_picto($langs->trans("Activated"),'on');
 					print '</a>';
 				}
 				else
 				{
-					print img_tick($langs->trans("Activated"));
+					print img_picto($langs->trans("Activated"),'on');
 				}
 				print "</td>";
 			}
 			else
 			{
 				print "<td align=\"center\">\n";
-				print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.$langs->trans("Activate").'</a>';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 				print "</td>";
 			}
 
@@ -346,11 +346,11 @@ if(is_dir($dir))
 			print "<td align=\"center\">";
 			if ($conf->global->EXPEDITION_ADDON_PDF == $name)
 			{
-				print img_tick($langs->trans("Default"));
+				print img_picto($langs->trans("Default"),'on');
 			}
 			else
 			{
-				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'" alt="'.$langs->trans("Default").'">'.$langs->trans("Default").'</a>';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 			}
 			print '</td>';
 
@@ -378,10 +378,6 @@ else
 }
 print '</table>';
 
-/*
- *
- *
- */
 
 $db->close();
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 5c35cadb9ff028c953bdd91f4e16e4d1fab9108a..ff7fee2ba5c7b83f0df09e87e2c9e3aa352ab990 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -23,7 +23,7 @@
 /**
  *      \file       htdocs/admin/facture.php
  *		\ingroup    facture
- *		\brief      Page d'administration/configuration du module Facture
+ *		\brief      Page to setup invoice module
  *		\version    $Id$
  */
 
@@ -223,7 +223,7 @@ print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td nowrap>'.$langs->trans("Example").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
 print '<td align="center" width="16">'.$langs->trans("Infos").'</td>';
 print '</tr>'."\n";
 
@@ -273,11 +273,11 @@ foreach ($conf->file->dol_document_root as $dirroot)
 							print '<td align="center">';
 							if ($conf->global->FACTURE_ADDON == "$file")
 							{
-								print img_tick($langs->trans("Activated"));
+								print img_picto($langs->trans("Activated"),'on');
 							}
 							else
 							{
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.$langs->trans("Default").'</a>';
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 							}
 							print '</td>';
 
@@ -367,7 +367,7 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Activated").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
 print '<td align="center" width="32" colspan="2">'.$langs->trans("Infos").'</td>';
 print "</tr>\n";
@@ -409,19 +409,19 @@ foreach ($conf->file->dol_document_root as $dirroot)
 						if ($conf->global->FACTURE_ADDON_PDF != "$name")
 						{
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'">';
-							print img_tick($langs->trans("Disable"));
+							print img_picto($langs->trans("Enabled"),'on');
 							print '</a>';
 						}
 						else
 						{
-							print img_tick($langs->trans("Enabled"));
+							print img_picto($langs->trans("Enabled"),'on');
 						}
 						print "</td>";
 					}
 					else
 					{
 						print "<td align=\"center\">\n";
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.$langs->trans("Activate").'</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 						print "</td>";
 					}
 
@@ -429,11 +429,11 @@ foreach ($conf->file->dol_document_root as $dirroot)
 					print "<td align=\"center\">";
 					if ($conf->global->FACTURE_ADDON_PDF == "$name")
 					{
-						print img_tick($langs->trans("Default"));
+						print img_picto($langs->trans("Default"),'on');
 					}
 					else
 					{
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'" alt="'.$langs->trans("Default").'">'.$langs->trans("Default").'</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 					}
 					print '</td>';
 
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 16ca35f45b4b0494f1a57bf23ea0013817957bd5..75b4893202aea5b9d8a59de0095a99c0bc358915 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2004 Rodolphe Quiedeville         <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur          <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2010 Laurent Destailleur          <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Sebastien Di Cintio          <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier               <benoit.mortier@opensides.be>
  * Copyright (C) 2005-2009 Regis Houssin                <regis@dolibarr.fr>
@@ -190,7 +190,7 @@ print '<tr class="liste_titre">';
 print '<td width="100">'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td>'.$langs->trans("Example").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Activated").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
 print '<td align="center" width="16">'.$langs->trans("Infos").'</td>';
 print "</tr>\n";
 
@@ -229,11 +229,11 @@ if ($handle)
 				print '<td align="center">';
 				if ($conf->global->FICHEINTER_ADDON == $className)
 				{
-					print img_tick($langs->trans("Activated"));
+					print img_picto($langs->trans("Activated"),'on');
 				}
 				else
 				{
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$className.'" alt="'.$langs->trans("Default").'">'.$langs->trans("Default").'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$className.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 				}
 				print '</td>';
 
@@ -294,7 +294,7 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Activated")."</td>\n";
+print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
 print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
 print '<td align="center" width="32" colspan="2">'.$langs->trans("Infos").'</td>';
 print "</tr>\n";
@@ -328,19 +328,19 @@ while (($file = readdir($handle))!==false)
 			if ($conf->global->FICHEINTER_ADDON_PDF != "$name")
 			{
 				print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'">';
-				print img_tick($langs->trans("Disable"));
+				print img_picto($langs->trans("Enabled"),'on');
 				print '</a>';
 			}
 			else
 			{
-				print img_tick($langs->trans("Enabled"));
+				print img_picto($langs->trans("Enabled"),'on');
 			}
 			print "</td>";
 		}
 		else
 		{
 			print "<td align=\"center\">\n";
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.$langs->trans("Activate").'</a>';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 			print "</td>";
 		}
 
@@ -348,11 +348,11 @@ while (($file = readdir($handle))!==false)
 		print "<td align=\"center\">";
 		if ($conf->global->FICHEINTER_ADDON_PDF == "$name")
 		{
-			print img_tick($langs->trans("Default"));
+			print img_picto($langs->trans("Default"),'on');
 		}
 		else
 		{
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'" alt="'.$langs->trans("Default").'">'.$langs->trans("Default").'</a>';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 		}
 		print '</td>';
 
diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php
index 90d20ab55ab2e057cf772f10e13078c10b015e1e..57177875ce7b6d901da086ddcc3c827fe5765661 100644
--- a/htdocs/admin/fournisseur.php
+++ b/htdocs/admin/fournisseur.php
@@ -71,8 +71,8 @@ if ($_GET["action"] == 'specimen')
 
 		if ($obj->write_file($commande,$langs) > 0)
 		{
-	 	 	header("Location: ".DOL_URL_ROOT."/document.php?modulepart=commande_fournisseur&file=SPECIMEN.pdf");
-	  		return;
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=commande_fournisseur&file=SPECIMEN.pdf");
+			return;
 		}
 		else
 		{
@@ -177,7 +177,7 @@ print '<tr class="liste_titre">';
 print '<td width="100">'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td>'.$langs->trans("Example").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Activated").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
 print '<td align="center" width="16">'.$langs->trans("Info").'</td>';
 print "</tr>\n";
 
@@ -215,11 +215,11 @@ if ($handle)
 				print '<td align="center">';
 				if ($conf->global->COMMANDE_SUPPLIER_ADDON == "$file")
 				{
-					print img_tick($langs->trans("Activated"));
+					print img_picto($langs->trans("Activated"),'on');
 				}
 				else
 				{
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.$langs->trans("Activate").'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 				}
 				print '</td>';
 
@@ -296,7 +296,7 @@ print "<table class=\"noborder\" width=\"100%\">\n";
 print "<tr class=\"liste_titre\">\n";
 print '  <td width="100">'.$langs->trans("Name")."</td>\n";
 print "  <td>".$langs->trans("Description")."</td>\n";
-print '<td align="center" width="60">'.$langs->trans("Activated")."</td>\n";
+print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
 print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
 print '<td align="center" width="32" colspan="2">'.$langs->trans("Info").'</td>';
 print "</tr>\n";
@@ -324,35 +324,35 @@ while (($file = readdir($handle))!==false)
 		// Active
 		if (in_array($name, $def))
 		{
-	  print "<td align=\"center\">\n";
-	  if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF != "$name")
-	  {
-	  	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'">';
-	  	print img_tick($langs->trans("Disable"));
-	  	print '</a>';
-	  }
-	  else
-	  {
-	  	print img_tick($langs->trans("Enabled"));
-	  }
+			print "<td align=\"center\">\n";
+			if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF != "$name")
+			{
+				print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'">';
+				print img_picto($langs->trans("Enabled"),'on');
+				print '</a>';
+			}
+			else
+			{
+				print img_picto($langs->trans("Enabled"),'on');
+			}
 			print "</td>";
 		}
 		else
 		{
-	  print "<td align=\"center\">\n";
-	  print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.$langs->trans("Activate").'</a>';
-	  print "</td>";
+			print "<td align=\"center\">\n";
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.$langs->trans("Activate").'</a>';
+			print "</td>";
 		}
 
 		// Defaut
 		print "<td align=\"center\">";
 		if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF == "$name")
 		{
-	  print img_tick($langs->trans("Default"));
+	  		print img_picto($langs->trans("Default"),'on');
 		}
 		else
 		{
-	  print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'" alt="'.$langs->trans("Default").'">'.$langs->trans("Default").'</a>';
+	  		print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'on').'</a>';
 		}
 		print '</td>';
 
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 7b948124ab5be0f78daa44fea4997501570f6524..cf6ccb6eaec93ab4105f0d31bd18a7f46091df9f 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
@@ -22,11 +22,11 @@
  */
 
 /**
-        \file       htdocs/admin/livraison.php
-        \ingroup    livraison
-        \brief      Page d'administration/configuration du module Livraison
-        \version    $Id$
-*/
+ *      \file       htdocs/admin/livraison.php
+ *      \ingroup    livraison
+ *      \brief      Page d'administration/configuration du module Livraison
+ *      \version    $Id$
+ */
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/livraison/livraison.class.php");
@@ -197,7 +197,7 @@ print '<tr class="liste_titre">';
 print '<td width="100">'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td nowrap>'.$langs->trans("Example").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Activated").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
 print '<td align="center" width="16">'.$langs->trans("Infos").'</td>';
 print '</tr>'."\n";
 
@@ -236,11 +236,11 @@ if ($handle)
 				print '<td align="center">';
 				if ($conf->global->LIVRAISON_ADDON == "$file")
 				{
-					print img_tick($langs->trans("Activated"));
+					print img_picto($langs->trans("Activated"),'on');
 				}
 				else
 				{
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.$langs->trans("Default").'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 				}
 				print '</td>';
 
@@ -314,7 +314,7 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td width="140">'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Action").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
 print '<td align="center" width="32" colspan="2">'.$langs->trans("Infos").'</td>';
 print "</tr>\n";
@@ -352,19 +352,19 @@ if(is_dir($dir))
 				if ($conf->global->LIVRAISON_ADDON_PDF != "$name")
 				{
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'">';
-					print img_tick($langs->trans("Disable"));
+					print img_picto($langs->trans("Enabled"),'on');
 					print '</a>';
 				}
 				else
 				{
-					print img_tick($langs->trans("Enabled"));
+					print img_picto($langs->trans("Enabled"),'on');
 				}
 				print "</td>";
 			}
 			else
 			{
 				print "<td align=\"center\">\n";
-				print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.$langs->trans("Activate").'</a>';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 				print "</td>";
 			}
 
@@ -372,11 +372,11 @@ if(is_dir($dir))
 			print "<td align=\"center\">";
 			if ($conf->global->LIVRAISON_ADDON_PDF == "$name")
 			{
-				print img_tick($langs->trans("Default"));
+				print img_picto($langs->trans("Default"),'on');
 			}
 			else
 			{
-				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'" alt="'.$langs->trans("Default").'">'.$langs->trans("Default").'</a>';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 			}
 			print '</td>';
 
diff --git a/htdocs/admin/project.php b/htdocs/admin/project.php
index 71f6a50e42084507717e6260be16586dc4b96c43..f5d01956de9babfcf2826544e0eda100da16c1eb 100644
--- a/htdocs/admin/project.php
+++ b/htdocs/admin/project.php
@@ -204,11 +204,11 @@ if ($handle)
 				print '<td align="center">';
 				if ($conf->global->PROJECT_ADDON == "$file")
 				{
-					print img_tick($langs->trans("Activated"));
+					print img_picto($langs->trans("Activated"),'on');
 				}
 				else
 				{
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.$langs->trans("Activate").'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 				}
 				print '</td>';
 
@@ -316,19 +316,19 @@ while (($file = readdir($handle))!==false)
 			if ($conf->global->PROJECT_ADDON_PDF != "$name")
 			{
 				print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'">';
-				print img_tick($langs->trans("Disable"));
+				print img_picto($langs->trans("Enabled"),'on');
 				print '</a>';
 			}
 			else
 			{
-				print img_tick($langs->trans("Enabled"));
+				print img_picto($langs->trans("Enabled"),'on');
 			}
 			print "</td>";
 		}
 		else
 		{
 			print "<td align=\"center\">\n";
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.$langs->trans("Activate").'</a>';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 			print "</td>";
 		}
 
@@ -336,11 +336,11 @@ while (($file = readdir($handle))!==false)
 		print "<td align=\"center\">";
 		if ($conf->global->PROJECT_ADDON_PDF == "$name")
 		{
-			print img_tick($langs->trans("Default"));
+			print img_picto($langs->trans("Default"),'on');
 		}
 		else
 		{
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'" alt="'.$langs->trans("Default").'">'.$langs->trans("Default").'</a>';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 		}
 		print '</td>';
 
diff --git a/htdocs/admin/societe.php b/htdocs/admin/societe.php
index 0338168d41b7cb66bdc8a7d5e1130ca52bbfdcad..d957c22d218cb81f2abbdf5ff45fb4afb8dc22b5 100644
--- a/htdocs/admin/societe.php
+++ b/htdocs/admin/societe.php
@@ -78,10 +78,11 @@ if ($_POST["action"] == 'usesearchtoselectcompany')
 }
 
 // define constants for tigre model
-if ($_POST["action"] == 'updateMask')
+if ($_POST["action"] == 'setModuleOptions')
 {
-	dolibarr_set_const($db, "COMPANY_ELEPHANT_MASK_CUSTOMER",$_POST["maskcustomer"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "COMPANY_ELEPHANT_MASK_SUPPLIER",$_POST["masksupplier"],'chaine',0,'',$conf->entity);
+	$param=$_POST["param1"];
+	$value=$_POST["value1"];
+	dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
 }
 
 if ($_GET["action"] == 'set')
@@ -345,19 +346,19 @@ foreach ($conf->file->dol_document_root as $dirroot)
 						if ($conf->global->COMPANY_ADDON_PDF != "$name")
 						{
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'">';
-							print img_tick($langs->trans("Disable"));
+							print img_picto($langs->trans("Enabled"),'on');
 							print '</a>';
 						}
 						else
 						{
-							print img_tick($langs->trans("Enabled"));
+							print img_picto($langs->trans("Enabled"),'on');
 						}
 						print "</td>";
 					}
 					else
 					{
 						print "<td align=\"center\">\n";
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.$langs->trans("Activate").'</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 						print "</td>";
 					}
 
@@ -365,11 +366,11 @@ foreach ($conf->file->dol_document_root as $dirroot)
 					print "<td align=\"center\">";
 					if ($conf->global->COMPANY_ADDON_PDF == "$name")
 					{
-						print img_tick($langs->trans("Default"));
+						print img_picto($langs->trans("Default"),'on');
 					}
 					else
 					{
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'" alt="'.$langs->trans("Default").'">'.$langs->trans("Default").'</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 					}
 					print '</td>';
 
@@ -392,7 +393,10 @@ foreach ($conf->file->dol_document_root as $dirroot)
 					{
 						print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
 					}
-					else print '&nbsp;';
+					else
+					{
+						print '<a href="#">'.img_object($langs->trans("PreviewNotAvailable"),'generic').'</a>';
+					}
 					print '</td>';
 
 					print "</tr>\n";
@@ -406,6 +410,8 @@ print '</table>';
 
 print '<br>';
 
+print_titre($langs->trans("Other"));
+
 // Autres options
 $html=new Form($db);
 $var=true;
diff --git a/htdocs/ecm/docdir.php b/htdocs/ecm/docdir.php
index 3b220db45eac91c13e666fa98e58e36dc2eee2f5..d29063c4b826c020ea7e48f9a14ce4101b8d51b0 100644
--- a/htdocs/ecm/docdir.php
+++ b/htdocs/ecm/docdir.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2008-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2008      Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -157,7 +157,7 @@ if ($_GET["action"] == 'create')
 	print '<table class="border" width="100%">';
 
 	// Label
-	print '<tr><td>'.$langs->trans("Label").'</td><td><input name="label" size="40" maxlength="32" value="'.$ecmdir->label.'"></td></tr>'."\n";
+	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" size="40" maxlength="32" value="'.$ecmdir->label.'"></td></tr>'."\n";
 
 	print '<tr><td>'.$langs->trans ("AddIn").'</td><td>';
 	print $formecm->select_all_sections(! empty($_GET["catParent"])?$_GET["catParent"]:$ecmdir->fk_parent,'catParent');
@@ -170,13 +170,15 @@ if ($_GET["action"] == 'create')
 	print '</textarea>';
 	print '</td></tr>'."\n";
 
-	print '<tr><td colspan="3" align="center">';
+	print '</td></tr>'."\n";
+
+	print '</table><br>';
+
+	print '<center>';
 	print '<input type="submit" class="button" name="create" value="'.$langs->trans("Create").'">';
 	print ' &nbsp; &nbsp; ';
 	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</td></tr>'."\n";
-
-	print '</table>';
+	print '</center>';
 	print '</form>';
 }
 
diff --git a/htdocs/includes/modules/societe/doc/odt_generic.modules.php b/htdocs/includes/modules/societe/doc/odt_generic.modules.php
index 6cf68db92cfbf8ddce0171d1466539888b20c2ae..69b1225c45182722e967683b1c8f1b24c08dc9ef 100644
--- a/htdocs/includes/modules/societe/doc/odt_generic.modules.php
+++ b/htdocs/includes/modules/societe/doc/odt_generic.modules.php
@@ -50,7 +50,7 @@ class odt_generic extends ModeleDocProjects
 		$langs->load("companies");
 
 		$this->db = $db;
-		$this->name = "Generic";
+		$this->name = "Generic ODT";
 		$this->description = $langs->trans("DocumentModelOdt");
 
 		// Dimension page pour format A4
@@ -66,8 +66,6 @@ class odt_generic extends ModeleDocProjects
 		// Recupere emmetteur
 		$this->emetteur=$mysoc;
 		if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2);    // Par defaut, si n'�tait pas d�fini
-
-		$this->params=array('COMPANY_ADDON_PDF_ODT'=>array('type'=>'TEXTAREA','default'=>''));
 	}
 
 	/**		\brief      Renvoi la description du module
@@ -78,25 +76,41 @@ class odt_generic extends ModeleDocProjects
 		global $conf,$langs;
 
 		$langs->load("companies");
+		$langs->load("errors");
 
 		$form = new Form($db);
 
-		$texte = $this->description."<br>\n";
+		$texte = $this->description.".<br>\n";
 		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateModule">';
+		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte.= '<input type="hidden" name="param1" value="COMPANY_ADDON_PDF_ODTPATH">';
 		$texte.= '<table class="nobordernopadding" width="100%">';
 
 		// List of directories area
-		$texte.= '<tr><td>'.$langs->trans("ListOfDirectories").':<br>';
-		$texte.= '<textarea class="flat" cols="80" name="COMPANY_ADDON_PDF_ODTPATH">';
+		$texte.= '<tr><td>'.$langs->trans("ListOfDirectoriesForModelGenODT").' : ';
+
+		$listofdir=explode(',',preg_replace('/\r\n/',',',$conf->global->COMPANY_ADDON_PDF_ODTPATH));
+		foreach($listofdir as $tmpdir)
+		{
+			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+			if (! is_dir($tmpdir)) $texte.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+		}
+		//var_dump($listofdir);
+
+		$texte.= '<br>';
+
+		$texte.= '<textarea class="flat" cols="80" name="value1">';
 		$texte.=$conf->global->COMPANY_ADDON_PDF_ODTPATH;
-		$texte.= '</textarea>';
+		$texte.= '</textarea></td><td valign="top" rowspan="2">';
+		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte.= '</td>';
 		$texte.= '</tr>';
 
 		// Example
-		$texte.= '<tr><td>'.$langs->trans("ExampleOfDirectories").':';
-		$texte.= '</br>';
+		$texte.= '<tr><td align="center">';
+		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte.= '</td>';
 		$texte.= '</tr>';
 
 		$texte.= '</table>';
diff --git a/htdocs/includes/modules/societe/mod_codecompta_panicum.php b/htdocs/includes/modules/societe/mod_codecompta_panicum.php
index 3f4e6b25274e9ff68ad71c78ff821c7cbff286b7..200ee13754afc2fc84181b04483c3f63067548dd 100644
--- a/htdocs/includes/modules/societe/mod_codecompta_panicum.php
+++ b/htdocs/includes/modules/societe/mod_codecompta_panicum.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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,20 +19,18 @@
  */
 
 /**
-        \file       htdocs/includes/modules/societe/mod_codecompta_panicum.class.php
-        \ingroup    societe
-        \brief      Fichier de la classe des gestion panicum des codes compta des societes clientes
-        \version    $Id$
-*/
-
+ *      \file       htdocs/includes/modules/societe/mod_codecompta_panicum.class.php
+ *      \ingroup    societe
+ *      \brief      Fichier de la classe des gestion panicum des codes compta des societes clientes
+ *      \version    $Id$
+ */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
 
 
 /**
-        \class 		mod_codecompta_panicum
-        \brief 		Classe permettant la gestion panicum des codes compta des societes clients
-*/
-
+ *      \class 		mod_codecompta_panicum
+ *      \brief 		Classe permettant la gestion panicum des codes compta des societes clients
+ */
 class mod_codecompta_panicum extends ModeleAccountancyCode
 {
 	var $nom;
@@ -49,17 +47,25 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
 		return $langs->trans("ModuleCompanyCode".$this->nom);
 	}
 
-  /**
-   *    \brief      Renvoi code
-   *    \param      DB              Handler d'acc�s base
-   *    \param      societe         Objet societe
-   */
-  function get_code($DB, $societe)
-  {
-    // Renvoie toujours ok
-    $this->code = $societe->code_compta;
-    return 0;
-  }
+	/**
+	 *    \brief      Return example
+	 */
+	function getExample()
+	{
+		return '';
+	}
+
+	/**
+	 *    \brief      Renvoi code
+	 *    \param      DB              Handler d'acc�s base
+	 *    \param      societe         Objet societe
+	 */
+	function get_code($DB, $societe)
+	{
+		// Renvoie toujours ok
+		$this->code = $societe->code_compta;
+		return 0;
+	}
 }
 
 ?>
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 6ef05a42e3e860ba13206998aaf7aeb194ed982f..b92edf092a2f83d9bd6cbee994bb773df984ed3e 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -52,6 +52,7 @@ JavascriptDisabled=JavaScript disabled
 UsePopupCalendar=Use popup for dates input
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=PHP server TimeZone
 Space=Space
@@ -265,6 +266,8 @@ ConfirmPurge=Are you sure you want to execute this purge ?<br>This will delete d
 MinLength=Minimum length
 LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
 ExamplesWithCurrentSetup=Examples with current running setup
+ListOfDirectoriesForModelGenODT=List of directories contenaining models files with OpenDocument format
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 
 # Modules
 Module0Name=Users & groups
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 93ad98689145303dcde9b5f1076bb2fd82d4c869..2dd867ad3cca5b066cbad2406f2089cf632e3ca6 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -37,6 +37,7 @@ ErrorFeatureNeedJavascript=This feature need javascript to be activated to work.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
 ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 6441318e1173df37c92d8fb8f5b7ce371bd9a15d..8281394a6ae951ddde46715dd1d4b4fef6ca6cab 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -52,6 +52,7 @@ JavascriptDisabled = Javascript désactivé
 UsePopupCalendar = Utiliser les popups pour la saisie des dates
 UsePreviewTabs = Afficher les onglets "Aperçu"
 ShowPreview = Afficher aperçu
+PreviewNotAvailable=Aperçu non disponible
 ThemeCurrentlyActive = Theme actuellement actif
 CurrentTimeZone = Time Zone serveur PHP
 Space = Espace
@@ -265,6 +266,8 @@ ConfirmPurge=Etes vous sur de vouloir réaliser cette purge ?<br>Ceci effacera d
 MinLength=Longueur minimale
 LanguageFilesCachedIntoShmopSharedMemory=Fichiers .lang en mémoire partagée
 ExamplesWithCurrentSetup=Exemples avec le paramétrage actif courant
+ListOfDirectoriesForModelGenODT=Liste des répertoires contenant des documents modèles OpenDocument
+ExampleOfDirectoriesForModelGen=Exemples de syntaxe:<br>c:\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 
 # Modules = undefined
 Module0Name = Utilisateurs & groupes
@@ -780,7 +783,7 @@ ModuleCompanyCodeDigitaria = Renvoie un code compta composé suivant le code tie
 UseNotifications = Utiliser les notifications
 NotificationsDesc = La fonction des notifications par emails permet d'envoyer automatiquement un email, pour certains évênement Dolibarr, aux tiers (sociétés clients, prospects ou fournisseurs) configurés pour. Le choix des notifications et contacts destinataires se fait tiers par tiers.
 ModelModules=Modèle de documents
-DocumentModelOdt=Genérateur depuis des modèles au format .ODT (OpenOffice...)
+DocumentModelOdt=Genération depuis des modèles au format .ODT (OpenOffice...)
 WatermarkOnDraft=Filigrame sur les documents brouillons
 ##### Webcal setup ##### = undefined
 WebCalSetup = Configuration du lien vers le calendrier Webcalendar
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 75f5e9c380845f72adda9e1e0d860d8bd649c260..16b93c9d1c27311e994c2e18d00f16985699f191 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -38,6 +38,7 @@ ErrorFeatureNeedJavascript=Cette fonctionnalité a besoin de javascript activé
 ErrorTopMenuMustHaveAParentWithId0=Un menu de type 'Top' ne peut avoir de menu père. Mettre 0 dans l'id père ou choisir un menu de type 'Left'.
 ErrorLeftMenuMustHaveAParentId=Un menu de type 'Left' doit avoir un id de père.
 ErrorFileNotFound=Fichier <b>%s</b> introuvable (Mauvais chemin, permissions incorrectes ou accès interdit par le paramètre PHP openbasedir ou safe_mode) 
+ErrorDirNotFound=Répertoire <b>%s</b> introuvable (Mauvais chemin, permissions incorrectes ou accès interdit par le paramètre PHP openbasedir ou safe_mode) 
 ErrorFunctionNotAvailableInPHP=La fonction <b>%s</b> est requise pour cette fonctionnalité mais n'est pas disponible dans cette version/installation de PHP.
 ErrorDirAlreadyExists=Un répertoire portant ce nom existe déjà.
 ErrorFieldCanNotContainSpecialCharacters=Le champ <b>%s</b> ne peut contenir de caractères spéciaux.
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index aa56dc4b16c242decd1ef033e2892078956b6380..d55894d76f91f50ce978695dfc8cfb2e83a1e5d0 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -193,7 +193,7 @@ function dol_escape_js($stringtoescape)
 function dol_escape_htmltag($stringtoescape)
 {
 	// escape quotes and backslashes, newlines, etc.
-	return strtr($stringtoescape, array('"'=>'',"\r"=>'\\r',"\n"=>'\\n'));
+	return strtr($stringtoescape, array('"'=>'',"\r"=>'\\r',"\n"=>'\\n',"<b>"=>'','</b>'=>''));
 }