From 4f4ac30fc060b81751310c26bc9f10304a6c8e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 20 Jul 2014 02:32:13 +0200
Subject: [PATCH] Deprecating arbitrary use of dol_htmloutput* functions

---
 htdocs/adherents/admin/public.php          |  6 +--
 htdocs/adherents/ldap.php                  |  6 ---
 htdocs/admin/menus/index.php               |  8 ++-
 htdocs/admin/translation.php               |  2 -
 htdocs/bookmarks/admin/bookmark.php        |  6 +--
 htdocs/boutique/admin/boutique.php         | 22 ++++----
 htdocs/cashdesk/admin/cashdesk.php         |  6 +--
 htdocs/comm/action/contact.php             |  2 -
 htdocs/comm/action/rapport/index.php       |  7 +--
 htdocs/comm/fiche.php                      |  4 +-
 htdocs/comm/mailing/cibles.php             |  4 --
 htdocs/comm/mailing/fiche.php              | 59 +++++++++++++---------
 htdocs/compta/bank/virement.php            | 20 +++-----
 htdocs/compta/facture/contact.php          |  1 -
 htdocs/compta/facture/impayees.php         |  2 -
 htdocs/compta/salaries/index.php           |  2 -
 htdocs/compta/sociales/charges.php         | 18 +++----
 htdocs/compta/sociales/index.php           |  4 --
 htdocs/compta/tva/reglement.php            |  2 -
 htdocs/contrat/contact.php                 | 17 +++----
 htdocs/contrat/note.php                    |  2 -
 htdocs/cron/card.php                       |  2 +-
 htdocs/expedition/contact.php              | 14 +++--
 htdocs/exports/export.php                  |  5 +-
 htdocs/externalsite/admin/externalsite.php |  8 +--
 htdocs/fichinter/contact.php               | 15 +++---
 htdocs/fichinter/note.php                  |  2 -
 htdocs/fourn/commande/contact.php          |  5 +-
 htdocs/fourn/commande/fiche.php            |  7 ++-
 htdocs/fourn/facture/contact.php           |  5 +-
 htdocs/ftp/admin/ftpclient.php             |  8 +--
 htdocs/holiday/admin/holiday.php           | 24 +++------
 htdocs/holiday/define_holiday.php          |  6 +--
 htdocs/holiday/fiche.php                   |  4 +-
 htdocs/product/admin/product.php           | 11 ++--
 htdocs/product/liste.php                   |  4 +-
 htdocs/projet/activity/list.php            | 10 +---
 htdocs/projet/admin/project.php            | 18 +++----
 htdocs/projet/contact.php                  |  5 +-
 htdocs/projet/fiche.php                    | 30 +++++------
 htdocs/projet/tasks.php                    |  2 -
 htdocs/projet/tasks/contact.php            |  6 +--
 htdocs/projet/tasks/task.php               |  6 +--
 htdocs/projet/tasks/time.php               |  2 -
 htdocs/societe/admin/societe.php           | 19 +++----
 htdocs/societe/notify/fiche.php            |  6 +--
 htdocs/societe/rib.php                     | 14 ++---
 htdocs/societe/societe.php                 |  2 +-
 48 files changed, 167 insertions(+), 273 deletions(-)

diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index 8a520a55c4e..740a5c97879 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -60,11 +60,11 @@ if ($action == 'update')
 
  	if (! $error)
     {
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+	    setEventMessage($langs->trans("SetupSaved"));
     }
     else
     {
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+	    setEventMessage($langs->trans("Error"), 'errors');
     }
 }
 
@@ -86,8 +86,6 @@ $head = member_admin_prepare_head();
 
 dol_fiche_head($head, 'public', $langs->trans("Members"), 0, 'user');
 
-dol_htmloutput_mesg($mesg);
-
 if ($conf->use_javascript_ajax)
 {
     print "\n".'<script type="text/javascript" language="javascript">';
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index b02fa90baa9..c05dc78af83 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -60,8 +60,6 @@ if (! $result)
 
 if ($action == 'dolibarr2ldap')
 {
-	$message="";
-
 	$db->begin();
 
 	$ldap=new Ldap();
@@ -157,10 +155,6 @@ print '</table>';
 
 print '</div>';
 
-
-dol_htmloutput_mesg($message);
-
-
 /*
  * Barre d'actions
  */
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index d6a7d151267..a866ecd9a70 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -43,7 +43,6 @@ foreach($dirmenus as $dirmenu)
 
 $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
-$mesg=GETPOST('mesg');
 
 $menu_handler_top=$conf->global->MAIN_MENU_STANDARD;
 $menu_handler_smartphone=$conf->global->MAIN_MENU_SMARTPHONE;
@@ -187,7 +186,9 @@ elseif ($action == 'confirm_delete' && $confirm == 'yes')
 	{
 		$db->commit();
 
-		header("Location: ".DOL_URL_ROOT.'/admin/menus/index.php?menu_handler='.$menu_handler.'&mesg='.urlencode($langs->trans("MenuDeleted")));
+		setEventMessage($langs->trans("MenuDeleted"));
+
+		header("Location: ".DOL_URL_ROOT.'/admin/menus/index.php?menu_handler='.$menu_handler);
 		exit ;
 	}
 	else
@@ -216,9 +217,6 @@ llxHeader('',$langs->trans("Menus"),'','',0,0,$arrayofjs,$arrayofcss);
 print_fiche_titre($langs->trans("Menus"),'','setup');
 
 
-dol_htmloutput_mesg($mesg);
-
-
 $h = 0;
 
 $head[$h][0] = DOL_URL_ROOT."/admin/menus.php";
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 66bc4fb22ba..95e3f555b6d 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -57,8 +57,6 @@ print_fiche_titre($langs->trans("TranslationSetup"),'','setup');
 print $langs->trans("TranslationDesc")."<br>\n";
 print "<br>\n";
 
-dol_htmloutput_mesg($message);
-
 print $langs->trans("CurrentUserLanguage").': <strong>'.$langs->defaultlang.'</strong><br>';
 print img_warning().' '.$langs->trans("SomeTranslationAreUncomplete").'<br>';
 
diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
index ad480f6cf7f..68adb30f7ab 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -42,12 +42,12 @@ if ($action == 'setvalue')
 	if (! $error)
 	{
 		$db->commit();
-		$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+		setEventMessage($langs->trans("SetupSaved"));
 	}
 	else
 	{
 		$db->rollback();
-		$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+		setEventMessage($langs->trans("Error"), 'errors');
 	}
 }
 
@@ -82,8 +82,6 @@ print '<input size="3" type="text" name="BOOKMARKS_SHOW_IN_MENU" value="'.$conf-
 print '</td></tr>';
 print '</table><br /><center><input type="submit" class="button" value="'.$langs->trans("Modify").'"></center></form>';
 
-dol_htmloutput_mesg($mesg);
-
 $db->close();
 
 llxFooter();
diff --git a/htdocs/boutique/admin/boutique.php b/htdocs/boutique/admin/boutique.php
index 65dab22f813..b4430edcbe1 100644
--- a/htdocs/boutique/admin/boutique.php
+++ b/htdocs/boutique/admin/boutique.php
@@ -56,7 +56,7 @@ if (GETPOST('save','alpha'))
 	if ($i >= 4)
 	{
 		$db->commit();
-		$mesg = "<font class=\"ok\">".$langs->trans("OSCommerceSetupSaved")."</font>";
+		setEventMessage($langs->trans("OSCommerceSetupSaved"));
 	}
 	else
 	{
@@ -88,28 +88,29 @@ elseif (GETPOST('test','alpha'))
 		$sql.=" WHERE configuration_key='STORE_NAME'";
 		$resql=$oscommercedb->query($sql);
 		if ($resql) {
-			$mesg ="<div class=\"ok\">".$langs->trans("OSCommerceTestOk",GETPOST('oscommerce_dbhost','alpha'),GETPOST('oscommerce_dbname','alpha'),GETPOST('oscommerce_dbuser','alpha'));
-			$mesg.="</div>";
+			$mesg = $langs->trans("OSCommerceTestOk",GETPOST('oscommerce_dbhost','alpha'),GETPOST('oscommerce_dbname','alpha'),GETPOST('oscommerce_dbuser','alpha'));
+			setEventMessage($mesg);
 		}
 		else {
-			$mesg ="<div class=\"error\">".$langs->trans("OSCommerceErrorConnectOkButWrongDatabase",'STORE_NAME',GETPOST('oscommerce_db_table_prefix','alpha')."configuration");
-			$mesg.="</div>";
+			$mesg = $langs->trans("OSCommerceErrorConnectOkButWrongDatabase",'STORE_NAME',GETPOST('oscommerce_db_table_prefix','alpha')."configuration");
+			setEventMessage($mesg, 'errors');
 		}
 
 		//$oscommercedb->close();    Ne pas fermer car la conn de webcal est la meme que dolibarr si parametre host/user/pass identique
 	}
 	elseif ($oscommercedb->connected == 1 && $oscommercedb->database_selected != 1)
 	{
-		$mesg ="<div class=\"error\">".$langs->trans("OSCommerceTestKo1",GETPOST('oscommerce_dbhost','alpha'),GETPOST('oscommerce_dbname','alpha'));
+		$mesg = $langs->trans("OSCommerceTestKo1",GETPOST('oscommerce_dbhost','alpha'),GETPOST('oscommerce_dbname','alpha'));
 		$mesg.="<br>".$oscommercedb->error();
-		$mesg.="</div>";
+
+		setEventMessage($mesg, 'errors');
 		//$oscommercedb->close();    Ne pas fermer car la conn de webcal est la meme que dolibarr si parametre host/user/pass identique
 	}
 	else
 	{
-		$mesg ="<div class=\"error\">".$langs->trans("OSCommerceTestKo2",GETPOST('oscommerce_dbhost','alpha'),GETPOST('oscommerce_dbuser','alpha'));
+		$mesg = $langs->trans("OSCommerceTestKo2",GETPOST('oscommerce_dbhost','alpha'),GETPOST('oscommerce_dbuser','alpha'));
 		$mesg.="<br>".$oscommercedb->error();
-		$mesg.="</div>";
+		setEventMessage($mesg, 'errors');
 	}
 
 	//$resql=$db->query("select count(*) from ".MAIN_DB_PREFIX."const");
@@ -198,9 +199,6 @@ print "</center>";
 
 print "</form>\n";
 
-
-dol_htmloutput_mesg($mesg);
-
 $db->close();
 
 llxFooter();
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 692b055659b..277dc81820b 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -67,12 +67,12 @@ if (GETPOST('action','alpha') == 'set')
  	if (! $error)
     {
         $db->commit();
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+	    setEventMessage($langs->trans("SetupSaved"));
     }
     else
     {
         $db->rollback();
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+	    setEventMessage($langs->trans("Error"), 'errors');
     }
 }
 
@@ -152,8 +152,6 @@ print '<center><input type="submit" class="button" value="'.$langs->trans("Save"
 
 print "</form>\n";
 
-dol_htmloutput_mesg($mesg);
-
 $db->close();
 
 llxFooter();
diff --git a/htdocs/comm/action/contact.php b/htdocs/comm/action/contact.php
index 84b50893844..334da53a2f4 100644
--- a/htdocs/comm/action/contact.php
+++ b/htdocs/comm/action/contact.php
@@ -156,8 +156,6 @@ llxHeader('',$langs->trans("Agenda"),$help_url);
 
 if ($id > 0 || ! empty($ref))
 {
-	dol_htmloutput_mesg($mesg,$mesgs);
-
 	if ($object->fetch($id,$ref) > 0)
 	{
 
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index f34678787fa..3df7acec765 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -37,9 +37,6 @@ $action=GETPOST('action','alpha');
 $month=GETPOST('month');
 $year=GETPOST('year');
 
-$mesg='';
-$mesgs=array();
-
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -64,7 +61,7 @@ if ($action == 'builddoc')
 	$result=$cat->write_file(GETPOST('id','int'));
 	if ($result < 0)
 	{
-		$mesg=$cat->error;
+		setEventMessage($cat->error, 'errors');
 	}
 }
 
@@ -97,8 +94,6 @@ if ($resql)
 
 	print_barre_liste($langs->trans("Actions"), $page, "index.php",'',$sortfield,$sortorder,'',$num);
 
-	dol_htmloutput_mesg($mesg,$mesgs);
-
 	$i = 0;
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index bd2bf9630ea..76176930da3 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -87,7 +87,7 @@ if ($action == 'setcustomeraccountancycode')
 	$result=$object->update($object->id,$user,1,1,0);
 	if ($result < 0)
 	{
-		$mesgs[]=join(',',$object->errors);
+		setEventMessage($object->errors, 'errors');
 	}
 	$action="";
 }
@@ -926,8 +926,6 @@ else
 	dol_print_error($db,'Bad value for socid parameter');
 }
 
-dol_htmloutput_mesg('',$mesgs);
-
 // End of page
 llxFooter();
 
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 14aea7c89c7..df51f91e1a2 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -38,8 +38,6 @@ $langs->load("mails");
 if (! $user->rights->mailing->lire || $user->societe_id > 0) accessforbidden();
 
 
-$mesg = '';
-
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -222,8 +220,6 @@ if ($object->fetch($id) >= 0)
 
 	print "</div>";
 
-	dol_htmloutput_mesg($mesg);
-
 	$var=!$var;
 
 	$allowaddtarget=($object->statut == 0);
diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index 7bdc4680853..6f2f5928925 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -445,6 +445,8 @@ if ($action == 'send' && empty($_POST["cancel"]))
 // Action add emailing
 if ($action == 'add')
 {
+	$mesgs = array();
+
 	$object->email_from     = trim($_POST["from"]);
 	$object->email_replyto  = trim($_POST["replyto"]);
 	$object->email_errorsto = trim($_POST["errorsto"]);
@@ -454,21 +456,27 @@ if ($action == 'add')
 	$object->bgcolor        = trim($_POST["bgcolor"]);
 	$object->bgimage        = trim($_POST["bgimage"]);
 
-	if (! $object->titre) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTitle"));
-	if (! $object->sujet) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTopic"));
-	if (! $object->body)  $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailMessage"));
+	if (! $object->titre) {
+		$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTitle"));
+	}
+	if (! $object->sujet) {
+		$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTopic"));
+	}
+	if (! $object->body)  {
+		$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailMessage"));
+	}
 
-	if (! $mesg)
+	if (!count($mesgs))
 	{
 		if ($object->create($user) >= 0)
 		{
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
 		}
-		$mesg=$object->error;
+		$mesgs[] = $object->error;
 	}
 
-	setEventMessage($mesg, 'errors');
+	setEventMessage($mesgs, 'errors');
 	$action="create";
 }
 
@@ -481,9 +489,12 @@ if ($action == 'settitre' || $action == 'setemail_from' || $actino == 'setreplyt
 	else if ($action == 'setemail_from')		$object->email_from     = trim(GETPOST('email_from','alpha'));
 	else if ($action == 'setemail_replyto')		$object->email_replyto  = trim(GETPOST('email_replyto','alpha'));
 	else if ($action == 'setemail_errorsto')	$object->email_errorsto = trim(GETPOST('email_errorsto','alpha'));
-
-	else if ($action == 'settitre' && empty($object->titre))		$mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTitle"));
-	else if ($action == 'setfrom' && empty($object->email_from))	$mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailFrom"));
+	else if ($action == 'settitre' && empty($object->titre)) {
+		$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTitle"));
+	}
+	else if ($action == 'setfrom' && empty($object->email_from)) {
+		$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailFrom"));
+	}
 
 	if (! $mesg)
 	{
@@ -492,7 +503,7 @@ if ($action == 'settitre' || $action == 'setemail_from' || $actino == 'setreplyt
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
 		}
-		$mesg=$object->error;
+		$mesg = $object->error;
 	}
 
 	setEventMessage($mesg, 'errors');
@@ -535,25 +546,31 @@ if ($action == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"
 
 	if (! $isupload)
 	{
+		$mesgs = array();
+
 		$object->sujet          = trim($_POST["sujet"]);
 		$object->body           = trim($_POST["body"]);
 		$object->bgcolor        = trim($_POST["bgcolor"]);
 		$object->bgimage        = trim($_POST["bgimage"]);
 
-		if (! $object->sujet) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTopic"));
-		if (! $object->body)  $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailMessage"));
+		if (! $object->sujet) {
+			$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTopic"));
+		}
+		if (! $object->body) {
+			$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailMessage"));
+		}
 
-		if (! $mesg)
+		if (!count($mesgs))
 		{
 			if ($object->update($user) >= 0)
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-			$mesg=$object->error;
+			$mesgs[] =$object->error;
 		}
 
-		setEventMessage($mesg, 'errors');
+		setEventMessage($mesgs, 'errors');
 		$action="edit";
 	}
 	else
@@ -730,9 +747,9 @@ else
 				{
 					// Pour des raisons de securite, on ne permet pas cette fonction via l'IHM,
 					// on affiche donc juste un message
-				    $mesgembedded.='<div class="warning">'.$langs->trans("MailingNeedCommand").'</div>';
-					$mesgembedded.='<br><textarea cols="60" rows="'.ROWS_1.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>';
-					$mesgembedded.='<br><br><div class="warning">'.$langs->trans("MailingNeedCommand2").'</div>';
+					setEventMessage($langs->trans("MailingNeedCommand"), 'warnings');
+					setEventMessage('<textarea cols="60" rows="'.ROWS_1.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', 'warnings');
+					setEventMessage($langs->trans("MailingNeedCommand2"), 'warnings');
 					$_GET["action"]='';
 				}
 				else
@@ -912,12 +929,6 @@ else
 				print '<br><br></div>';
 			}
 
-			if (! empty($mesgembedded)) 
-			{
-				dol_htmloutput_mesg($mesgembedded,'','warning',1);
-				print '<br>';
-			}
-
 			// Affichage formulaire de TEST
 			if ($action == 'test')
 			{
diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php
index d7b082fc65e..601db34c964 100644
--- a/htdocs/compta/bank/virement.php
+++ b/htdocs/compta/bank/virement.php
@@ -45,7 +45,6 @@ if ($action == 'add')
 {
 	$langs->load("errors");
 
-	$mesg='';
 	$dateo = dol_mktime(12,0,0,GETPOST('remonth','int'),GETPOST('reday','int'),GETPOST('reyear','int'));
 	$label = GETPOST('label','alpha');
 	$amount= GETPOST('amount','int');
@@ -53,22 +52,22 @@ if ($action == 'add')
 	if (! $label)
 	{
 		$error=1;
-		$mesg.="<div class=\"error\">".$langs->trans("ErrorFieldRequired",$langs->transnoentities("Description"))."</div>";
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Description")), 'errors');
 	}
 	if (! $amount)
 	{
 		$error=1;
-		$mesg.="<div class=\"error\">".$langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount"))."</div>";
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount")), 'errors');
 	}
 	if (! GETPOST('account_from','int'))
 	{
 		$error=1;
-		$mesg.="<div class=\"error\">".$langs->trans("ErrorFieldRequired",$langs->transnoentities("TransferFrom"))."</div>";
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("TransferFrom")), 'errors');
 	}
 	if (! GETPOST('account_to','int'))
 	{
 		$error=1;
-		$mesg.="<div class=\"error\">".$langs->trans("ErrorFieldRequired",$langs->transnoentities("TransferTo"))."</div>";
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("TransferTo")), 'errors');
 	}
 	if (! $error)
 	{
@@ -111,20 +110,19 @@ if ($action == 'add')
 
 			if (! $error)
 			{
-				$mesg.="<div class=\"ok\">";
-				$mesg.=$langs->trans("TransferFromToDone","<a href=\"account.php?account=".$accountfrom->id."\">".$accountfrom->label."</a>","<a href=\"account.php?account=".$accountto->id."\">".$accountto->label."</a>",$amount,$langs->transnoentities("Currency".$conf->currency));
-				$mesg.="</div>";
+				$mesgs = $langs->trans("TransferFromToDone","<a href=\"account.php?account=".$accountfrom->id."\">".$accountfrom->label."</a>","<a href=\"account.php?account=".$accountto->id."\">".$accountto->label."</a>",$amount,$langs->transnoentities("Currency".$conf->currency));
+				setEventMessage($mesgs);
 				$db->commit();
 			}
 			else
 			{
-				$mesg.="<div class=\"error\">".$accountfrom->error.' '.$accountto->error."</div>";
+				setEventMessage($accountfrom->error.' '.$accountto->error, 'errors');
 				$db->rollback();
 			}
 		}
 		else
 		{
-			$mesg.="<div class=\"error\">".$langs->trans("ErrorFromToAccountsMustDiffers")."</div>";
+			setEventMessage($langs->trans("ErrorFromToAccountsMustDiffers"), 'errors');
 		}
 	}
 }
@@ -154,8 +152,6 @@ if($error)
 
 print_fiche_titre($langs->trans("BankTransfer"));
 
-dol_htmloutput_mesg($mesg);
-
 print $langs->trans("TransferDesc");
 print "<br><br>";
 
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index c3c629bc68d..8fe20cd66f6 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -127,7 +127,6 @@ $userstatic=new User($db);
 /* Mode vue et edition                                                         */
 /*                                                                             */
 /* *************************************************************************** */
-dol_htmloutput_mesg($mesg);
 
 if ($id > 0 || ! empty($ref))
 {
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index d8b40784c0a..4a34d49c413 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -453,8 +453,6 @@ if ($resql)
 	print_fiche_titre($titre,$link);
 	//print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0);	// We don't want pagination on this page
 
-	dol_htmloutput_mesg($mesg);
-
 	print '<form id="form_unpaid" method="POST" action="'.$_SERVER["PHP_SELF"].'?sortfield='. $sortfield .'&sortorder='. $sortorder .'">';
 
 	if (! empty($mode) && $action == 'presend')
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index c7ee207f853..0a4a2d99943 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -104,8 +104,6 @@ if ($result)
 
 	print_barre_liste($langs->trans("SalariesPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines);
 
-	dol_htmloutput_mesg($mesg);
-
 	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
 
     print '<table class="noborder" width="100%">';
diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index 1583c8ebc49..bce22caaed6 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -69,7 +69,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')
 	}
 	else
 	{
-		$mesg='<div class="error">'.$chargesociales->error.'</div>';
+		setEventMessage($chargesociales->error, 'errors');
 	}
 }
 
@@ -81,22 +81,22 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 	$dateperiod=@dol_mktime($_POST["periodhour"],$_POST["periodmin"],$_POST["periodsec"],$_POST["periodmonth"],$_POST["periodday"],$_POST["periodyear"]);
 	if (! $dateech)
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DateDue")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateDue")), 'errors');
 		$action = 'create';
 	}
 	elseif (! $dateperiod)
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Period")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Period")), 'errors');
 		$action = 'create';
 	}
 	elseif (! $_POST["actioncode"] > 0)
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Type")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Type")), 'errors');
 		$action = 'create';
 	}
 	elseif (! $_POST["amount"])
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount")), 'errors');
 		$action = 'create';
 	}
 	else
@@ -124,12 +124,12 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->tax->charges->cr
 	$dateperiod=dol_mktime($_POST["periodhour"],$_POST["periodmin"],$_POST["periodsec"],$_POST["periodmonth"],$_POST["periodday"],$_POST["periodyear"]);
 	if (! $dateech)
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DateDue")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateDue")), 'errors');
 		$action = 'edit';
 	}
 	elseif (! $dateperiod)
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Period")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Period")), 'errors');
 		$action = 'edit';
 	}
 	else
@@ -168,8 +168,6 @@ if ($action == 'create')
 	print_fiche_titre($langs->trans("NewSocialContribution"));
 	print "<br>\n";
 
-	dol_htmloutput_mesg($mesg);
-
     $var=false;
 
     print '<form name="charge" method="post" action="'.$_SERVER["PHP_SELF"].'">';
@@ -238,8 +236,6 @@ if ($id > 0)
 
 	if ($result > 0)
 	{
-		dol_htmloutput_mesg($mesg);
-
 		$head=tax_prepare_head($object);
 
 		dol_fiche_head($head, 'card', $langs->trans("SocialContribution"),0,'bill');
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index e7f0d3a2b1b..022aaf14ff0 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -127,10 +127,6 @@ if ($resql)
 		print_barre_liste($langs->trans("SocialContributions"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines);
 	}
 
-
-	dol_htmloutput_mesg($mesg);
-
-
 	if (empty($mysoc->country_id) && empty($mysoc->country_code))
 	{
 		print '<div class="error">';
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index c10f7f4509c..9bb4337782e 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -102,8 +102,6 @@ if ($result)
 	
 	print_barre_liste($langs->trans("VATPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines);
 
-	dol_htmloutput_mesg($mesg);
-	
 	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
 
     print '<table class="noborder" width="100%">';
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index dcec3598e7f..7156b69777c 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -67,15 +67,14 @@ if ($action == 'addcontact' && $user->rights->contrat->creer)
 	}
 	else
 	{
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-		}
-		else
-		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
+			$msg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
+		} else {
+			$mesg = $object->error;
 		}
+
+		setEventMessage($mesg, 'errors');
 	}
 }
 
@@ -117,8 +116,6 @@ $formcompany= new FormCompany($db);
 $contactstatic=new Contact($db);
 $userstatic=new User($db);
 
-dol_htmloutput_mesg($mesg);
-
 /* *************************************************************************** */
 /*                                                                             */
 /* Mode vue et edition                                                         */
@@ -129,8 +126,6 @@ if ($id > 0 || ! empty($ref))
 {
 	if ($object->fetch($id, $ref) > 0)
 	{
-		dol_htmloutput_mesg($mesg);
-
 		$object->fetch_thirdparty();
 
 	    $head = contract_prepare_head($object);
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 3ac3ca47496..cd782d73444 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -64,8 +64,6 @@ $form = new Form($db);
 
 if ($id > 0 || ! empty($ref))
 {
-	dol_htmloutput_mesg($mesg);
-
     $object->fetch_thirdparty();
 
     $head = contract_prepare_head($object);
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index a785b499642..84465cfd1c0 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -269,7 +269,7 @@ if ($action == 'execute'){
 
 if (empty($object->status) && $action != 'create')
 {
-	dol_htmloutput_mesg($langs->trans("CronTaskInactive"),'','warning',1);
+	setEventMessage($langs->trans("CronTaskInactive"), 'warnings');
 }
 
 if (($action=="create") || ($action=="edit"))
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index facca267160..49b83692630 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -87,15 +87,14 @@ if ($action == 'addcontact' && $user->rights->expedition->creer)
 	}
 	else
 	{
-		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-		}
-		else
-		{
-			$mesg = '<div class="error">'.$objectsrc->error.'</div>';
+			$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
+		} else {
+			$mesg = $objectsrc->error;
 		}
+
+		setEventMessage($mesg, 'errors');
 	}
 }
 
@@ -146,7 +145,6 @@ $userstatic=new User($db);
 /* Mode vue et edition                                                         */
 /*                                                                             */
 /* *************************************************************************** */
-dol_htmloutput_mesg($mesg);
 
 if ($id > 0 || ! empty($ref))
 {
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index d244a209b92..cbaf3277be8 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -166,6 +166,8 @@ if ($action=='selectfield')
         }
 	    //print_r($array_selected);
 	    $_SESSION["export_selected_fields"]=$array_selected;
+
+	    setEventMessage($warnings, 'warnings');
     }
 
 }
@@ -488,9 +490,6 @@ if ($step == 2 && $datatoexport)
     print '</table>';
     print '<br>';
 
-
-    if ($warnings) dol_htmloutput_mesg('',$warnings,'warning');
-
     // Combo list of export models
     print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php
index 9c59a7bf4ff..95d0a4397de 100644
--- a/htdocs/externalsite/admin/externalsite.php
+++ b/htdocs/externalsite/admin/externalsite.php
@@ -59,12 +59,12 @@ if ($action == 'update')
     if ($i >= 2)
     {
         $db->commit();
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+	    setEventMessage($langs->trans("SetupSaved"));
     }
     else
     {
         $db->rollback();
-        $mesg="<div class=\"error\">".$db->lasterror()."</div>";
+	    setEventMessage($db->lasterror(), 'errors');
     }
 }
 
@@ -120,10 +120,6 @@ print "</center>";
 
 print "</form>\n";
 
-
-dol_htmloutput_mesg($mesg);
-
-
 llxFooter();
 
 $db->close();
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index f5f355b315a..8f540dd2ebd 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -64,15 +64,14 @@ if ($action == 'addcontact' && $user->rights->ficheinter->creer)
 	}
 	else
 	{
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-		}
-		else
-		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
+			$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
+		} else {
+			$mesg = $object->error;
 		}
+
+		setEventMessage($mesg, 'errors');
 	}
 }
 
@@ -109,9 +108,7 @@ $userstatic=new User($db);
 
 llxHeader();
 
-
 // Mode vue et edition
-dol_htmloutput_mesg($mesg);
 
 if ($id > 0 || ! empty($ref))
 {
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index d263620ae47..3c5fce7caa2 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -60,8 +60,6 @@ $form = new Form($db);
 
 if ($id > 0 || ! empty($ref))
 {
-	dol_htmloutput_mesg($mesg);
-
 	$societe = new Societe($db);
 	if ($societe->fetch($object->socid))
 	{
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 8311e8bfc9f..ba32a143f8c 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -69,11 +69,11 @@ if ($action == 'addcontact' && $user->rights->fournisseur->commande->creer)
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
+			setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
 		}
 		else
 		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
+			setEventMessage($object->error, 'errors');
 		}
 	}
 }
@@ -126,7 +126,6 @@ $userstatic=new User($db);
 /* Mode vue et edition                                                         */
 /*                                                                             */
 /* *************************************************************************** */
-dol_htmloutput_mesg($mesg);
 
 if ($id > 0 || ! empty($ref))
 {
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index dbac3c4230d..9e9cabc86b3 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -638,7 +638,7 @@ else if ($action == 'livraison' && $user->rights->fournisseur->commande->recepti
     }
     else
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Delivery")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Delivery")), 'errors');
     }
 }
 
@@ -767,7 +767,7 @@ else if ($action == 'add' && $user->rights->fournisseur->commande->creer)
 
     if ($socid <1)
     {
-    	$mesg='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentities('Supplier')).'</div>';
+	    setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('Supplier')), 'errors');
     	$action='create';
     	$error++;
     }
@@ -798,7 +798,7 @@ else if ($action == 'add' && $user->rights->fournisseur->commande->creer)
         {
             $langs->load("errors");
             $db->rollback();
-            $mesg='<div class="error">'.$langs->trans($object->error).'</div>';
+	        setEventMessage($langs->trans($object->error), 'errors');
             $action='create';
             $_GET['socid']=$_POST['socid'];
         }
@@ -1070,7 +1070,6 @@ if ($action=="create")
 {
 	print_fiche_titre($langs->trans('NewOrder'));
 
-	dol_htmloutput_mesg($mesg);
 	dol_htmloutput_events();
 
 	$societe='';
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 25361746869..c33b078886f 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -69,11 +69,11 @@ if ($action == 'addcontact' && $user->rights->fournisseur->facture->creer)
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
+			setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
 		}
 		else
 		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
+			setEventMessage($object->error, 'errors');
 		}
 	}
 }
@@ -125,7 +125,6 @@ $userstatic=new User($db);
 /* Mode vue et edition                                                         */
 /*                                                                             */
 /* *************************************************************************** */
-dol_htmloutput_mesg($mesg);
 
 if ($id > 0 || ! empty($ref))
 {
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index a7a98dcc734..1b252c480af 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -58,18 +58,17 @@ if ($action == 'add' || GETPOST('modify','alpha'))
 	$ftp_server = "FTP_SERVER_" . $entry; //$_POST["numero_entry"];
 
 	$error=0;
-	$mesg='';
 
 	if (! GETPOST("$ftp_name",'alpha'))
 	{
 		$error=1;
-		$mesg.='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Label")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Label")), 'errors');
 	}
 
 	if (! GETPOST("$ftp_server",'alpha'))
 	{
 		$error=1;
-		$mesg.='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Server")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Server")), 'errors');
 	}
 
     if (! $error)
@@ -299,9 +298,6 @@ else
 
 }
 
-dol_htmloutput_mesg($mesg);
-
-
 llxFooter();
 
 $db->close();
diff --git a/htdocs/holiday/admin/holiday.php b/htdocs/holiday/admin/holiday.php
index aabf8362c05..0ed80121042 100644
--- a/htdocs/holiday/admin/holiday.php
+++ b/htdocs/holiday/admin/holiday.php
@@ -59,7 +59,6 @@ $cp = new Holiday($db);
 // Contrôle du formulaire
 if ($action == "add")
 {
-    $message = '';
     $error = 0;
 
     // Option du groupe de validation
@@ -156,12 +155,9 @@ if ($action == "add")
     if($num < 1)
     {
         $cp->createCPusers();
-        $message.= '<br /><div class="warning">'.$langs->trans('AddCPforUsers').'</div>';
+	    setEventMessage($langs->trans('AddCPforUsers'), 'warnings');
     }
 
-    dol_htmloutput_mesg($message);
-
-
     // Si il s'agit de créer un event
 }
 elseif ($action == 'create_event')
@@ -173,12 +169,12 @@ elseif ($action == 'create_event')
 
     if (! $optName)
     {
-    	$message='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Name")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Name")), 'errors');
         $error++;
     }
     if (! $optValue > 0)
     {
-    	$message='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Value")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Value")), 'errors');
     	$error++;
     }
 
@@ -190,17 +186,15 @@ elseif ($action == 'create_event')
         $result = $cp->createEventCP($user);
         if($result > 0)
         {
-            $message = 'OkCreateEventCP';
+	        setEventMessage('OkCreateEventCP');
             $optName='';
             $optValue='';
         }
         else
         {
-            $message = '<div class="error">'.$cp->error.'</div>';
+	        setEventMessage($cp->error, 'errors');
         }
     }
-
-    dol_htmloutput_mesg($message);
 }
 elseif($action == 'event' && isset($_POST['update_event']))
 {
@@ -234,15 +228,13 @@ elseif($action == 'event' && isset($_POST['update_event']))
         // Mise à jour des congés de l'utilisateur
         $update = $cp->updateEventCP($eventId,$eventName,$eventValue);
         if(!$update) {
-            $message='ErrorUpdateEventCP';
+	        setEventMessage('ErrorUpdateEventCP', 'errors');
         } else {
-            $message='UpdateEventOkCP';
+	        setEventMessage('UpdateEventOkCP');
         }
     } else {
-        $message='ErrorUpdateEventCP';
+	    setEventMessage('ErrorUpdateEventCP', 'errors');
     }
-
-    dol_htmloutput_mesg($message);
 }
 elseif($action && isset($_POST['delete_event']))
 {
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index bf1bf046783..4b37a8b53c5 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -102,7 +102,7 @@ elseif($action == 'add_event')
 
     if ($error)
     {
-        $message = '<div class="error">'.$langs->trans('ErrorAddEventToUserCP').'</div>';
+	    setEventMessage($langs->trans('ErrorAddEventToUserCP'), 'errors');
     }
     else
 	{
@@ -115,10 +115,8 @@ elseif($action == 'add_event')
 
         $holiday->updateSoldeCP($userCP,$new_holiday);
 
-        $message = $langs->trans('AddEventToUserOkCP');
+		setEventMessage($langs->trans('AddEventToUserOkCP'));
     }
-
-    dol_htmloutput_mesg($message);
 }
 
 $langs->load('users');
diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php
index 93b426b5ad3..797bce3171f 100644
--- a/htdocs/holiday/fiche.php
+++ b/htdocs/holiday/fiche.php
@@ -705,7 +705,7 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
                     break;
             }
 
-            dol_htmloutput_mesg('',$errors,'error');
+	        setEventMessage($errors, 'errors');
         }
 
 
@@ -890,7 +890,7 @@ else
                         break;
                 }
 
-                dol_htmloutput_mesg('',$errors,'error');
+	            setEventMessage($errors, 'errors');
             }
 
             // On vérifie si l'utilisateur à le droit de lire cette demande
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index ca77dabe8c4..e79ffcf13c6 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -91,12 +91,12 @@ if ($action == 'setModuleOptions')
 	if (! $error)
     {
         $db->commit();
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+	    setEventMessage($langs->trans("SetupSaved"));
     }
     else
     {
         $db->rollback();
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+	    setEventMessage($langs->trans("Error"), 'errors');
 	}
 }
 
@@ -178,11 +178,11 @@ if($action)
 
  	if (! $error)
     {
-        $mesg = '<font class="ok">'.$langs->trans("SetupSaved").'</font>';
+	    setEventMessage($langs->trans("SetupSaved"));
     }
     else
     {
-        $mesg = '<font class="error">'.$langs->trans("Error").'</font>';
+	    setEventMessage($langs->trans("Error"), 'errors');
     }
 }
 
@@ -505,14 +505,13 @@ if (! empty($conf->global->PRODUCT_CANVAS_ABILITY))
 	}
 	else
 	{
+		//TODO: Translate
 		print "<tr><td><b>ERROR</b>: $dir is not a directory !</td></tr>\n";
 	}
 
 	print '</table>';
 }
 
-dol_htmloutput_mesg($mesg);
-
 llxFooter();
 
 $db->close();
diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index 8d82b5548a5..7e4c4f12b10 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -230,7 +230,9 @@ else
     	llxHeader('',$title,$helpurl,'');
 
     	// Displays product removal confirmation
-    	if (GETPOST('delprod'))	dol_htmloutput_mesg($langs->trans("ProductDeleted",GETPOST('delprod')));
+    	if (GETPOST('delprod'))	{
+		    setEventMessage($langs->trans("ProductDeleted", GETPOST('delprod')));
+	    }
 
     	$param="&amp;sref=".$sref.($sbarcode?"&amp;sbarcode=".$sbarcode:"")."&amp;snom=".$snom."&amp;sall=".$sall."&amp;tosell=".$tosell."&amp;tobuy=".$tobuy;
     	$param.=($fourn_id?"&amp;fourn_id=".$fourn_id:"");
diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php
index 93e8bf95647..a88dbf8b0fb 100644
--- a/htdocs/projet/activity/list.php
+++ b/htdocs/projet/activity/list.php
@@ -97,7 +97,7 @@ if ($action == 'addtime' && $user->rights->projet->creer)
     }
     else
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorTimeSpentIsEmpty").'</div>';
+	    setEventMessage($langs->trans("ErrorTimeSpentIsEmpty"), 'errors');
     }
 }
 
@@ -128,17 +128,9 @@ if ($id)
 $tasksarray=$taskstatic->getTasksArray(0,0,($project->id?$project->id:$projectsListId),$socid,0);    // We want to see all task of project i am allowed to see, not only mine. Later only mine will be editable later.
 $projectsrole=$taskstatic->getUserRolesForProjectsOrTasks($user,0,($project->id?$project->id:$projectsListId),0);
 $tasksrole=$taskstatic->getUserRolesForProjectsOrTasks(0,$user,($project->id?$project->id:$projectsListId),0);
-//var_dump($tasksarray);
-//var_dump($projectsrole);
-//var_dump($taskrole);
-
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
 
-
-dol_htmloutput_mesg($mesg);
-
-
 print '<form name="addtime" method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$project->id.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="addtime">';
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index c564a23a480..a23f65edafb 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -60,11 +60,11 @@ if ($action == 'updateMask')
 
 	if (! $error)
 	{
-		$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+		setEventMessage($langs->trans("SetupSaved"));
 	}
 	else
 	{
-		$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+		setEventMessage($langs->trans("Error"), 'errors');
 	}
 }
 
@@ -79,11 +79,11 @@ if ($action == 'updateMaskTask')
 
 	if (! $error)
 	{
-		$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+		setEventMessage($langs->trans("SetupSaved"));
 	}
 	else
 	{
-		$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+		setEventMessage($langs->trans("Error"), 'errors');
 	}
 }
 
@@ -121,13 +121,13 @@ else if ($action == 'specimen')
 		}
 		else
 		{
-			$mesg='<div class="error">'.$obj->error.'</div>';
+			setEventMessage($obj->error, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
 	}
 	else
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorModuleNotFound").'</div>';
+		setEventMessage($langs->trans("ErrorModuleNotFound"), 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 }
@@ -166,13 +166,13 @@ else if ($action == 'specimentask')
 		}
 		else
 		{
-			$mesg='<div class="error">'.$obj->error.'</div>';
+			setEventMessage($obj->error, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
 	}
 	else
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorModuleNotFound").'</div>';
+		setEventMessage($langs->trans("ErrorModuleNotFound"), 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 }
@@ -786,8 +786,6 @@ foreach ($dirmodels as $reldir)
 
 print '</table><br/>';
 
-dol_htmloutput_mesg($mesg);
-
 $db->close();
 
 llxFooter();
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index c6880547c60..ebee8cd3fa4 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -79,11 +79,11 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
+			setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
 		}
 		else
 		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
+			setEventMessage($object->error, 'errors');
 		}
 	}
 }
@@ -137,7 +137,6 @@ $userstatic=new User($db);
 /* Mode vue et edition                                                         */
 /*                                                                             */
 /* *************************************************************************** */
-dol_htmloutput_mesg($mesg);
 
 if ($id > 0 || ! empty($ref))
 {
diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php
index 00fdf65d15a..a2b5fa40e82 100644
--- a/htdocs/projet/fiche.php
+++ b/htdocs/projet/fiche.php
@@ -92,7 +92,7 @@ if (empty($reshook))
 		    else
 		    {
 		        dol_syslog($object->error,LOG_DEBUG);
-		        $mesg='<div class="error">'.$langs->trans("CantRemoveProject").'</div>';
+			    setEventMessage($langs->trans("CantRemoveProject"), 'errors');
 		    }
 		}
 	    header("Location: ".$backtopage);
@@ -111,7 +111,7 @@ if (empty($reshook))
 	    else
 	    {
 	        dol_syslog($object->error,LOG_DEBUG);
-	        $mesg='<div class="error">'.$langs->trans("CantRemoveProject").'</div>';
+		    setEventMessage($langs->trans("CantRemoveProject"), 'errors');
 	    }
 	}
 
@@ -120,12 +120,12 @@ if (empty($reshook))
 	    $error=0;
 	    if (empty($_POST["ref"]))
 	    {
-	        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref")).'</div>';
+		    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref")), 'errors');
 	        $error++;
 	    }
 	    if (empty($_POST["title"]))
 	    {
-	        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")).'</div>';
+		    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), 'errors');
 	        $error++;
 	    }
 
@@ -155,14 +155,14 @@ if (empty($reshook))
 	            if ($result < 0)
 	            {
 	                $langs->load("errors");
-	                $mesg='<div class="error">'.$langs->trans($object->error).'</div>';
+		            setEventMessage($langs->trans($object->error), 'errors');
 	                $error++;
 	            }
 	        }
 	        else
 	        {
 	            $langs->load("errors");
-	            $mesg='<div class="error">'.$langs->trans($object->error).'</div>';
+		        setEventMessage($langs->trans($object->error), 'errors');
 	            $error++;
 	        }
 
@@ -194,13 +194,13 @@ if (empty($reshook))
 	    {
 	        $error++;
 	        //$_GET["id"]=$_POST["id"]; // On retourne sur la fiche projet
-	        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref")).'</div>';
+		    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref")), 'errors');
 	    }
 	    if (empty($_POST["title"]))
 	    {
 	        $error++;
 	        //$_GET["id"]=$_POST["id"]; // On retourne sur la fiche projet
-	        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")).'</div>';
+		    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), 'errors');
 	    }
 
 	    $db->begin();
@@ -245,7 +245,7 @@ if (empty($reshook))
 	    		if ($result < 0)
 	    		{
 	    			$error++;
-	    			$mesg='<div class="error">'.$langs->trans("ErrorShiftTaskDate").':'.$object->error.'</div>';
+				    setEventMessage($langs->trans("ErrorShiftTaskDate").':'.$object->error, 'errors');
 	    		}
 	    	}
 	    }
@@ -306,7 +306,7 @@ if (empty($reshook))
 	    $result = $object->setValid($user);
 	    if ($result <= 0)
 	    {
-	        $mesg='<div class="error">'.$object->error.'</div>';
+		    setEventMessage($object->error, 'errors');
 	    }
 	}
 
@@ -315,7 +315,7 @@ if (empty($reshook))
 	    $result = $object->setClose($user);
 	    if ($result <= 0)
 	    {
-	        $mesg='<div class="error">'.$object->error.'</div>';
+		    setEventMessage($object->error, 'errors');
 	    }
 	}
 
@@ -324,7 +324,7 @@ if (empty($reshook))
 	    $result = $object->setValid($user);
 	    if ($result <= 0)
 	    {
-	        $mesg='<div class="error">'.$object->error.'</div>';
+		    setEventMessage($object->error, 'errors');
 	    }
 	}
 
@@ -355,7 +355,7 @@ if (empty($reshook))
 	    $result=$object->createFromClone($object->id,$clone_contacts,$clone_tasks,$clone_project_files,$clone_task_files,$clone_notes);
 	    if ($result <= 0)
 	    {
-	        $mesg='<div class="error">'.$object->error.'</div>';
+		    setEventMessage($object->error, 'errors');
 	    }
 	    else
 	    {
@@ -391,8 +391,6 @@ if ($action == 'create' && $user->rights->projet->creer)
 
     print_fiche_titre($langs->trans("NewProject"));
 
-    dol_htmloutput_mesg($mesg);
-
     print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="add">';
@@ -490,8 +488,6 @@ else
      * Show or edit
      */
 
-    dol_htmloutput_mesg($mesg);
-
     if ($object->societe->id > 0)  $result=$object->societe->fetch($object->societe->id);
     $res=$object->fetch_optionals($object->id,$extralabels);
 
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index de9ef77746d..f72b8c6963d 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -199,8 +199,6 @@ if ($id > 0 || ! empty($ref))
 	$head=project_prepare_head($object);
 	dol_fiche_head($head, $tab, $langs->trans("Project"),0,($object->public?'projectpub':'project'));
 	
-	dol_htmloutput_mesg();
-
 	$param=($mode=='mine'?'&mode=mine':'');
 
 	print '<table class="border" width="100%">';
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 722e3c9aaae..3cc8b51ca1a 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -75,11 +75,11 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
+			setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
 		}
 		else
 		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
+			setEventMessage($object->error, 'errors');
 		}
 	}
 }
@@ -223,8 +223,6 @@ if ($id > 0 || ! empty($ref))
 		//$userAccess = $projectstatic->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project
 		//$arrayofuseridoftask=$object->getListContactId('internal');
 
-		dol_htmloutput_mesg($mesg);
-
 		$head = task_prepare_head($object);
 		dol_fiche_head($head, 'task_contact', $langs->trans("Task"), 0, 'projecttask');
 
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 14339291c4c..5a445f4f013 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -69,7 +69,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer)
 	if (empty($_POST["label"]))
 	{
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), 'errors');
 	}
 	if (! $error)
 	{
@@ -122,7 +122,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->s
 		else
 		{
 			$langs->load("errors");
-			$mesg='<div class="error">'.$langs->trans($object->error).'</div>';
+			setEventMessage($langs->trans($object->error), 'errors');
 			$action='';
 		}
 	}
@@ -294,8 +294,6 @@ if ($id > 0 || ! empty($ref))
 		//$userAccess = $projectstatic->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project
 		//$arrayofuseridoftask=$object->getListContactId('internal');
 
-		dol_htmloutput_mesg($mesg);
-
 		$head=task_prepare_head($object);
 		dol_fiche_head($head, 'task_task', $langs->trans("Task"),0,'projecttask');
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 19a0bd5f99f..73249620cbb 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -263,8 +263,6 @@ if ($id > 0 || ! empty($ref))
 		$head=task_prepare_head($object);
 		dol_fiche_head($head, 'task_time', $langs->trans("Task"),0,'projecttask');
 
-		dol_htmloutput_mesg($mesg);
-
 		if ($action == 'deleteline')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.'&lineid='.$_GET["lineid"].($withproject?'&withproject=1':''),$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1);
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 52a72e954ae..b1680d2803e 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -77,11 +77,11 @@ if ($action == 'updateoptions')
 		if (! $res > 0) $error++;
 		if (! $error)
 	    {
-	        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+		    setEventMessage($langs->trans("SetupSaved"));
 	    }
 	    else
 	    {
-	        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+		    setEventMessage($langs->trans("Error"), 'errors');
 		}
 	}
 	
@@ -92,11 +92,11 @@ if ($action == 'updateoptions')
 		if (! $res > 0) $error++;
 		if (! $error)
 		{
-			$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+			setEventMessage($langs->trans("SetupSaved"));
 		}
 		else
 		{
-			$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+			setEventMessage($langs->trans("Error"), 'errors');
 		}
 	}
 }
@@ -121,12 +121,12 @@ if ($action == 'setModuleOptions')
 	if (! $error)
     {
         $db->commit();
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+	    setEventMessage($langs->trans("SetupSaved"));
     }
     else
     {
         $db->rollback();
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+	    setEventMessage($langs->trans("Error"), 'errors');
 	}
 }
 
@@ -220,11 +220,11 @@ if ($action=="setaddrefinlist") {
 	if (! $res > 0) $error++;
 	if (! $error)
 	{
-		$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+		setEventMessage($langs->trans("SetupSaved"));
 	}
 	else
 	{
-		$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+		setEventMessage($langs->trans("Error"), 'errors');
 	}
 }
 
@@ -298,9 +298,6 @@ $head = societe_admin_prepare_head(null);
 
 dol_fiche_head($head, 'general', $langs->trans("ThirdParties"), 0, 'company');
 
-dol_htmloutput_mesg($mesg);
-
-
 $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
 
 // Module to manage customer/supplier code
diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php
index 198739398a2..18de91a6a31 100644
--- a/htdocs/societe/notify/fiche.php
+++ b/htdocs/societe/notify/fiche.php
@@ -66,12 +66,12 @@ if ($action == 'add')
 
     if (empty($contactid))
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Contact")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Contact")), 'errors');
         $error++;
     }
     if ($actionid <= 0)
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Action")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Action")), 'errors');
         $error++;
     }
 
@@ -258,8 +258,6 @@ if ($result > 0)
     print '</form>';
     print '<br>';
 
-    dol_htmloutput_mesg($mesg);
-
     // List of active notifications
     print_fiche_titre($langs->trans("ListOfActiveNotifications"),'','');
     $var=true;
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index ea64135bd43..b95839d67b9 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -79,7 +79,7 @@ if ($action == 'update' && ! $_POST["cancel"])
 	$result = $account->update($user);
 	if (! $result)
 	{
-		$message=$account->error;
+		setEventMessage($account->error, 'errors');
 		$_GET["action"]='edit';     // Force chargement page edition
 	}
 	else
@@ -137,7 +137,7 @@ if ($action == 'add' && ! $_POST["cancel"])
 	    $result = $account->update($user);	// TODO Use create and include update into create method
 	    if (! $result)
 	    {
-	        $message=$account->error;
+		    setEventMessage($account->error, 'errors');
 	        $_GET["action"]='create';     // Force chargement page création
 	    }
 	    else
@@ -158,7 +158,7 @@ if ($action == 'setasdefault')
         header('Location: '.$url);
         exit;
     } else {
-        $message=$db->lasterror;
+	    setEventMessage($db->lasterror, 'errors');
     }
 }
 
@@ -176,12 +176,12 @@ if ($action == 'confirm_delete' && $_GET['confirm'] == 'yes')
 		}
 		else
 		{
-			$message = $account->error;
+			setEventMessage($account->error, 'errors');
 		}
 	}
 	else
 	{
-         $message = $account->error;
+		setEventMessage($account->error, 'errors');
     }
 }
 
@@ -399,8 +399,6 @@ if ($socid && $action != 'edit' && $action != "create")
 
 if ($socid && $action == 'edit' && $user->rights->societe->creer)
 {
-    dol_htmloutput_mesg($message);
-
     print '<form action="rib.php?socid='.$soc->id.'" method="post">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="update">';
@@ -515,8 +513,6 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 
 if ($socid && $action == 'create' && $user->rights->societe->creer)
 {
-    dol_htmloutput_mesg($message);
-
     print '<form action="rib.php?socid='.$soc->id.'" method="post">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="add">';
diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php
index c8d2d68ebb7..f0b3532018b 100644
--- a/htdocs/societe/societe.php
+++ b/htdocs/societe/societe.php
@@ -284,7 +284,7 @@ if ($resql)
     // Show delete result message
     if (GETPOST('delsoc'))
     {
-        dol_htmloutput_mesg($langs->trans("CompanyDeleted",GETPOST('delsoc')),'','ok');
+	    setEventMessage($langs->trans("CompanyDeleted",GETPOST('delsoc')));
     }
 
 	$langs->load("other");