From 434bb1bec79d5d1ee8dd62ecc508874ccf443aa1 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 00:10:40 +0200
Subject: [PATCH 1/4] Migrated old message notifications to the """new"""
 system

---
 htdocs/adherents/admin/adherent.php           |  8 +--
 htdocs/adherents/ldap.php                     |  4 +-
 htdocs/admin/external_rss.php                 |  2 -
 htdocs/admin/menus/edit.php                   | 27 +++-----
 htdocs/admin/tools/update.php                 | 12 ++--
 htdocs/comm/mailing/fiche.php                 | 34 ++++------
 htdocs/compta/paiement/fiche.php              | 20 ++----
 htdocs/compta/sociales/charges.php            | 16 ++---
 htdocs/contact/ldap.php                       | 10 +--
 .../modules/mailings/xinputfile.modules.php   |  2 -
 htdocs/ecm/index.php                          | 12 +---
 htdocs/ecm/index_auto.php                     | 13 ++--
 htdocs/fourn/paiement/fiche.php               | 18 ++---
 htdocs/ftp/admin/ftpclient.php                |  2 -
 htdocs/ftp/index.php                          | 28 +++-----
 htdocs/holiday/admin/holiday.php              |  4 +-
 htdocs/holiday/define_holiday.php             |  5 +-
 htdocs/imports/import.php                     | 27 +++-----
 htdocs/paybox/admin/paybox.php                |  4 +-
 htdocs/product/fournisseurs.php               | 26 +++----
 htdocs/product/price.php                      | 17 ++---
 htdocs/product/stock/fiche.php                | 19 ++----
 htdocs/user/fiche.php                         | 68 +++++++++----------
 htdocs/user/group/fiche.php                   | 32 +++------
 htdocs/user/group/ldap.php                    | 10 +--
 htdocs/user/ldap.php                          | 10 +--
 26 files changed, 156 insertions(+), 274 deletions(-)

diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 0a251536ff6f7..670260f12876d 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -68,11 +68,11 @@
 
 	if (! $error)
 	{
-		$mesg = '<div class="ok">'.$langs->trans("SetupSaved").'</div>';
+		setEventMessage($langs->trans("SetupSaved"));
 	}
 	else
 	{
-		$mesg = '<div class="error">'.$langs->trans("Error").'</div>';
+		setEventMessage($langs->trans("Error"), 'errors');
 	}
 }
 
@@ -117,10 +117,6 @@
 
 dol_fiche_head($head, 'general', $langs->trans("Members"), 0, 'user');
 
-
-dol_htmloutput_mesg($mesg);
-
-
 print_fiche_titre($langs->trans("MemberMainOptions"),'','');
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index ca651854a24e5..b02fa90baa9f1 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -75,12 +75,12 @@
 
 	if ($result >= 0)
 	{
-		$message.='<div class="ok">'.$langs->trans("MemberSynchronized").'</div>';
+		setEventMessage($langs->trans("MemberSynchronized"));
 		$db->commit();
 	}
 	else
 	{
-		$message.='<div class="error">'.$ldap->error.'</div>';
+		setEventMessage($ldap->error, 'errors');
 		$db->rollback();
 	}
 }
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 1944521a58151..f23e80f78ff7d 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -105,7 +105,6 @@
         if ($result1 && $result2)
         {
             $db->commit();
-	  		//$mesg='<div class="ok">'.$langs->trans("Success").'</div>';
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
         }
@@ -171,7 +170,6 @@
         if ($result1 && $result2)
         {
             $db->commit();
-	  		//$mesg='<div class="ok">'.$langs->trans("Success").'</div>';
             header("Location: external_rss.php");
             exit;
         }
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index d99a02308b7ab..42d1ed5c9ca02 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -39,7 +39,6 @@
 $dirmenu = array($dirstandard,$dirsmartphone);
 
 $action=GETPOST('action');
-$mesg=GETPOST('mesg');
 
 $menu_handler_top=$conf->global->MAIN_MENU_STANDARD;
 $menu_handler_smartphone=$conf->global->MAIN_MENU_SMARTPHONE;
@@ -79,16 +78,16 @@
             $result=$menu->update($user);
             if ($result > 0)
             {
-                $mesg='<div class="ok">'.$langs->trans("RecordModifiedSuccessfully").'</div>';
+	            setEventMessage($langs->trans("RecordModifiedSuccessfully"));
             }
             else
             {
-                $mesg='<div class="error">'.$menu->error.'</div>';
+	            setEventMessage($menu->error, 'errors');
             }
         }
         else
         {
-            $mesg='<div class="error">'.$menu->error.'</div>';
+	        setEventMessage($menu->error, 'errors');
         }
         $_GET["menuId"] = $_POST['menuId'];
         $action = "edit";
@@ -136,37 +135,37 @@
     $error=0;
     if (! $error && ! $_POST['menu_handler'])
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("MenuHandler")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("MenuHandler")), 'errors');
         $action = 'create';
         $error++;
     }
     if (! $error && ! $_POST['type'])
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Type")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Type")), 'errors');
         $action = 'create';
         $error++;
     }
     if (! $error && ! $_POST['url'])
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("Url")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Url")), 'errors');
         $action = 'create';
         $error++;
     }
     if (! $error && ! $_POST['titre'])
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("Title")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Title")), 'errors');
         $action = 'create';
         $error++;
     }
     if (! $error && $_POST['menuId'] && $_POST['type'] == 'top')
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorTopMenuMustHaveAParentWithId0").'</div>';
+	    setEventMessage($langs->trans("ErrorTopMenuMustHaveAParentWithId0"), 'errors');
         $action = 'create';
         $error++;
     }
     if (! $error && empty($_POST['menuId']) && $_POST['type'] == 'left')
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorLeftMenuMustHaveAParentId").'</div>';
+	    setEventMessage($langs->trans("ErrorLeftMenuMustHaveAParentId"), 'errors');
         $action = 'create';
         $error++;
     }
@@ -205,7 +204,7 @@
         else
         {
             $action = 'create';
-            $mesg='<div class="error">'.$menu->error.'</div>';
+	        setEventMessage($menu->error, 'errors');
         }
     }
 }
@@ -223,7 +222,7 @@
         $this->db->commit();
 
         llxHeader();
-        print '<div class="ok">'.$langs->trans("MenuDeleted").'</div>';
+	    setEventMessage($langs->trans("MenuDeleted"));
         llxFooter();
         exit ;
     }
@@ -375,8 +374,6 @@ function init_topleft()
     print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
 
     print '</form>';
-
-    dol_htmloutput_mesg($mesg);
 }
 elseif ($action == 'edit')
 {
@@ -463,8 +460,6 @@ function init_topleft()
     print '</form>';
 
     print '<br>';
-
-    dol_htmloutput_mesg($mesg);
 }
 
 
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index d58e7444e7110..15d5b5f3d5278 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -54,7 +54,7 @@
 	if (! $original_file)
 	{
 		$langs->load("Error");
-		$mesg = '<div class="warning">'.$langs->trans("ErrorFileRequired").'</div>';
+		setEventMessage($langs->trans("ErrorFileRequired"), 'warnings');
 		$error++;
 	}
 	else
@@ -62,7 +62,7 @@
 		if (! preg_match('/\.zip/i',$original_file))
 		{
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorFileMustBeADolibarrPackage",$original_file).'</div>';
+			setEventMessage($langs->trans("ErrorFileMustBeADolibarrPackage",$original_file), 'errors');
 			$error++;
 		}
 	}
@@ -80,12 +80,11 @@
 			if (! empty($result['error']))
 			{
 				$langs->load("errors");
-				$mesg = '<div class="error">'.$langs->trans($result['error'],$original_file).'</div>';
-
+				setEventMessage($langs->trans($result['error'],$original_file), 'errors');
 			}
 			else
 			{
-				$mesg = '<div class="ok">'.$langs->trans("SetupIsReadyForUse").'</div>';
+				setEventMessage($langs->trans("SetupIsReadyForUse"));
 			}
 		}
 	}
@@ -107,9 +106,6 @@
 print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("FeatureNotYetAvailable").'</b><br>';
 print '<br>';
 
-//dol_htmloutput_errors($mesg);
-dol_htmloutput_mesg($mesg);
-
 print $langs->trans("Upgrade").'<br>';
 print '<hr>';
 print $langs->trans("ThisIsProcessToFollow").'<br>';
diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index 60c587ac67469..7bdc468085392 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -107,7 +107,7 @@
 {
 	if (empty($_REQUEST["clone_content"]) && empty($_REQUEST["clone_receivers"]))
 	{
-		$mesg='<div class="error">'.$langs->trans("NoCloneOptionsSpecified").'</div>';
+		setEventMessage($langs->trans("NoCloneOptionsSpecified"), 'errors');
 	}
 	else
 	{
@@ -119,7 +119,7 @@
 		}
 		else
 		{
-			$mesg=$object->error;
+			setEventMessage($object->error, 'errors');
 		}
 	}
     $action='';
@@ -130,16 +130,17 @@
 {
 	if (empty($conf->global->MAILING_LIMIT_SENDBYWEB))
 	{
+		//TODO: What is this for?
 		// Pour des raisons de securite, on ne permet pas cette fonction via l'IHM,
 		// on affiche donc juste un message
-		$mesg='<div class="warning">'.$langs->trans("MailingNeedCommand").'</div>';
-		$mesg.='<br><textarea cols="70" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>';
-		$mesg.='<br><br><div class="warning">'.$langs->trans("MailingNeedCommand2").'</div>';
+		setEventMessage($langs->trans("MailingNeedCommand"), 'warnings');
+		setEventMessage('<textarea cols="70" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', 'warnings');
+		setEventMessage($langs->trans("MailingNeedCommand2"), 'warnings');
 		$action='';
 	}
 	else if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
 	{
-		$mesg='<div class="warning">'.$langs->trans("NotEnoughPermissions").'</div>';
+		setEventMessage($langs->trans("NotEnoughPermissions"), 'warnings');
 		$action='';
 	}
 	else
@@ -390,7 +391,7 @@
 	$object->sendto = $_POST["sendto"];
 	if (! $object->sendto)
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("MailTo")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("MailTo")), 'errors');
 		$error++;
 	}
 
@@ -430,11 +431,11 @@
 		$result=$mailfile->sendfile();
 		if ($result)
 		{
-			$mesg='<div class="ok">'.$langs->trans("MailSuccessfulySent",$mailfile->getValidAddress($object->email_from,2),$mailfile->getValidAddress($object->sendto,2)).'</div>';
+			setEventMessage($langs->trans("MailSuccessfulySent",$mailfile->getValidAddress($object->email_from,2),$mailfile->getValidAddress($object->sendto,2)));
 		}
 		else
 		{
-			$mesg='<div class="error">'.$langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result.'</div>';
+			setEventMessage($langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result, 'errors');
 		}
 
 		$action='';
@@ -467,7 +468,7 @@
 		$mesg=$object->error;
 	}
 
-	$mesg='<div class="error">'.$mesg.'</div>';
+	setEventMessage($mesg, 'errors');
 	$action="create";
 }
 
@@ -494,7 +495,7 @@
 		$mesg=$object->error;
 	}
 
-	$mesg='<div class="error">'.$mesg.'</div>';
+	setEventMessage($mesg, 'errors');
 	$action="";
 }
 
@@ -552,7 +553,7 @@
 			$mesg=$object->error;
 		}
 
-		$mesg='<div class="error">'.$mesg.'</div>';
+		setEventMessage($mesg, 'errors');
 		$action="edit";
 	}
 	else
@@ -598,7 +599,7 @@
 		}
 		else
 		{
-			$mesg=$object->error;
+			setEventMessage($object->error, 'errors');
 			$db->rollback();
 		}
 	}
@@ -646,8 +647,6 @@
 
 	print_fiche_titre($langs->trans("NewMailing"));
 
-	dol_htmloutput_mesg($mesg);
-
 	print '<table class="border" width="100%">';
 	print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("MailTitle").'</td><td><input class="flat" name="titre" size="40" value="'.$_POST['titre'].'"></td></tr>';
 	print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("MailFrom").'</td><td><input class="flat" name="from" size="40" value="'.$conf->global->MAILING_EMAIL_FROM.'"></td></tr>';
@@ -829,9 +828,6 @@
 				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneEMailing'),$langs->trans('ConfirmCloneEMailing',$object->ref),'confirm_clone',$formquestion,'yes',2,240);
 			}
 
-
-			dol_htmloutput_mesg($mesg);
-
 			/*
 			 * Boutons d'action
 			 */
@@ -1017,8 +1013,6 @@
 			 * Mailing en mode edition
 			 */
 
-			dol_htmloutput_mesg($mesg);
-
 			print '<table class="border" width="100%">';
 
 			// Ref
diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php
index 97f3fb9d47c10..74ec9f4cb692e 100644
--- a/htdocs/compta/paiement/fiche.php
+++ b/htdocs/compta/paiement/fiche.php
@@ -45,8 +45,6 @@
 // TODO ajouter regle pour restreindre acces paiement
 //$result = restrictedArea($user, 'facture', $id,'');
 
-$mesg='';
-
 $object = new Paiement($db);
 
 
@@ -67,7 +65,7 @@
     }
     else
     {
-        $mesg='<div class="error">'.$object->error.'</div>';
+	    setEventMessage($object->error, 'errors');
         $db->rollback();
     }
 }
@@ -87,7 +85,7 @@
 	else
 	{
 	    $langs->load("errors");
-		$mesg='<div class="error">'.$langs->trans($object->error).'</div>';
+		setEventMessage($langs->trans($object->error), 'errors');
         $db->rollback();
 	}
 }
@@ -123,7 +121,7 @@
 	else
 	{
 	    $langs->load("errors");
-		$mesg='<div class="error">'.$langs->trans($object->error).'</div>';
+		setEventMessage($langs->trans($object->error), 'errors');
 		$db->rollback();
 	}
 }
@@ -134,11 +132,11 @@
     $res = $object->update_num($_POST['num_paiement']);
 	if ($res === 0)
 	{
-		$mesg = '<div class="ok">'.$langs->trans('PaymentNumberUpdateSucceeded').'</div>';
+		setEventMessage($langs->trans('PaymentNumberUpdateSucceeded'));
 	}
 	else
 	{
-		$mesg = '<div class="error">'.$langs->trans('PaymentNumberUpdateFailed').'</div>';
+		setEventMessage($langs->trans('PaymentNumberUpdateFailed'), 'errors');
 	}
 }
 
@@ -149,11 +147,11 @@
 	$res = $object->update_date($datepaye);
 	if ($res === 0)
 	{
-		$mesg = '<div class="ok">'.$langs->trans('PaymentDateUpdateSucceeded').'</div>';
+		setEventMessage($langs->trans('PaymentDateUpdateSucceeded'));
 	}
 	else
 	{
-		$mesg = '<div class="error">'.$langs->trans('PaymentDateUpdateFailed').'</div>';
+		setEventMessage($langs->trans('PaymentDateUpdateFailed'), 'errors');
 	}
 }
 
@@ -198,10 +196,6 @@
 
 }
 
-
-dol_htmloutput_mesg($mesg);
-
-
 print '<table class="border" width="100%">';
 
 // Ref
diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index 48a8f65695936..1583c8ebc498f 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -110,13 +110,9 @@
 		$chargesociales->amount=$_POST["amount"];
 
 		$id=$chargesociales->create($user);
-		if ($id > 0)
+		if ($id <= 0)
 		{
-			//$mesg='<div class="ok">'.$langs->trans("SocialContributionAdded").'</div>';
-		}
-		else
-		{
-			$mesg='<div class="error">'.$chargesociales->error.'</div>';
+			setEventMessage($chargesociales->error, 'errors');
 		}
 	}
 }
@@ -146,13 +142,9 @@
 		$chargesociales->periode=$dateperiod;
 
 		$result=$chargesociales->update($user);
-		if ($result > 0)
-		{
-			//$mesg='<div class="ok">'.$langs->trans("SocialContributionAdded").'</div>';
-		}
-		else
+		if ($result <= 0)
 		{
-			$mesg='<div class="error">'.$chargesociales->error.'</div>';
+			setEventMessage($chargesociales->error, 'errors');
 		}
 	}
 }
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index 1681324323ab4..fe3098eaa9a26 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -49,8 +49,6 @@
 
 if ($action == 'dolibarr2ldap')
 {
-	$message="";
-
 	$db->begin();
 
 	$ldap=new Ldap();
@@ -64,12 +62,12 @@
 
 	if ($result >= 0)
 	{
-		$message.='<div class="ok">'.$langs->trans("ContactSynchronized").'</div>';
+		setEventMessage($langs->trans("ContactSynchronized"));
 		$db->commit();
 	}
 	else
 	{
-		$message.='<div class="error">'.$ldap->error.'</div>';
+		setEventMessage($ldap->error, 'errors');
 		$db->rollback();
 	}
 }
@@ -136,10 +134,6 @@
 
 print '</div>';
 
-
-dol_htmloutput_mesg($message);
-
-
 /*
  * Barre d'actions
  */
diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index 3ed72bd20346b..777621fa43229 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -137,8 +137,6 @@ function add_to_target($mailing_id,$filtersarray=array())
 			{
 				$cpt=0;
 
-				//$mesg = '<div class="ok">'.$langs->trans("FileTransferComplete").'</div>';
-				//print_r($_FILES);
 				$file=$upload_dir . "/" . $_FILES['username']['name'];
 				$handle = @fopen($file, "r");
 				if ($handle)
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index e46011c45babf..8f9bd5573bf78 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -110,8 +110,6 @@
 			$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . dol_unescapefile($_FILES['userfile']['name']),0, 0, $_FILES['userfile']['error']);
 			if (is_numeric($resupload) && $resupload > 0)
 			{
-				//$mesg = '<div class="ok">'.$langs->trans("FileTransferComplete").'</div>';
-				//print_r($_FILES);
 				$result=$ecmdir->changeNbOfFiles('+');
 			}
 			else
@@ -134,7 +132,7 @@
 		else
 		{
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorFailToCreateDir",$upload_dir).'</div>';
+			setEventMessage($langs->trans("ErrorFailToCreateDir",$upload_dir), 'errors');
 		}
 	}
 }
@@ -156,7 +154,7 @@
 	}
 	else
 	{
-		$mesg='<div class="error">Error '.$langs->trans($ecmdir->error).'</div>';
+		setEventMessage('Error '.$langs->trans($ecmdir->error), 'errors');
 		$action = "create";
 	}
 
@@ -198,7 +196,7 @@
 if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes')
 {
 	$result=$ecmdir->delete($user);
-	$mesg = '<div class="ok">'.$langs->trans("ECMSectionWasRemoved", $ecmdir->label).'</div>';
+	setEventMessage($langs->trans("ECMSectionWasRemoved", $ecmdir->label));
 
     clearstatcache();
 }
@@ -324,7 +322,6 @@
     	$dirtotest=$conf->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
 		if (! dol_is_dir($dirtotest))
 		{
-			$mesg.=$dirtotest." not found onto disk. We delete from database dir with id=".$dirdesc['id']."<br>\n";
 			$ecmdirtmp->id=$dirdesc['id'];
 			$ecmdirtmp->delete($user,'databaseonly');
 			//exit;
@@ -440,9 +437,6 @@
 
 }
 
-dol_htmloutput_mesg($mesg);
-
-
 if (! empty($conf->use_javascript_ajax)) $classviewhide='hidden';
 else $classviewhide='visible';
 
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 9c4ab7e0e2f46..3e6e6cfa05b45 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -110,8 +110,6 @@
 			$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . dol_unescapefile($_FILES['userfile']['name']),0, 0, $_FILES['userfile']['error']);
 			if (is_numeric($resupload) && $resupload > 0)
 			{
-				//$mesg = '<div class="ok">'.$langs->trans("FileTransferComplete").'</div>';
-				//print_r($_FILES);
 				$result=$ecmdir->changeNbOfFiles('+');
 			}
 			else
@@ -134,7 +132,7 @@
 		else
 		{
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorFailToCreateDir",$upload_dir).'</div>';
+			setEventMessage($langs->trans("ErrorFailToCreateDir",$upload_dir), 'errors');
 		}
 	}
 }
@@ -156,7 +154,8 @@
 	}
 	else
 	{
-		$mesg='<div class="error">Error '.$langs->trans($ecmdir->error).'</div>';
+		//TODO: Translate
+		setEventMessage('Error '.$langs->trans($ecmdir->error), 'errors');
 		$action = "create";
 	}
 
@@ -198,7 +197,7 @@
 if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes')
 {
 	$result=$ecmdir->delete($user);
-	$mesg = '<div class="ok">'.$langs->trans("ECMSectionWasRemoved", $ecmdir->label).'</div>';
+	setEventMessage($langs->trans("ECMSectionWasRemoved", $ecmdir->label));
 
     clearstatcache();
 }
@@ -324,7 +323,6 @@
     	$dirtotest=$conf->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
 		if (! dol_is_dir($dirtotest))
 		{
-			$mesg.=$dirtotest." not found onto disk. We delete from database dir with id=".$dirdesc['id']."<br>\n";
 			$ecmdirtmp->id=$dirdesc['id'];
 			$ecmdirtmp->delete($user,'databaseonly');
 			//exit;
@@ -436,9 +434,6 @@
 
 }
 
-dol_htmloutput_mesg($mesg);
-
-
 if (! empty($conf->use_javascript_ajax)) $classviewhide='hidden';
 else $classviewhide='visible';
 
diff --git a/htdocs/fourn/paiement/fiche.php b/htdocs/fourn/paiement/fiche.php
index 9a38e16f7f4dd..32edf72a2ad6d 100644
--- a/htdocs/fourn/paiement/fiche.php
+++ b/htdocs/fourn/paiement/fiche.php
@@ -36,8 +36,6 @@
 $langs->load('companies');
 $langs->load("suppliers");
 
-$mesg='';
-
 $id			= GETPOST('id','int');
 $action		= GETPOST('action','alpha');
 $confirm	= GETPOST('confirm','alpha');
@@ -61,7 +59,7 @@
     }
     else
     {
-        $mesg='<div class="error">'.$object->error.'</div>';
+	    setEventMessage($object->error, 'errors');
         $db->rollback();
     }
 }
@@ -80,7 +78,7 @@
 	}
 	else
 	{
-		$mesg='<div class="error">'.$object->error.'</div>';
+		setEventMessage($object->error, 'errors');
 		$db->rollback();
 	}
 }
@@ -98,7 +96,7 @@
 	}
 	else
 	{
-		$mesg='<div class="error">'.$object->error.'</div>';
+		setEventMessage($object->error, 'errors');
 		$db->rollback();
 	}
 }
@@ -109,11 +107,11 @@
     $res = $object->update_num($_POST['num_paiement']);
 	if ($res === 0)
 	{
-		$mesg = '<div class="ok">'.$langs->trans('PaymentNumberUpdateSucceeded').'</div>';
+		$setEventMessage($langs->trans('PaymentNumberUpdateSucceeded'));
 	}
 	else
 	{
-		$mesg = '<div class="error">'.$langs->trans('PaymentNumberUpdateFailed').'</div>';
+		setEventMessage($langs->trans('PaymentNumberUpdateFailed'), 'errors');
 	}
 }
 
@@ -124,11 +122,11 @@
 	$res = $object->update_date($datepaye);
 	if ($res === 0)
 	{
-		$mesg = '<div class="ok">'.$langs->trans('PaymentDateUpdateSucceeded').'</div>';
+		setEventMessage($langs->trans('PaymentDateUpdateSucceeded'));
 	}
 	else
 	{
-		$mesg = '<div class="error">'.$langs->trans('PaymentDateUpdateFailed').'</div>';
+		setEventMessage($langs->trans('PaymentDateUpdateFailed'), 'errors');
 	}
 }
 
@@ -229,8 +227,6 @@
 
 	print '</table>';
 
-	dol_htmloutput_mesg($mesg);
-
 	print '<br>';
 
 	/**
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 3e9d2bfd59033..a7a98dcc734af 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -91,7 +91,6 @@
         if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
         {
             $db->commit();
-	  		//$mesg='<div class="ok">'.$langs->trans("Success").'</div>';
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
         }
@@ -119,7 +118,6 @@
         if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
         {
             $db->commit();
-	  		//$mesg='<div class="ok">'.$langs->trans("Success").'</div>';
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
         }
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 0c72bcc1b1a22..f1a051bcf2a4f 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -100,8 +100,6 @@
 		$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . dol_unescapefile($_FILES['userfile']['name']),0);
 		if (is_numeric($resupload) && $resupload > 0)
 		{
-			//$mesg = '<div class="ok">'.$langs->trans("FileTransferComplete").'</div>';
-			//print_r($_FILES);
 			$result=$ecmdir->changeNbOfFiles('+');
 		}
 		else {
@@ -124,7 +122,7 @@
 	{
 		// Echec transfert (fichier depassant la limite ?)
 		$langs->load("errors");
-		$mesg = '<div class="error">'.$langs->trans("ErrorFailToCreateDir",$upload_dir).'</div>';
+		setEventMessage($langs->trans("ErrorFailToCreateDir",$upload_dir), 'errors');
 	}
 }
 
@@ -143,7 +141,8 @@
 	}
 	else
 	{
-		$mesg='<div class="error">Error '.$langs->trans($ecmdir->error).'</div>';
+		//TODO: Translate
+		setEventMessage('Error '.$langs->trans($ecmdir->error));
 		$_GET["action"] = "create";
 	}
 }
@@ -175,12 +174,12 @@
 		$result=@ftp_delete($conn_id, $newremotefileiso);
 		if ($result)
 		{
-			$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved",$file).'</div>';
+			setEventMessage($langs->trans("FileWasRemoved",$file));
 		}
 		else
 		{
 			dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
-			$mesg = '<div class="error">'.$langs->trans("FTPFailedToRemoveFile",$file).'</div>';
+			setEventMessage($langs->trans("FTPFailedToRemoveFile",$file), 'errors');
 		}
 
 		//ftp_close($conn_id);	Close later
@@ -225,12 +224,12 @@
 				$result=@ftp_delete($conn_id, $newremotefileiso);
 				if ($result)
 				{
-					$mesg .= '<div class="ok">'.$langs->trans("FileWasRemoved",$file).'</div>';
+					setEventMessage($langs->trans("FileWasRemoved",$file));
 				}
 				else
 				{
 					dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
-					$mesg .= '<div class="error">'.$langs->trans("FTPFailedToRemoveFile",$file).'</div>';
+					setEventMessage($langs->trans("FTPFailedToRemoveFile",$file), 'errors');
 				}
 
 				//ftp_close($conn_id);	Close later
@@ -269,11 +268,11 @@
 		$result=@ftp_rmdir($conn_id, $newremotefileiso);
 		if ($result)
 		{
-			$mesg = '<div class="ok">'.$langs->trans("DirWasRemoved",$file).'</div>';
+			setEventMessage($langs->trans("DirWasRemoved",$file));
 		}
 		else
 		{
-			$mesg = '<div class="error">'.$langs->trans("FTPFailedToRemoveDir",$file).'</div>';
+			setEventMessage($langs->trans("FTPFailedToRemoveDir",$file), 'errors');
 		}
 
 		//ftp_close($conn_id);	Close later
@@ -340,7 +339,8 @@
 		}
 		else
 		{
-			$mesg='<div class="error">Failed to get file '.$remotefile.'</div>';
+			//TODO: Translate
+			setEventMessage('Failed to get file '.$remotefile, 'errors');
 		}
 
 	}
@@ -444,9 +444,6 @@
 		print '<br>';
 		print "<br>\n";
 
-		if ($mesg) { print $mesg."<br>"; }
-
-
 		print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
         print '<input type="hidden" name="numero_ftp" value="'.$numero_ftp.'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -596,9 +593,6 @@
 
 		print "</table>";
 
-
-		if (! $ok && $mesg) print $mesg;
-
 		// Actions
 		/*
 		if ($user->rights->ftp->write && ! empty($section))
diff --git a/htdocs/holiday/admin/holiday.php b/htdocs/holiday/admin/holiday.php
index 2b265711fa134..aabf8362c0553 100644
--- a/htdocs/holiday/admin/holiday.php
+++ b/htdocs/holiday/admin/holiday.php
@@ -142,9 +142,9 @@
 
     if ($error)
     {
-        $message = '<div class="error">'.$langs->trans('ErrorUpdateConfCP').'</div>';
+	    setEventMessage($langs->trans('ErrorUpdateConfCP'), 'errors');
     } else {
-        $message = '<div class="ok">'.$langs->trans('UpdateConfCPOK').'</div>';
+	    setEventMessage($langs->trans('UpdateConfCPOK'));
     }
 
     // Si première mise à jour, prévenir l'utilisateur de mettre à jour le solde des congés payés
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 0ac67b6657915..bf1bf046783ef 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -84,10 +84,7 @@
     dol_syslog('define_holiday update lastUpdate entry', LOG_DEBUG);
     $result = $db->query($sql);
 
-    $mesg='<div class="ok">'.$langs->trans('UpdateConfCPOK').'</div>';
-
-    dol_htmloutput_mesg($mesg);
-
+	setEventMessage($langs->trans('UpdateConfCPOK'));
 }
 elseif($action == 'add_event')
 {
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 41a82de36b1be..0b4856fab61f1 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -138,11 +138,11 @@
 	$result=$objimport->build_file($user, GETPOST('model','alpha'), $datatoimport, $array_match_file_to_database);
 	if ($result < 0)
 	{
-		$mesg='<div class="error">'.$objimport->error.'</div>';
+		setEventMessage($objimport->error, 'errors');
 	}
 	else
 	{
-		$mesg='<div class="ok">'.$langs->trans("FileSuccessfullyBuilt").'</div>';
+		setEventMessage($langs->trans("FileSuccessfullyBuilt"));
 	}
 }
 
@@ -175,21 +175,23 @@
 		$result = $objimport->create($user);
 		if ($result >= 0)
 		{
-			$mesg='<div class="ok">'.$langs->trans("ImportModelSaved",$objimport->model_name).'</div>';
+			setEventMessage($langs->trans("ImportModelSaved",$objimport->model_name));
 		}
 		else
 		{
 			$langs->load("errors");
 			if ($objimport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
-				$mesg='<div class="error">'.$langs->trans("ErrorImportDuplicateProfil").'</div>';
+				setEventMessage($langs->trans("ErrorImportDuplicateProfil"), 'errors');
+			}
+			else {
+				setEventMessage($objimport->error, 'errors');
 			}
-			else $mesg='<div class="error">'.$objimport->error.'</div>';
 		}
 	}
 	else
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("ImportModelName")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("ImportModelName")), 'errors');
 	}
 }
 
@@ -385,8 +387,6 @@
 
     dol_fiche_end();
 
-	if ($mesg) print $mesg;
-
 }
 
 
@@ -461,7 +461,6 @@
 
     dol_fiche_end();
 
-	if ($mesg) print $mesg;
 }
 
 
@@ -597,10 +596,7 @@
 
 	print '</table></form>';
 
-
     dol_fiche_end();
-
-	if ($mesg) print $mesg;
 }
 
 
@@ -1010,9 +1006,6 @@
         print '</script>'."\n";
 	}
 
-
-	if ($mesg) print $mesg;
-
 	/*
 	 * Barre d'action
 	 */
@@ -1438,8 +1431,6 @@
         }
         print '</center>';
     }
-
-    if ($mesg) print $mesg;
 }
 
 
@@ -1679,8 +1670,6 @@
 	print $langs->trans("FileWasImported",$importid).'<br>';
 	print $langs->trans("YouCanUseImportIdToFindRecord",$importid).'<br>';
 	print '</center>';
-
-	if ($mesg) print $mesg;
 }
 
 
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 7eefafb9c8c00..30e0259119021 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -67,7 +67,7 @@
     if (! $error)
   	{
   		$db->commit();
-  		$mesg='<div class="ok">'.$langs->trans("SetupSaved").'</div>';
+	    setEventMessage($langs->trans("SetupSaved"));
   	}
   	else
   	{
@@ -227,8 +227,6 @@
 print "<br>";
 print info_admin($langs->trans("YouCanAddTagOnUrl"));
 
-dol_htmloutput_mesg($mesg);
-
 $db->close();
 dol_fiche_end();
 llxFooter();
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 527615cc7c45c..037bb2b1f8b92 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -43,7 +43,7 @@
 $action=GETPOST('action', 'alpha');
 $socid=GETPOST('socid', 'int');
 $backtopage=GETPOST('backtopage','alpha');
-$error=0; $mesg = '';
+$error=0;
 
 // If socid provided by ajax company selector
 if (! empty($_REQUEST['search_fourn_id']))
@@ -92,7 +92,7 @@
 		{
 			$result=$product->remove_product_fournisseur_price($rowid);
 			$action = '';
-			$mesg = '<div class="ok">'.$langs->trans("PriceRemoved").'.</div>';
+			setEventMessage($langs->trans("PriceRemoved"));
 		}
 	}
 }
@@ -112,27 +112,27 @@
     if ($tva_tx == '')
     {
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("VATRateForSupplierProduct")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("VATRateForSupplierProduct")), 'errors');
     }
 	if (empty($quantity))
 	{
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Qty")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Qty")), 'errors');
 	}
 	if (empty($ref_fourn))
 	{
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("RefSupplier")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("RefSupplier")), 'errors');
 	}
 	if ($id_fourn <= 0)
 	{
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Supplier")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Supplier")), 'errors');
 	}
 	if ($_POST["price"] < 0 || $_POST["price"] == '')
 	{
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Price")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Price")), 'errors');
 	}
 
 	$product = new ProductFournisseur($db);
@@ -140,7 +140,7 @@
 	if ($result <= 0)
 	{
 	    $error++;
-	    $mesg=$product->error;
+		setEventMessage($product->error, 'errors');
 	}
 
 	if (! $error)
@@ -157,12 +157,12 @@
 				$product->fetch($product->product_id_already_linked);
 				$productLink = $product->getNomUrl(1,'supplier');
 
-				$mesg='<div class="error">'.$langs->trans("ReferenceSupplierIsAlreadyAssociatedWithAProduct",$productLink).'</div>';
+				setEventMessage($langs->trans("ReferenceSupplierIsAlreadyAssociatedWithAProduct",$productLink), 'errors');
 			}
 			else if ($ret < 0)
 			{
 				$error++;
-				$mesg='<div class="error">'.$product->error.'</div>';
+				setEventMessage($product->error, 'errors');
 			}
 		}
 
@@ -177,7 +177,7 @@
 			if ($ret < 0)
 			{
 				$error++;
-				$mesg='<div class="error">'.$product->error.'</div>';
+				setEventMessage($product->error, 'errors');
 			}
 		}
 
@@ -264,10 +264,6 @@
 
 			print "</div>\n";
 
-
-			dol_htmloutput_mesg($mesg);
-
-
 			// Form to add or update a price
 			if (($action == 'add_price' || $action == 'updateprice' ) && ($user->rights->produit->creer || $user->rights->service->creer))
 			{
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index f5db524ed274e..9c0597ec0f607 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -94,15 +94,16 @@
 	
 	if ($object->updatePrice($newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq) > 0) {
 		$action = '';
-		$mesg = '<div class="ok">' . $langs->trans("RecordSaved") . '</div>';
+		setEventMessage($langs->trans("RecordSaved"));
 	} else {
 		$action = 'edit_price';
-		$mesg = '<div class="error">' . $object->error . '</div>';
+		setEventMessage($object->error, 'errors');
 	}
 } else if ($action == 'delete' && $user->rights->produit->supprimer) {
 	$result = $object->log_price_delete($user, $_GET ["lineid"]);
-	if ($result < 0)
-		$mesg = '<div class="error">' . $object->error . '</div>';
+	if ($result < 0) {
+		setEventMessage($object->error, 'errors');
+	}
 }
 
 /**
@@ -136,11 +137,11 @@
 
 	if (empty($quantity)) {
 		$error ++;
-		$mesg = '<div class="error">' . $langs->trans("ErrorFieldRequired", $langs->transnoentities("Qty")) . '</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentities("Qty")), 'errors');
 	}
 	if (empty($newprice)) {
 		$error ++;
-		$mesg = '<div class="error">' . $langs->trans("ErrorFieldRequired", $langs->transnoentities("Price")) . '</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentities("Price")), 'errors');
 	}
 	if (! $error) {
 		// Calcul du prix HT et du prix unitaire
@@ -547,10 +548,6 @@
 
 print "</div>\n";
 
-if (! empty($mesg)) {
-	dol_htmloutput_mesg($mesg);
-}
-
 /* ************************************************************************** */
 /*                                                                            */
 /* Barre d'action                                                             */
diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php
index 874b082ceae8c..86e930d8cf16d 100644
--- a/htdocs/product/stock/fiche.php
+++ b/htdocs/product/stock/fiche.php
@@ -43,8 +43,6 @@
 if (! $sortfield) $sortfield="p.ref";
 if (! $sortorder) $sortorder="DESC";
 
-$mesg = '';
-
 // Security check
 $result=restrictedArea($user,'stock');
 
@@ -80,10 +78,10 @@
 		}
 
 		$action = 'create';
-		$mesg='<div class="error">'.$object->error.'</div>';
+		setEventMessage($object->error, 'errors');
 	}
 	else {
-		$mesg='<div class="error">'.$langs->trans("ErrorWarehouseRefRequired").'</div>';
+		setEventMessage($langs->trans("ErrorWarehouseRefRequired"), 'errors');
 		$action="create";   // Force retour sur page creation
 	}
 }
@@ -101,7 +99,7 @@
 	}
 	else
 	{
-		$mesg='<div class="error">'.$object->error.'</div>';
+		setEventMessage($object->error, 'errors');
 		$action='';
 	}
 }
@@ -124,18 +122,17 @@
 		if ( $object->update($id, $user) > 0)
 		{
 			$action = '';
-			//$mesg = '<div class="ok">Fiche mise a jour</div>';
 		}
 		else
 		{
 			$action = 'edit';
-			$mesg = '<div class="error">'.$object->error.'</div>';
+			setEventMessage($object->error, 'errors');
 		}
 	}
 	else
 	{
 		$action = 'edit';
-		$mesg = '<div class="error">'.$object->error.'</div>';
+		setEventMessage($object->error, 'errors');
 	}
 }
 
@@ -167,8 +164,6 @@
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="type" value="'.$type.'">'."\n";
 
-	dol_htmloutput_mesg($mesg);
-
 	print '<table class="border" width="100%">';
 
 	// Ref
@@ -219,8 +214,6 @@
     $id=GETPOST("id",'int');
 	if ($id)
 	{
-		dol_htmloutput_mesg($mesg);
-
 		$object = new Entrepot($db);
 		$result = $object->fetch($id);
 		if ($result < 0)
@@ -496,7 +489,7 @@
 		 */
 		if (($action == 'edit' || $action == 're-edit') && 1)
 		{
-			print_fiche_titre($langs->trans("WarehouseEdit"), $mesg);
+			$langs->trans("WarehouseEdit");
 
 			print '<form action="fiche.php" method="POST">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 3a5827904f25c..5251f6bc7501e 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -45,7 +45,6 @@
 $confirm	= GETPOST('confirm','alpha');
 $subaction	= GETPOST('subaction','alpha');
 $group		= GETPOST("group","int",3);
-$message='';
 
 // Define value to know what current user can do on users
 $canadduser=(! empty($user->admin) || $user->rights->user->user->creer);
@@ -110,6 +109,8 @@
 }
 if ($action == 'confirm_enable' && $confirm == "yes" && $candisableuser)
 {
+	$error = 0;
+
     if ($id <> $user->id)
     {
         $object->fetch($id);
@@ -119,11 +120,12 @@
             $nb = $object->getNbOfUsers("active");
             if ($nb >= $conf->file->main_limit_users)
             {
-                $message='<div class="error">'.$langs->trans("YourQuotaOfUsersIsReached").'</div>';
+	            $error++;
+                setEventMessage($langs->trans("YourQuotaOfUsersIsReached"), 'errors');
             }
         }
 
-        if (! $message)
+        if (! $error)
         {
             $object->setstatus(1);
             header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
@@ -142,7 +144,7 @@
         if ($result < 0)
         {
             $langs->load("errors");
-            $message='<div class="error">'.$langs->trans("ErrorUserCannotBeDelete").'</div>';
+            setEventMessage($langs->trans("ErrorUserCannotBeDelete"), 'errors');
         }
         else
         {
@@ -155,14 +157,18 @@
 // Action ajout user
 if ($action == 'add' && $canadduser)
 {
+	$error = 0;
+
     if (! $_POST["lastname"])
     {
-        $message='<div class="error">'.$langs->trans("NameNotDefined").'</div>';
+	    $error++;
+        setEventMessage($langs->trans("NameNotDefined"), 'errors');
         $action="create";       // Go back to create page
     }
     if (! $_POST["login"])
     {
-        $message='<div class="error">'.$langs->trans("LoginNotDefined").'</div>';
+	    $error++;
+	    setEventMessage($langs->trans("LoginNotDefined"), 'errors');
         $action="create";       // Go back to create page
     }
 
@@ -171,13 +177,13 @@
         $nb = $object->getNbOfUsers("active");
         if ($nb >= $conf->file->main_limit_users)
         {
-            $message='<div class="error">'.$langs->trans("YourQuotaOfUsersIsReached").'</div>';
+	        $error++;
+	        setEventMessage($langs->trans("YourQuotaOfUsersIsReached"), 'errors');
             $action="create";       // Go back to create page
         }
     }
 
-    if (! $message)
-    {
+    if (!$error) {
         $object->lastname		= GETPOST("lastname",'alpha');
         $object->firstname	    = GETPOST("firstname",'alpha');
         $object->login		    = GETPOST("login",'alpha');
@@ -266,7 +272,7 @@
         }
         else
         {
-            $message.=$object->error;
+            setEventMessage($object->error, 'errors');
         }
     }
 }
@@ -281,13 +287,13 @@
 
     	if (! $_POST["lastname"])
         {
-            $message='<div class="error">'.$langs->trans("NameNotDefined").'</div>';
+	        setEventMessage($langs->trans("NameNotDefined"), 'errors');
             $action="edit";       // Go back to create page
             $error++;
         }
         if (! $_POST["login"])
         {
-            $message='<div class="error">'.$langs->trans("LoginNotDefined").'</div>';
+	        setEventMessage($langs->trans("LoginNotDefined"), 'errors');
             $action="edit";       // Go back to create page
             $error++;
         }
@@ -304,7 +310,7 @@
 				$result=$tmpuser->fetch(0, GETPOST("login"));
 				if ($result > 0)
 				{
-					$message='<div class="error">'.$langs->trans("ErrorLoginAlreadyExists").'</div>';
+					setEventMessage($langs->trans("ErrorLoginAlreadyExists"), 'errors');
 					$action="edit";       // Go back to create page
 					$error++;
 				}
@@ -367,11 +373,11 @@
                 if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
                 {
                     $langs->load("errors");
-                    $message.='<div class="error">'.$langs->trans("ErrorLoginAlreadyExists",$object->login).'</div>';
+	                setEventMessage($langs->trans("ErrorLoginAlreadyExists",$object->login), 'errors');
                 }
                 else
               {
-                    $message.='<div class="error">'.$object->error.'</div>';
+	              setEventMessage($object->error, 'errors');
                 }
             }
 
@@ -395,12 +401,12 @@
             		$sql.= " SET fk_socpeople=NULL, fk_societe=NULL";
             		$sql.= " WHERE rowid=".$object->id;
             	}
+	            dol_syslog("fiche::update", LOG_DEBUG);
             	$resql=$db->query($sql);
-            	dol_syslog("fiche::update", LOG_DEBUG);
             	if (! $resql)
             	{
             		$error++;
-            		$message.='<div class="error">'.$db->lasterror().'</div>';
+            		setEventMessage($db->lasterror(), 'errors');
             	}
             }
 
@@ -427,7 +433,7 @@
 
                         if (! $result > 0)
                         {
-                            $message .= '<div class="error">'.$langs->trans("ErrorFailedToSaveFile").'</div>';
+	                        setEventMessage($langs->trans("ErrorFailedToSaveFile"), 'errors');
                         }
                         else
                         {
@@ -445,7 +451,7 @@
 
             if (! $error && ! count($object->errors))
             {
-                $message.='<div class="ok">'.$langs->trans("UserModified").'</div>';
+	            setEventMessage($langs->trans("UserModified"));
                 $db->commit();
 
                 $login=$_SESSION["dol_login"];
@@ -469,7 +475,7 @@
         $ret=$object->setPassword($user,$_POST["password"]);
         if ($ret < 0)
         {
-            $message.='<div class="error">'.$object->error.'</div>';
+	        setEventMessage($object->error, 'errors');
         }
     }
 }
@@ -484,7 +490,7 @@
     if ($newpassword < 0)
     {
         // Echec
-        $message = '<div class="error">'.$langs->trans("ErrorFailedToSetNewPassword").'</div>';
+        setEventMessage($langs->trans("ErrorFailedToSetNewPassword"), 'errors');
     }
     else
     {
@@ -493,18 +499,16 @@
         {
             if ($object->send_password($user,$newpassword) > 0)
             {
-                $message = '<div class="ok">'.$langs->trans("PasswordChangedAndSentTo",$object->email).'</div>';
-                //$message.=$newpassword;
+                setEventMessage($langs->trans("PasswordChangedAndSentTo",$object->email));
             }
             else
             {
-                $message = '<div class="ok">'.$langs->trans("PasswordChangedTo",$newpassword).'</div>';
-                $message.= '<div class="error">'.$object->error.'</div>';
+	            setEventMessage($object->error, 'errors');
             }
         }
         else
         {
-            $message = '<div class="ok">'.$langs->trans("PasswordChangedTo",$newpassword).'</div>';
+	        setEventMessage($langs->trans("PasswordChangedTo",$newpassword), 'errors');
         }
     }
 }
@@ -562,7 +566,7 @@
     }
     else
     {
-        $message='<div class="error">'.$ldap->error.'</div>';
+        setEventMessage($ldap->error, 'errors');
     }
 }
 
@@ -590,8 +594,6 @@
     print "<br>";
     print "<br>";
 
-    dol_htmloutput_mesg($message);
-
     if (! empty($conf->ldap->enabled) && (isset($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr'))
     {
         /*
@@ -648,12 +650,12 @@
             }
             else
             {
-                $message='<div class="error">'.$ldap->error.'</div>';
+                setEventMessage($ldap->error, 'errors');
             }
         }
         else
         {
-            $message='<div class="error">'.$ldap->error.'</div>';
+	        setEventMessage($ldap->error, 'errors');
         }
 
         // Si la liste des users est rempli, on affiche la liste deroulante
@@ -977,7 +979,7 @@
                 $entries = $ldap->fetch($object->login,$userSearchFilter);
                 if (! $entries)
                 {
-                    $message .= $ldap->error;
+                    setEventMessage($ldap->error, 'errors');
                 }
 
                 $passDoNotExpire = 0;
@@ -1056,8 +1058,6 @@
             print $form->formconfirm("fiche.php?id=$object->id",$langs->trans("DeleteAUser"),$langs->trans("ConfirmDeleteUser",$object->login),"confirm_delete", '', 0, 1);
         }
 
-        dol_htmloutput_mesg($message);
-
         /*
          * Fiche en mode visu
          */
diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php
index 625195bfa6843..f97ef35ae6eef 100644
--- a/htdocs/user/group/fiche.php
+++ b/htdocs/user/group/fiche.php
@@ -48,7 +48,6 @@
 $action=GETPOST('action', 'alpha');
 $confirm=GETPOST('confirm', 'alpha');
 $userid=GETPOST('user', 'int');
-$message='';
 
 // Security check
 $result = restrictedArea($user, 'user', $id, 'usergroup&usergroup', 'user');
@@ -76,7 +75,7 @@
     else
     {
     	$langs->load("errors");
-        $message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>';
+        setEventMessage($langs->trans('ErrorForbidden'), 'errors');
     }
 }
 
@@ -87,14 +86,10 @@
 {
     if ($caneditperms)
     {
-        if (! $_POST["nom"])
-        {
-            $message='<div class="error">'.$langs->trans("NameNotDefined").'</div>';
+        if (! $_POST["nom"]) {
+            setEventMessage($langs->trans("NameNotDefined"), 'errors');
             $action="create";       // Go back to create page
-        }
-
-		if (! $message)
-		{
+        } else {
 			$object->nom	= trim($_POST["nom"]);
 			$object->note	= trim($_POST["note"]);
 
@@ -117,7 +112,7 @@
                 $db->rollback();
 
                 $langs->load("errors");
-                $message='<div class="error">'.$langs->trans("ErrorGroupAlreadyExists",$object->nom).'</div>';
+                setEventMessage($langs->trans("ErrorGroupAlreadyExists",$object->nom), 'errors');
                 $action="create";       // Go back to create page
             }
         }
@@ -125,7 +120,7 @@
     else
     {
     	$langs->load("errors");
-        $message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>';
+	    setEventMessage($langs->trans('ErrorForbidden'), 'errors');
     }
 }
 
@@ -151,14 +146,14 @@
             }
             else
             {
-                $message.=$edituser->error;
+                setEventMessage($edituser->error, 'errors');
             }
         }
     }
     else
     {
     	$langs->load("errors");
-        $message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>';
+	    setEventMessage($langs->trans('ErrorForbidden'), 'errors');
     }
 }
 
@@ -183,19 +178,19 @@
 
         if ($ret >= 0 && ! count($object->errors))
         {
-            $message.='<div class="ok">'.$langs->trans("GroupModified").'</div>';
+	        setEventMessage($langs->trans("GroupModified"));
             $db->commit();
         }
         else
         {
-            $message.='<div class="error">'.$object->error.'</div>';
+            setEventMessage($object->error);
             $db->rollback();
         }
     }
     else
     {
     	$langs->load("errors");
-        $message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>';
+        setEventMessage($langs->trans('ErrorForbidden'));
     }
 }
 
@@ -214,8 +209,6 @@
 {
     print_fiche_titre($langs->trans("NewGroup"));
 
-    if ($message) { print $message."<br>"; }
-
     print dol_set_focus('#nom');
 
     print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
@@ -340,9 +333,6 @@
 			print "</div>\n";
 			print "<br>\n";
 
-
-            dol_htmloutput_mesg($message);
-
             /*
              * Liste des utilisateurs dans le groupe
              */
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index cde5e764af562..c3e147620c238 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -56,8 +56,6 @@
 
 if ($action == 'dolibarr2ldap')
 {
-	$message="";
-
 	$db->begin();
 
 	$ldap=new Ldap();
@@ -71,12 +69,12 @@
 
 	if ($result >= 0)
 	{
-		$message.='<div class="ok">'.$langs->trans("GroupSynchronized").'</div>';
+		setEventMessage($langs->trans("GroupSynchronized"));
 		$db->commit();
 	}
 	else
 	{
-		$message.='<div class="error">'.$ldap->error.'</div>';
+		setEventMessage($ldap->error);
 		$db->rollback();
 	}
 }
@@ -135,10 +133,6 @@
 
 print '</div>';
 
-
-dol_htmloutput_mesg($message);
-
-
 /*
  * Barre d'actions
  */
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index ebf776e64aaa1..87a0dec31e2e5 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -52,8 +52,6 @@
 
 if ($_GET["action"] == 'dolibarr2ldap')
 {
-    $message="";
-
     $db->begin();
 
     $ldap=new Ldap();
@@ -67,12 +65,12 @@
 
     if ($result >= 0)
     {
-        $message.='<div class="ok">'.$langs->trans("UserSynchronized").'</div>';
+        setEventMessage($langs->trans("UserSynchronized"));
         $db->commit();
     }
     else
     {
-        $message.='<div class="error">'.$ldap->error.'</div>';
+        setEventMessage($ldap->error, 'errors');
         $db->rollback();
     }
 }
@@ -152,10 +150,6 @@
 
 print '</div>';
 
-
-dol_htmloutput_mesg($message);
-
-
 /*
  * Barre d'actions
  */

From ac824728bc8e172d062c7afacb838e190a4a4d27 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 01:09:43 +0200
Subject: [PATCH 2/4] Migrated old error notifications to the """new""" system

---
 htdocs/adherents/card_subscriptions.php |  4 +-
 htdocs/adherents/fiche.php              | 95 +++++++++++++------------
 htdocs/adherents/fiche_subscription.php |  2 -
 htdocs/adherents/type.php               |  2 -
 htdocs/admin/fiscalyear_card.php        | 16 ++---
 htdocs/admin/ldap_users.php             |  2 +-
 htdocs/admin/limits.php                 |  8 +--
 htdocs/admin/mails.php                  | 10 ++-
 htdocs/admin/menus/index.php            |  2 +-
 htdocs/admin/system/index.php           |  9 ++-
 htdocs/admin/tools/update.php           |  6 +-
 htdocs/bookmarks/fiche.php              | 26 ++++---
 htdocs/bookmarks/liste.php              |  4 +-
 htdocs/categories/traduction.php        |  8 +--
 htdocs/categories/viewcat.php           |  5 +-
 htdocs/comm/action/fiche.php            | 17 ++---
 htdocs/comm/remx.php                    | 16 ++---
 htdocs/commande/contact.php             |  5 +-
 htdocs/commande/fiche.php               | 50 ++++++-------
 htdocs/commande/orderstoinvoice.php     | 22 +++---
 htdocs/compta/bank/annuel.php           |  2 +-
 htdocs/compta/bank/bankid_fr.php        |  4 +-
 htdocs/compta/bank/fiche.php            |  6 +-
 htdocs/compta/bank/graph.php            |  5 +-
 htdocs/compta/bank/ligne.php            | 10 ++-
 htdocs/compta/bank/rappro.php           |  6 +-
 htdocs/compta/bank/treso.php            |  8 ---
 htdocs/compta/facture.php               | 50 +++++++------
 28 files changed, 178 insertions(+), 222 deletions(-)

diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index e436fd5f694e4..fa7d59f040e64 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -129,7 +129,7 @@
         if ($_POST["userid"] != $user->id && $_POST["userid"] != $object->user_id)
         {
             $error++;
-            $mesg='<div class="error">'.$langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly").'</div>';
+            setEventMessage($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), 'errors');
         }
     }
 
@@ -165,7 +165,7 @@
                     $thirdparty=new Societe($db);
                     $thirdparty->fetch(GETPOST('socid','int'));
                     $error++;
-                    $mesg='<div class="error">'.$langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name).'</div>';
+	                setEventMessage($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name), 'errors');
                 }
             }
 
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index e57e2b9eb1c7e..49eabe52d43e6 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -81,8 +81,6 @@
 // Security check
 $result=restrictedArea($user,'adherent',$rowid,'','','fk_soc', 'rowid', $objcanvas);
 
-$errmsg=''; $errmsgs=array();
-
 if ($rowid > 0)
 {
 	// Load member
@@ -128,7 +126,7 @@
 		if ($userid != $user->id && $userid != $object->user_id)
 		{
 			$error++;
-			$mesg='<div class="error">'.$langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly").'</div>';
+			setEventMessage($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), 'errors');
 		}
 	}
 
@@ -164,7 +162,7 @@
 					$thirdparty=new Societe($db);
 					$thirdparty->fetch($socid);
 					$error++;
-					$errmsg='<div class="error">'.$langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name).'</div>';
+					setEventMessage($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name), 'errors');
 				}
 			}
 
@@ -190,12 +188,12 @@
 		if ($result < 0)
 		{
 			$langs->load("errors");
-			$errmsg=$langs->trans($nuser->error);
+			setEventMessage($langs->trans($nuser->error), 'errors');
 		}
 	}
 	else
 	{
-		$errmsg=$object->error;
+		setEventMessage($object->error, 'errors');
 	}
 }
 
@@ -211,13 +209,13 @@
 		if ($result < 0)
 		{
 			$langs->load("errors");
-			$errmsg=$langs->trans($company->error);
-			$errmsgs=$company->errors;
+			setEventMessage($langs->trans($company->error), 'errors');
+			setEventMessage($company->errors, 'errors');
 		}
 	}
 	else
 	{
-		$errmsg=$object->error;
+		setEventMessage($object->error, 'errors');
 	}
 }
 
@@ -231,7 +229,7 @@
 		$result=$object->send_an_email($langs->transnoentitiesnoconv("ThisIsContentOfYourCard")."\n\n%INFOS%\n\n",$langs->transnoentitiesnoconv("CardContent"));
 
 		$langs->load("mails");
-		$mesg=$langs->trans("MailSuccessfulySent", $from, $object->email);
+		setEventMessage($langs->trans("MailSuccessfulySent", $from, $object->email));
 	}
 }
 
@@ -252,12 +250,12 @@
 	if ($morphy != 'mor' && empty($lastname)) {
 		$error++;
 		$langs->load("errors");
-		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname"))."<br>\n";
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname")), 'errors');
 	}
 	if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
 		$error++;
 		$langs->load("errors");
-		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Firstname"))."<br>\n";
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Firstname")), 'errors');
 	}
 
 	// Create new object
@@ -343,7 +341,7 @@
 						$newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
 						if (! dol_move_uploaded_file($_FILES['photo']['tmp_name'],$newfile,1,0,$_FILES['photo']['error']) > 0)
 						{
-							$message .= '<div class="error">'.$langs->trans("ErrorFailedToSaveFile").'</div>';
+							setEventMessage($langs->trans("ErrorFailedToSaveFile"), 'errors');
 						}
 						else
 						{
@@ -359,7 +357,7 @@
 				}
 				else
 				{
-					$errmsgs[] = "ErrorBadImageFormat";
+					setEventMessage("ErrorBadImageFormat", 'errors');
 				}
 			}
 			else
@@ -387,8 +385,11 @@
 		}
 		else
 		{
-			if ($object->error) $errmsg=$object->error;
-			else $errmsgs=$object->errors;
+			if ($object->error) {
+				setEventMessage($object->error, 'errors');
+			} else {
+				setEventMessage($object->errors, 'errors');
+			}
 			$action='';
 		}
 	}
@@ -472,14 +473,14 @@
 	// Check parameters
 	if (empty($morphy) || $morphy == "-1") {
 		$error++;
-		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Nature"))."<br>\n";
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Nature")), 'errors');
 	}
 	// Test si le login existe deja
 	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
 	{
 		if (empty($login)) {
 			$error++;
-			$errmsg .= $langs->trans("ErrorFieldRequired",$langs->trans("Login"))."<br>\n";
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Login")), 'errors');
 		}
 		else {
 			$sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape($login)."'";
@@ -490,32 +491,32 @@
 			if ($num) {
 				$error++;
 				$langs->load("errors");
-				$errmsg .= $langs->trans("ErrorLoginAlreadyExists",$login)."<br>\n";
+				setEventMessage($langs->trans("ErrorLoginAlreadyExists",$login), 'errors');
 			}
 		}
 		if (empty($pass)) {
 			$error++;
-			$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Password"))."<br>\n";
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Password")), 'errors');
 		}
 	}
 	if ($morphy != 'mor' && empty($lastname)) {
 		$error++;
 		$langs->load("errors");
-		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname"))."<br>\n";
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname")), 'errors');
 	}
 	if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
 		$error++;
 		$langs->load("errors");
-		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Firstname"))."<br>\n";
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Firstname")), 'errors');
 	}
 	if (! ($typeid > 0)) {	// Keep () before !
 		$error++;
-		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"))."<br>\n";
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")), 'errors');
 	}
 	if ($conf->global->ADHERENT_MAIL_REQUIRED && ! isValidEMail($email)) {
 		$error++;
 		$langs->load("errors");
-		$errmsg .= $langs->trans("ErrorBadEMail",$email)."<br>\n";
+		setEventMessage($langs->trans("ErrorBadEMail",$email), 'errors');
 	}
 	$public=0;
 	if (isset($public)) $public=1;
@@ -536,8 +537,11 @@
 		{
 			$db->rollback();
 
-			if ($object->error) $errmsg=$object->error;
-			else $errmsgs=$object->errors;
+			if ($object->error) {
+				setEventMessage($object->error, 'errors');
+			} else {
+				setEventMessage($object->errors, 'errors');
+			}
 
 			$action = 'create';
 		}
@@ -589,15 +593,18 @@
 			if ($result < 0)
 			{
 				$error++;
-				$errmsg.=$object->error;
+				setEventMessage($object->error, 'errors');
 			}
 		}
 	}
 	else
 	{
 		$error++;
-		if ($object->error) $errmsg=$object->error;
-		else $errmsgs=$object->errors;
+		if ($object->error) {
+			setEventMessage($object->error, 'errors');
+		} else {
+			setEventMessage($object->errors, 'errors');
+		}
 	}
 
 	if (! $error)
@@ -613,6 +620,8 @@
 
 if ($user->rights->adherent->supprimer && $action == 'confirm_resign')
 {
+	$error = 0;
+
 	if ($confirm == 'yes')
 	{
 		$adht = new AdherentType($db);
@@ -628,17 +637,23 @@
 			}
 			if ($result < 0)
 			{
-				$errmsg.=$object->error;
+				$error++;
+				setEventMessage($object->error, 'errors');
 			}
 		}
 		else
 		{
-			if ($object->error) $errmsg=$object->error;
-			else $errmsgs=$object->errors;
+			$error++;
+
+			if ($object->error) {
+				setEventMessage($object->error, 'errors');
+			} else {
+				setEventMessage($object->errors, 'errors');
+			}
 			$action='';
 		}
 	}
-	if (! empty($backtopage) && ! $errmsg)
+	if (! empty($backtopage) && ! $error)
 	{
 		header("Location: ".$backtopage);
 		exit;
@@ -652,7 +667,7 @@
 	{
 		if (!$mailmanspip->del_to_spip($object))
 		{
-			$errmsg.= $langs->trans('DeleteIntoSpipError').': '.$mailmanspip->error."<BR>\n";
+			setEventMessage($langs->trans('DeleteIntoSpipError').': '.$mailmanspip->error, 'errors');
 		}
 	}
 }
@@ -663,7 +678,7 @@
 	{
 		if (!$mailmanspip->add_to_spip($object))
 		{
-			$errmsg.= $langs->trans('AddIntoSpipError').': '.$mailmanspip->error."<BR>\n";
+			setEventMessage($langs->trans('AddIntoSpipError').': '.$mailmanspip->error, 'errors');
 		}
 	}
 }
@@ -725,9 +740,6 @@
 
 		print_fiche_titre($langs->trans("NewMember"));
 
-		dol_htmloutput_mesg($errmsg,$errmsgs,'error');
-		dol_htmloutput_mesg($mesg,$mesgs);
-
 		if ($conf->use_javascript_ajax)
 		{
 			print "\n".'<script type="text/javascript" language="javascript">';
@@ -952,9 +964,6 @@ function initfieldrequired()
 
 		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
 
-		dol_htmloutput_errors($errmsg,$errmsgs);
-		dol_htmloutput_mesg($mesg);
-
 		if ($conf->use_javascript_ajax)
 		{
 			print "\n".'<script type="text/javascript" language="javascript">';
@@ -1168,8 +1177,6 @@ function initfieldrequired()
 
 	if ($rowid && $action != 'edit')
 	{
-		dol_htmloutput_mesg($mesg);
-
 		/* ************************************************************************** */
 		/*                                                                            */
 		/* Mode affichage                                                             */
@@ -1199,8 +1206,6 @@ function initfieldrequired()
 
 		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
 
-		dol_htmloutput_errors($errmsg,$errmsgs);
-
 		// Confirm create user
 		if ($action == 'create_user')
 		{
diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php
index 950ff88861281..01a3ccc83fc72 100644
--- a/htdocs/adherents/fiche_subscription.php
+++ b/htdocs/adherents/fiche_subscription.php
@@ -282,8 +282,6 @@
 
 	dol_fiche_head($head, 'general', $langs->trans("Subscription"), '', 'payment');
 
-	if ($msg) print '<div class="error">'.$msg.'</div>';
-
     // Confirmation to delete subscription
     if ($action == 'delete')
     {
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index fafc7941aedcf..7dc0a43ac2675 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -237,8 +237,6 @@
 
 	print_fiche_titre($langs->trans("NewMemberType"));
 
-	if ($mesg) print '<div class="error">'.$mesg.'</div>';
-
 	print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<table class="border" width="100%">';
diff --git a/htdocs/admin/fiscalyear_card.php b/htdocs/admin/fiscalyear_card.php
index 81860a07ae125..b30cf2a69fcc9 100644
--- a/htdocs/admin/fiscalyear_card.php
+++ b/htdocs/admin/fiscalyear_card.php
@@ -46,8 +46,6 @@
 $statut2label=array('');
 foreach ($tmpstatut2label as $key => $val) $statut2label[$key]=$langs->trans($val);
 
-$mesg = '';
-
 $object = new Fiscalyear($db);
 
 $date_start=dol_mktime(0,0,0,GETPOST('fiscalyearmonth','int'),GETPOST('fiscalyearday','int'),GETPOST('fiscalyearyear','int'));
@@ -67,7 +65,7 @@
     }
     else
     {
-        $mesg=$object->error;
+        setEventMessage($object->error, 'errors');
     }
 }
 
@@ -87,12 +85,12 @@
 
         if (empty($object->date_start) && empty($object->date_end))
         {
-            $mesg.=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date"));
+	        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")), 'errors');
             $error++;
         }
         if (empty($object->label))
         {
-            $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Label")).'</div>';
+	        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Label")), 'errors');
             $error++;
         }
 
@@ -107,7 +105,7 @@
             }
             else
             {
-                $mesg=$object->error;
+	            setEventMessage($object->error, 'errors');
                 $action='create';
             }
         }
@@ -144,7 +142,7 @@
         }
         else
         {
-            $mesg=$object->error;
+	        setEventMessage($object->error, 'errors');
         }
     }
     else
@@ -169,8 +167,6 @@
 {
     print_fiche_titre($langs->trans("NewFiscalYear"));
 
-    dol_htmloutput_errors($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">';
@@ -209,8 +205,6 @@
     $result = $object->fetch($id);
     if ($result > 0)
     {
-        dol_htmloutput_mesg($mesg);
-
         $head = fiscalyear_prepare_head($object);
 
         dol_fiche_head($head, 'card', $langs->trans("FiscalYearCard"), 0, 'cron');
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 386bc19ff739c..32e5310a201d7 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -427,7 +427,7 @@
             }
             else
            {
-                $mesg='<div class="error">'.$ldap->error.'</div>';
+                setEventMessage($ldap->error, 'errors');
             }
 
 			print "<br>\n";
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 69237fe4f74e6..26f6c08aee926 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -43,7 +43,7 @@
     || $_POST["MAIN_MAX_DECIMALS_SHOWN"] > $MAXDEC)
     {
         $error++;
-        $mesg='<div class="error">'.$langs->trans("ErrorDecimalLargerThanAreForbidden",$MAXDEC).'</div>';
+	    setEventMessage($langs->trans("ErrorDecimalLargerThanAreForbidden",$MAXDEC), 'errors');
     }
 
     if ($_POST["MAIN_MAX_DECIMALS_UNIT"]  < 0
@@ -52,7 +52,7 @@
     {
         $langs->load("errors");
         $error++;
-        $mesg='<div class="error">'.$langs->trans("ErrorNegativeValueNotAllowed").'</div>';
+	    setEventMessage($langs->trans("ErrorNegativeValueNotAllowed"), 'errors');
     }
 
     if ($_POST["MAIN_ROUNDING_RULE_TOT"])
@@ -61,7 +61,7 @@
         {
             $langs->load("errors");
             $error++;
-            $mesg='<div class="error">'.$langs->trans("ErrorMAIN_ROUNDING_RULE_TOTCanMAIN_MAX_DECIMALS_TOT").'</div>';
+	        setEventMessage($langs->trans("ErrorMAIN_ROUNDING_RULE_TOTCanMAIN_MAX_DECIMALS_TOT"), 'errors');
         }
     }
 
@@ -94,8 +94,6 @@
 print $langs->trans("LimitsDesc")."<br>\n";
 print "<br>\n";
 
-if ($mesg) print $mesg.'<br>';
-
 if ($action == 'edit')
 {
     print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 78ce79c491291..61914d1a09c6d 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -653,9 +653,13 @@ function initfields()
 		if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'</div>';
 		else
 		{
-			print '<div class="error">'.$langs->trans("ServerNotAvailableOnIPOrPort",$server,$port);
-			if ($mail->error) print ' - '.$mail->error;
-			print '</div>';
+			$errormsg = $langs->trans("ServerNotAvailableOnIPOrPort",$server,$port);
+
+			if ($mail->error) {
+				$errormsg .= ' - '.$mail->error;
+			}
+
+			setEventMessage($errormsg, 'errors');
 		}
 		print '<br>';
 	}
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index bade95cdcce1c..d6a7d15126711 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -360,7 +360,7 @@
 else
 {
 	$langs->load("errors");
-	print '<div class="error">'.$langs->trans("ErrorFeatureNeedJavascript").'</div>';
+	setEventMessage($langs->trans("ErrorFeatureNeedJavascript"), 'errors');
 }
 
 print '<br>';
diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php
index 70464aa157801..a9d6cfa1afb39 100644
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@@ -95,11 +95,10 @@
 {
 	// Check option standard_conforming_strings is on
 	$paramarray=$db->getServerParametersValues('standard_conforming_strings');
-	if ($paramarray['standard_conforming_strings'] != 'on' && $paramarray['standard_conforming_strings'] != 1)
-	{
-		$langs->load("errors");
-		//print '<div class="error">'.$langs->trans("ErrorDatabaseParameterWrong",'standard_conforming_strings','on').'</div>';
-	}
+//	if ($paramarray['standard_conforming_strings'] != 'on' && $paramarray['standard_conforming_strings'] != 1)
+//	{
+//		$langs->load("errors");
+//	}
 }
 print '<br>';
 
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 15d5b5f3d5278..18a5516819157 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -30,7 +30,9 @@
 
 if (! $user->admin) accessforbidden();
 
-if (GETPOST('msg','alpha')) $message='<div class="error">'.GETPOST('msg','alpha').'</div>';
+if (GETPOST('msg','alpha')) {
+	setEventMessage(GETPOST('msg','alpha'), 'errors');
+}
 
 
 $urldolibarr='http://www.dolibarr.org/downloads/';
@@ -148,7 +150,7 @@
 	else
 	{
 		$message=info_admin($langs->trans("NotExistsDirect",$dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
-		print '<div class="warning">'.$message.'</div>';
+		setEventMessage($message, 'warnings');
 	}
 }
 else
diff --git a/htdocs/bookmarks/fiche.php b/htdocs/bookmarks/fiche.php
index 6167d6cd6695d..6a7394f6fc6dc 100644
--- a/htdocs/bookmarks/fiche.php
+++ b/htdocs/bookmarks/fiche.php
@@ -50,6 +50,8 @@
 
 if ($action == 'add' || $action == 'addproduct' || $action == 'update')
 {
+	$error = 0;
+
 	if (GETPOST("cancel"))
 	{
 		if (empty($backtopage)) $backtopage=(GETPOST("urlsource")?GETPOST("urlsource"):((! empty($url))?$url:DOL_URL_ROOT.'/bookmarks/liste.php'));
@@ -57,8 +59,6 @@
 		exit;
 	}
 
-	$mesg='';
-
 	$bookmark=new Bookmark($db);
 	if ($action == 'update') $bookmark->fetch($_POST["id"]);
 	$bookmark->fk_user=$userid;
@@ -67,10 +67,17 @@
 	$bookmark->target=$target;
 	$bookmark->position=$position;
 
-	if (! $title) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("BookmarkTitle"));
-	if (! $url)   $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("UrlOrLink"));
+	if (! $title) {
+		$error++;
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("BookmarkTitle")), 'errors');
+	}
+
+	if (! $url) {
+		$error++;
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("UrlOrLink")), 'errors');
+	}
 
-	if (! $mesg)
+	if (! $error)
 	{
 		$bookmark->favicon='none';
 
@@ -88,18 +95,17 @@
 			if ($bookmark->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				$langs->load("errors");
-				$mesg='<div class="warning">'.$langs->trans("WarningBookmarkAlreadyExists").'</div>';
+				setEventMessage($langs->trans("WarningBookmarkAlreadyExists"), 'warnings');
 			}
 			else
 			{
-				$mesg='<div class="error">'.$bookmark->error.'</div>';
+				setEventMessage($bookmark->error, 'errors');
 			}
 			$action='create';
 		}
 	}
 	else
 	{
-		$mesg='<div class="error">'.$mesg.'</div>';
 		$action='create';
 	}
 }
@@ -121,7 +127,7 @@
 	}
 	else
 	{
-		$mesg='<div class="error">'.$bookmark->error.'</div>';
+		setEventMessage($bookmark->error, 'errors');
 	}
 }
 
@@ -149,8 +155,6 @@
 
 	dol_fiche_head($head, $hselected, $langs->trans("Bookmark"),0,'bookmark');
 	
-	dol_htmloutput_mesg($mesg);
-
 	print '<table class="border" width="100%">';
 
 	print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("BookmarkTitle").'</td><td><input class="flat" name="title" size="30" value="'.$title.'"></td><td class="hideonsmartphone">'.$langs->trans("SetHereATitleForLink").'</td></tr>';
diff --git a/htdocs/bookmarks/liste.php b/htdocs/bookmarks/liste.php
index c3524ae5d4367..87f98072045d6 100644
--- a/htdocs/bookmarks/liste.php
+++ b/htdocs/bookmarks/liste.php
@@ -58,7 +58,7 @@
     }
     else
     {
-        $mesg='<div class="error">'.$bookmark->error.'</div>';
+        $setEventMessage($bookmark->error, 'errors');
     }
 }
 
@@ -73,8 +73,6 @@
 
 print_fiche_titre($langs->trans("Bookmarks"));
 
-if ($mesg) print $mesg;
-
 $sql = "SELECT b.fk_soc as rowid, b.dateb, b.rowid as bid, b.fk_user, b.url, b.target, b.title, b.favicon, b.position,";
 $sql.= " u.login, u.lastname, u.firstname";
 $sql.= " FROM ".MAIN_DB_PREFIX."bookmark as b LEFT JOIN ".MAIN_DB_PREFIX."user as u ON b.fk_user=u.rowid";
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index 15e8f7f6a5fcc..0c154a0b72f04 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -94,7 +94,7 @@
 	else
 	{
 		$action = 'add';
-		$mesg = '<div class="error">'.$object->error.'</div>';
+		setEventMessage($object->error, 'errors');
 	}
 }
 
@@ -127,7 +127,7 @@
 	else
 	{
 		$action = 'edit';
-		$mesg = '<div class="error">'.$object->error.'</div>';
+		setEventMessage($object->error, 'errors');
 	}
 }
 
@@ -153,10 +153,6 @@
 $head = categories_prepare_head($object,$type);
 dol_fiche_head($head, 'translation', $title, 0, 'category');
 
-if (! empty($mesg)) {
-	dol_htmloutput_mesg($mesg);
-}
-
 print '<table class="border" width="100%">';
 
 // Reference
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index d0a4d2751dfad..898d66265393d 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -32,7 +32,6 @@
 
 $langs->load("categories");
 
-$mesg = '';
 $id=GETPOST('id','int');
 $ref=GETPOST('ref');
 $type=GETPOST('type');
@@ -117,7 +116,7 @@
 	}
 	else
 	{
-		$mesg='<div class="error">'.$object->error.'</div>';
+		setEventMessage($object->error, 'errors');
 	}
 }
 
@@ -131,8 +130,6 @@
 
 llxHeader("","",$langs->trans("Categories"));
 
-dol_htmloutput_mesg($mesg);
-
 if ($type == 0) $title=$langs->trans("ProductsCategoryShort");
 elseif ($type == 1) $title=$langs->trans("SuppliersCategoryShort");
 elseif ($type == 2) $title=$langs->trans("CustomersCategoryShort");
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index ca17c261680d7..ad16cca00f626 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -62,7 +62,6 @@
 if ($user->societe_id && $socid) $result = restrictedArea($user,'societe',$socid);
 
 $error=GETPOST("error");
-$mesg='';
 
 $cactioncomm = new CActionComm($db);
 $object = new ActionComm($db);
@@ -116,14 +115,14 @@
 	{
 		$error++;
 		$action = 'create';
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")), 'errors');
 	}
 
 	if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && ! GETPOST('label'))
 	{
 		$error++;
 		$action = 'create';
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Title")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Title")), 'errors');
 	}
 
 	// Initialisation objet cactioncomm
@@ -131,7 +130,7 @@
 	{
 		$error++;
 		$action = 'create';
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")), 'errors');
 	}
 	else
 	{
@@ -201,14 +200,14 @@
 	{
 		$error++;
 		$action = 'create';
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")), 'errors');
 	}
 
 	if (! GETPOST('apyear') && ! GETPOST('adyear'))
 	{
 		$error++;
 		$action = 'create';
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")), 'errors');
 	}
 
 	// Fill array 'array_options' with data from add form
@@ -458,8 +457,6 @@ function setdatefields()
 	if (GETPOST("actioncode") == 'AC_RDV') print_fiche_titre($langs->trans("AddActionRendezVous"));
 	else print_fiche_titre($langs->trans("AddAnAction"));
 
-	dol_htmloutput_mesg($mesg);
-
 	print '<table class="border" width="100%">';
 
 	// Type d'action actifs
@@ -644,10 +641,6 @@ function setdatefields()
 	{
 		dol_htmloutput_errors($error);
 	}
-	if ($mesg)
-	{
-		dol_htmloutput_mesg($mesg);
-	}
 
 	$result=$object->fetch($id);
 	$object->fetch_optionals($id,$extralabels);
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index db35db04b14cd..905f73e3c9b9b 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -65,17 +65,17 @@
 	if (! $res > 0)
 	{
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("ErrorFailedToLoadDiscount").'</div>';
+		setEventMessage($langs->trans("ErrorFailedToLoadDiscount"), 'errors');
 	}
 	if (! $error && price2num($_POST["amount_ttc_1"]+$_POST["amount_ttc_2"]) != $discount->amount_ttc)
 	{
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("TotalOfTwoDiscountMustEqualsOriginal").'</div>';
+		setEventMessage($langs->trans("TotalOfTwoDiscountMustEqualsOriginal"), 'errors');
 	}
 	if (! $error && $discount->fk_facture_line)
 	{
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("ErrorCantSplitAUsedDiscount").'</div>';
+		setEventMessage($langs->trans("ErrorCantSplitAUsedDiscount"), 'errors');
 	}
 	if (! $error)
 	{
@@ -140,7 +140,7 @@
 		$error=0;
 		if (empty($_POST["desc"]))
 		{
-			$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("ReasonDiscount")).'</div>';
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("ReasonDiscount")), 'errors');
 			$error++;
 		}
 
@@ -166,13 +166,13 @@
 			else
 			{
 				$error++;
-				$mesg='<div class="error">'.$soc->error.'</div>';
+				setEventMessage($soc->error, 'errors');
 			}
 		}
 	}
 	else
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldFormat",$langs->trans("NewGlobalDiscount")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldFormat",$langs->trans("NewGlobalDiscount")), 'errors');
 	}
 }
 
@@ -194,7 +194,7 @@
 	}
 	else
 	{
-		$mesg='<div class="error">'.$discount->error.'</div>';
+		setEventMessage($discount->error, 'errors');
 		$db->rollback();
 	}
 }
@@ -211,8 +211,6 @@
 
 if ($socid > 0)
 {
-	dol_htmloutput_mesg($mesg);
-
 	// On recupere les donnees societes par l'objet
 	$objsoc = new Societe($db);
 	$objsoc->id=$socid;
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index e4b30a6e60dc9..5a886664c1786 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -69,11 +69,11 @@
 		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');
 		}
 	}
 }
@@ -132,7 +132,6 @@
 /* Mode vue et edition                                                         */
 /*                                                                             */
 /* *************************************************************************** */
-dol_htmloutput_mesg($mesg);
 
 if ($id > 0 || ! empty($ref))
 {
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 7bf3705c07d4d..52cc27a42efab 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -65,8 +65,6 @@
 $origin = GETPOST('origin', 'alpha');
 $originid = (GETPOST('originid', 'int') ? GETPOST('originid', 'int') : GETPOST('origin_id', 'int')); // For backward compatibility
 
-$mesg = GETPOST('mesg');
-
 // PDF
 $hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
 $hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
@@ -108,7 +106,7 @@
 {
 	if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
 	{
-		$mesg='<div class="error">'.$langs->trans("NoCloneOptionsSpecified").'</div>';
+		setEventMessage($langs->trans("NoCloneOptionsSpecified"), 'errors');
 	}
 	else
 	{
@@ -201,7 +199,7 @@
 	$datelivraison = dol_mktime(12, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
 
 	if ($datecommande == '') {
-		$mesg = '<div class="error">' . $langs->trans('ErrorFieldRequired', $langs->transnoentities('Date')) . '</div>';
+		setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentities('Date')), 'errors');
 		$action = 'create';
 		$error ++;
 	}
@@ -340,11 +338,11 @@
 						if ($reshook < 0)
 							$error ++;
 					} else {
-						$mesg = $srcobject->error;
+						setEventMessage($srcobject->error, 'errors');
 						$error ++;
 					}
 				} else {
-					$mesg = $object->error;
+					setEventMessage($object->error, 'errors');
 					$error ++;
 				}
 			} else {
@@ -378,7 +376,7 @@
 			if (GETPOST('contactidp')) {
 				$result = $object->add_contact(GETPOST('contactidp'), 'CUSTOMER', 'external');
 				if ($result < 0) {
-					$mesg = '<div class="error">' . $langs->trans("ErrorFailedToAddContact") . '</div>';
+					setEventMessage($langs->trans("ErrorFailedToAddContact"), 'errors');
 					$error ++;
 				}
 			}
@@ -395,8 +393,7 @@
 		} else {
 			$db->rollback();
 			$action = 'create';
-			if (! $mesg)
-				$mesg = '<div class="error">' . $object->error . '</div>';
+			setEventMessage($object->error, 'errors');
 		}
 	}
 }
@@ -435,7 +432,7 @@
 
 	$result = $object->set_date($user, $date);
 	if ($result < 0) {
-		$mesg = '<div class="error">' . $object->error . '</div>';
+		setEventMessage($object->error, 'errors');
 	}
 }
 
@@ -445,7 +442,7 @@
 
 	$result = $object->set_date_livraison($user, $datelivraison);
 	if ($result < 0) {
-		$mesg = '<div class="error">' . $object->error . '</div>';
+		setEventMessage($object->error, 'errors');
 	}
 }
 
@@ -884,7 +881,7 @@
 		if (! $idwarehouse || $idwarehouse == -1)
 		{
 			$error++;
-			$mesgs[]='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")).'</div>';
+			setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), 'errors');
 			$action='';
 		}
 	}
@@ -929,7 +926,7 @@
 		if (! $idwarehouse || $idwarehouse == -1)
 		{
 			$error++;
-			$mesgs[]='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")).'</div>';
+			setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), 'errors');
 			$action='';
 		}
 	}
@@ -982,7 +979,7 @@
 		if (! $idwarehouse || $idwarehouse == -1)
 		{
 			$error++;
-			$mesgs[]='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")).'</div>';
+			setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), 'errors');
 			$action='';
 		}
 	}
@@ -1221,12 +1218,13 @@
 			require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
 			$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, - 1);
 			if ($mailfile->error) {
-				$mesg = '<div class="error">' . $mailfile->error . '</div>';
+				setEventMessage($mailfile->error, 'errors');
 			} else {
 				$result = $mailfile->sendfile();
 				if ($result) {
-					$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($sendto, 2)); // Must not
-					                                                                                                                      // contains "
+					//Must not contain quotes
+					$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($sendto, 2));
+					setEventMessage($mesg);
 
 					$error = 0;
 
@@ -1253,19 +1251,19 @@
 					} else {
 						// Redirect here
 						// This avoid sending mail twice if going out and then back to page
-						header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&mesg=' . urlencode($mesg));
+						header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
 						exit();
 					}
 				} else {
 					$langs->load("other");
-					$mesg = '<div class="error">';
 					if ($mailfile->error) {
 						$mesg .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
 						$mesg .= '<br>' . $mailfile->error;
 					} else {
 						$mesg .= 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 					}
-					$mesg .= '</div>';
+
+					setEventMessage($mesg, 'errors');
 				}
 			}
 			/*            }
@@ -1278,12 +1276,12 @@
 			}*/
 		} else {
 			$langs->load("errors");
-			$mesg = '<div class="error">' . $langs->trans('ErrorCantReadFile', $file) . '</div>';
+			setEventMessage($langs->trans('ErrorCantReadFile', $file), 'errors');
 			dol_syslog('Failed to read file: ' . $file);
 		}
 	} else {
 		$langs->load("other");
-		$mesg = '<div class="error">' . $langs->trans('ErrorFailedToReadEntity', $langs->trans("Order")) . '</div>';
+		setEventMessage($langs->trans('ErrorFailedToReadEntity', $langs->trans("Order")), 'errors');
 		dol_syslog($langs->trans('ErrorFailedToReadEntity', $langs->trans("Order")));
 	}
 }
@@ -1301,9 +1299,9 @@
 		} else {
 			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');
 			}
 		}
 	}
@@ -1350,8 +1348,6 @@
 if ($action == 'create' && $user->rights->commande->creer) {
 	print_fiche_titre($langs->trans('CreateOrder'));
 
-	dol_htmloutput_mesg($mesg, $mesgs, 'error');
-
 	$soc = new Societe($db);
 	if ($socid > 0)
 		$res = $soc->fetch($socid);
@@ -1671,8 +1667,6 @@
 	$now = dol_now();
 
 	if ($object->id > 0) {
-		dol_htmloutput_mesg($mesg, $mesgs);
-
 		$product_static = new Product($db);
 
 		$soc = new Societe($db);
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index bdb96718dfad6..8b16428b23f12 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -58,6 +58,8 @@
 $sortorder		= GETPOST("sortorder",'alpha');
 $viewstatut		= GETPOST('viewstatut');
 
+$error = 0;
+
 if (! $sortfield) $sortfield='c.rowid';
 if (! $sortorder) $sortorder='DESC';
 
@@ -71,7 +73,8 @@
 {
 	if (is_array($selected) == false)
 	{
-		$mesgs = array('<div class="error">'.$langs->trans('Error_OrderNotChecked').'</div>');
+		$error++;
+		setEventMessage($langs->trans('Error_OrderNotChecked'), 'errors');
 	}
 	else
 	{
@@ -90,7 +93,7 @@
  * Actions
  */
 
-if (($action == 'create' || $action == 'add') && empty($mesgs))
+if (($action == 'create' || $action == 'add') && !$error)
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
@@ -244,7 +247,7 @@
 										}
 										else
 										{
-											$mesgs[]=$discount->error;
+											setEventMessage($discount->error, 'errors');
 											$error++;
 											break;
 										}
@@ -313,7 +316,7 @@
 							}
 							else
 							{
-								$mesgs[]=$objectsrc->error;
+								setEventMessage($objectsrc->error, 'errors');
 								$error++;
 							}
 							$ii++;
@@ -321,7 +324,7 @@
 					}
 					else
 					{
-						$mesgs[]=$object->error;
+						setEventMessage($object->error, 'errors');
 						$error++;
 					}
 				}
@@ -341,7 +344,8 @@
 			$action='create';
 			$_GET["origin"]=$_POST["origin"];
 			$_GET["originid"]=$_POST["originid"];
-			$mesgs[]='<div class="error">'.$object->error.'</div>';
+			setEventMessage($object->error, 'errors');
+			$error++;
 		}
 	}
 }
@@ -357,7 +361,7 @@
 $companystatic = new Societe($db);
 
 // Mode creation
-if ($action == 'create' && empty($mesgs))
+if ($action == 'create' && !$error)
 {
 	$facturestatic=new Facture($db);
 
@@ -497,7 +501,7 @@
 
 
 //Mode liste
-if (($action != 'create' && $action != 'add') || ! empty($mesgs))
+if (($action != 'create' && $action != 'add') || !$error)
 {
 	llxHeader();
 	?>
@@ -693,7 +697,5 @@
 
 }
 
-dol_htmloutput_mesg($mesg,$mesgs);
-
 llxFooter();
 $db->close();
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index e54c501fdab5b..30cf5b9c5ace1 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -289,7 +289,7 @@
 {
 	$langs->load("errors");
 	$error++;
-	$mesg='<div class="error">'.$langs->trans("ErrorFailedToCreateDir").'</div>';
+	setEventMessage($langs->trans("ErrorFailedToCreateDir"), 'errors');
 }
 else
 {
diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php
index 3c298e1c0b04b..9bd451b8caa58 100644
--- a/htdocs/compta/bank/bankid_fr.php
+++ b/htdocs/compta/bank/bankid_fr.php
@@ -79,7 +79,7 @@
 		}
 		else
 		{
-			$message='<div class="error">'.$account->error.'</div>';
+			setEventMessage($account->error, 'errors');
 			$action='edit';     // Force chargement page edition
 		}
 	}
@@ -304,8 +304,6 @@
 	print_fiche_titre($langs->trans("EditFinancialAccount"));
 	print "<br>";
 
-	dol_htmloutput_mesg($message);
-
 	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$account->id.'" method="post">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="update">';
diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php
index 57c5e2b075a5b..58a26007e85c4 100644
--- a/htdocs/compta/bank/fiche.php
+++ b/htdocs/compta/bank/fiche.php
@@ -181,7 +181,7 @@
         }
         else
         {
-            $message='<div class="error">'.$account->error.'</div>';
+	        setEventMessage($account->error, 'errors');
             $action='edit';     // Force chargement page edition
         }
     }
@@ -220,8 +220,6 @@
 
 	print_fiche_titre($langs->trans("NewFinancialAccount"));
 
-	dol_htmloutput_mesg($message);
-
     if ($conf->use_javascript_ajax)
     {
         print "\n".'<script type="text/javascript" language="javascript">';
@@ -510,8 +508,6 @@
         print_fiche_titre($langs->trans("EditFinancialAccount"));
         print "<br>";
 
-        if ($message) { print "$message<br>\n"; }
-
         if ($conf->use_javascript_ajax)
         {
             print "\n".'<script type="text/javascript" language="javascript">';
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 7a7f03c7d9826..9351cc5fa9ae3 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -46,7 +46,6 @@
 $account=$_GET["account"];
 $mode='standard';
 if (isset($_GET["mode"]) && $_GET["mode"] == 'showalltime') $mode='showalltime';
-$mesg = '';
 $error=0;
 
 
@@ -82,7 +81,7 @@
 {
 	$langs->load("errors");
 	$error++;
-	$mesg='<div class="error">'.$langs->trans("ErrorFailedToCreateDir").'</div>';
+	setEventMessage($langs->trans("ErrorFailedToCreateDir"), 'errors');
 }
 else
 {
@@ -756,8 +755,6 @@
 $head=bank_prepare_head($acct);
 dol_fiche_head($head,'graph',$langs->trans("FinancialAccount"),0,'account');
 
-if ($mesg) print $mesg.'<br>';
-
 print '<table class="border" width="100%">';
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 1ebc99a344d8c..89fd5727dc79e 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -99,7 +99,7 @@
 
 	if ($ac->courant == 2 && $_POST['value'] != 'LIQ')
 	{
-		$mesg = '<div class="error">'.$langs->trans("ErrorCashAccountAcceptsOnlyCashMoney").'</div>';
+		setEventMessage($langs->trans("ErrorCashAccountAcceptsOnlyCashMoney"), 'errors');
 		$error++;
 	}
 
@@ -141,7 +141,7 @@
 		$result = $db->query($sql);
 		if ($result)
 		{
-			$mesg=$langs->trans("RecordSaved");
+			setEventMessage($langs->trans("RecordSaved"));
 			$db->commit();
 		}
 		else
@@ -161,7 +161,7 @@
     // Check parameters
     if ($rappro && empty($num_rel))
     {
-        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountStatement"));
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountStatement")), 'errors');
         $error++;
     }
 
@@ -179,7 +179,7 @@
         $result = $db->query($sql);
         if ($result)
         {
-            $mesg=$langs->trans("RecordSaved");
+	        setEventMessage($langs->trans("RecordSaved"));
             $db->commit();
         }
         else
@@ -235,8 +235,6 @@
 
 dol_fiche_head($tabs, 0, $langs->trans('LineRecord'), 0, 'account');
 
-dol_htmloutput_mesg($mesg);
-
 $sql = "SELECT b.rowid,b.dateo as do,b.datev as dv, b.amount, b.label, b.rappro,";
 $sql.= " b.num_releve, b.fk_user_author, b.num_chq, b.fk_type, b.fk_account, b.fk_bordereau as receiptid,";
 $sql.= " b.emetteur,b.banque";
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index f8d3ccd0bc77b..37c27afc0b6f8 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -69,7 +69,7 @@
 					$result=$bankline->update_conciliation($user,$_POST["cat"]);
 					if ($result < 0)
 					{
-						$mesg.=$bankline->error;
+						setEventMessage($bankline->error, 'errors');
 						$error++;
 						break;
 					}
@@ -81,7 +81,7 @@
     {
     	$error++;
     	$langs->load("errors");
-        $mesg='<div class="error">'.$langs->trans("ErrorPleaseTypeBankTransactionReportName").'</div>';
+	    setEventMessage($langs->trans("ErrorPleaseTypeBankTransactionReportName"), 'errors');
     }
 
     if (! $error)
@@ -183,8 +183,6 @@
     print_fiche_titre($langs->trans("Reconciliation").': <a href="account.php?account='.$acct->id.'">'.$acct->label.'</a>');
     print '<br>';
 
-    dol_htmloutput_mesg($mesg);
-
     // Show last bank receipts
     $nbmax=5;
     $liste="";
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 8ae2974b33ff4..909770cf38c7d 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -49,10 +49,6 @@
 $vline=isset($_GET["vline"])?$_GET["vline"]:$_POST["vline"];
 $page=isset($_GET["page"])?$_GET["page"]:0;
 
-$mesg='';
-
-
-
 /*
  * View
  */
@@ -115,10 +111,6 @@
 
 	print '<br>';
 
-
-	if ($mesg) print '<div class="error">'.$mesg.'</div>';
-
-
 	$solde = $acct->solde(0);
 
 	/*
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 29a257608866b..f93e9a2032f2a 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -115,9 +115,9 @@
 
 // Action clone object
 if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->facture->creer) {
-	if (1 == 0 && empty($_REQUEST["clone_content"]) && empty($_REQUEST["clone_receivers"])) {
-		$mesgs [] = '<div class="error">' . $langs->trans("NoCloneOptionsSpecified") . '</div>';
-	} else {
+//	if (1 == 0 && empty($_REQUEST["clone_content"]) && empty($_REQUEST["clone_receivers"])) {
+//		$mesgs [] = '<div class="error">' . $langs->trans("NoCloneOptionsSpecified") . '</div>';
+//	} else {
 		if ($object->fetch($id) > 0) {
 			$result = $object->createFromClone($socid);
 			if ($result > 0) {
@@ -128,7 +128,7 @@
 				$action = '';
 			}
 		}
-	}
+//	}
 }
 
 // Change status of invoice
@@ -216,13 +216,13 @@
 	if ($object->type == Facture::TYPE_CREDIT_NOTE) {
 		// Si avoir, le signe doit etre negatif
 		if ($object->total_ht >= 0) {
-			$mesgs [] = '<div class="error">' . $langs->trans("ErrorInvoiceAvoirMustBeNegative") . '</div>';
+			setEventMessage($langs->trans("ErrorInvoiceAvoirMustBeNegative"), 'errors');
 			$action = '';
 		}
 	} else {
 		// Si non avoir, le signe doit etre positif
 		if (empty($conf->global->FACTURE_ENABLE_NEGATIVE) && $object->total_ht < 0) {
-			$mesgs [] = '<div class="error">' . $langs->trans("ErrorInvoiceOfThisTypeMustBePositive") . '</div>';
+			setEventMessage($langs->trans("ErrorInvoiceOfThisTypeMustBePositive"), 'errors');
 			$action = '';
 		}
 	}
@@ -319,7 +319,7 @@
 		if ($ret > 0) {
 			$result = $object->insert_discount($_POST["remise_id"]);
 			if ($result < 0) {
-				$mesgs [] = '<div class="error">' . $object->error . '</div>';
+				setEventMessage($object->error, 'errors');
 			}
 		} else {
 			dol_print_error($db, $object->error);
@@ -332,7 +332,7 @@
 
 		$result = $discount->link_to_invoice(0, $id);
 		if ($result < 0) {
-			$mesgs [] = '<div class="error">' . $discount->error . '</div>';
+			setEventMessage($discount->error, 'errors');
 		}
 	}
 }
@@ -571,7 +571,6 @@
 			$result = $object->set_paid($user);
 			if ($result >= 0)
 			{
-				//$mesgs[]='OK'.$discount->id;
 				$db->commit();
 			}
 			else
@@ -642,8 +641,9 @@
 			$object->type = Facture::TYPE_REPLACEMENT;
 
 			$id = $object->createFromCurrent($user);
-			if ($id <= 0)
-				$mesgs [] = $object->error;
+			if ($id <= 0) {
+				setEventMessage($object->error, 'errors');
+			}
 		}
 	}
 
@@ -888,7 +888,7 @@
 									$amountdeposit = ($totalamount * $valuedeposit) / 100;
 								}
 							} else {
-								$mesgs [] = $srcobject->error;
+								setEventMessage($srcobject->error, 'errors');
 								$error ++;
 							}
 						}
@@ -955,7 +955,7 @@
 									if ($discountid > 0) {
 										$result = $object->insert_discount($discountid); // This include link_to_invoice
 									} else {
-										$mesgs [] = $discount->error;
+										setEventMessage($discount->error, 'errors');
 										$error ++;
 										break;
 									}
@@ -1016,12 +1016,12 @@
 							if ($reshook < 0)
 								$error ++;
 						} else {
-							$mesgs [] = $srcobject->error;
+							setEventMessage($srcobject->error, 'errors');
 							$error ++;
 						}
 					}
 				} else {
-					$mesgs [] = $object->error;
+					setEventMessage($object->error, 'errors');
 					$error ++;
 				}
 			} 			// If some invoice's lines already known
@@ -1054,7 +1054,7 @@
 		$action = 'create';
 		$_GET ["origin"] = $_POST["origin"];
 		$_GET ["originid"] = $_POST["originid"];
-		$mesgs [] = '<div class="error">' . $object->error . '</div>';
+		setEventMessage($object->error, 'errors');
 	}
 }
 
@@ -1606,7 +1606,7 @@
 			require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
 			$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, - 1);
 			if ($mailfile->error) {
-				$mesgs [] = '<div class="error">' . $mailfile->error . '</div>';
+				setEventMessage($mailfile->error, 'errors');
 			} else {
 				$result = $mailfile->sendfile();
 				if ($result) {
@@ -1642,15 +1642,15 @@
 					}
 				} else {
 					$langs->load("other");
-					$mesg = '<div class="error">';
+
 					if ($mailfile->error) {
 						$mesg .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
 						$mesg .= '<br>' . $mailfile->error;
 					} else {
 						$mesg .= 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 					}
-					$mesg .= '</div>';
-					$mesgs [] = $mesg;
+
+					setEventMessage($mesg, 'errors');
 				}
 			}
 			/*            }
@@ -1662,12 +1662,12 @@
 			}*/
 		} else {
 			$langs->load("errors");
-			$mesgs [] = '<div class="error">' . $langs->trans('ErrorCantReadFile', $file) . '</div>';
+			setEventMessage($langs->trans('ErrorCantReadFile', $file), 'errors');
 			dol_syslog('Failed to read file: ' . $file);
 		}
 	} else {
 		$langs->load("other");
-		$mesgs [] = '<div class="error">' . $langs->trans('ErrorFailedToReadEntity', $langs->trans("Invoice")) . '</div>';
+		setEventMessage($langs->trans('ErrorFailedToReadEntity', $langs->trans("Invoice")), 'errors');
 		dol_syslog('Impossible de lire les donnees de la facture. Le fichier facture n\'a peut-etre pas ete genere.');
 	}
 
@@ -1749,9 +1749,9 @@
 		} else {
 			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				$langs->load("errors");
-				$mesgs [] = '<div class="error">' . $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType") . '</div>';
+				setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
 			} else {
-				$mesgs [] = '<div class="error">' . $object->error . '</div>';
+				setEventMessage($object->error, 'errors');
 			}
 		}
 	}
@@ -3764,7 +3764,5 @@
 	}
 }
 
-dol_htmloutput_mesg('', $mesgs);
-
 llxFooter();
 $db->close();

From 43597c17319bdd114d50d391ec826f28e8ba157a 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 01:43:46 +0200
Subject: [PATCH 3/4] Migrated old error notifications to the """new""" system

---
 htdocs/adherents/card_subscriptions.php      |  9 ++-
 htdocs/admin/boxes.php                       |  8 +--
 htdocs/admin/fckeditor.php                   |  5 +-
 htdocs/admin/fiscalyear.php                  |  3 -
 htdocs/admin/menus.php                       |  9 +--
 htdocs/barcode/codeinit.php                  |  4 --
 htdocs/categories/edit.php                   | 12 ++--
 htdocs/categories/fiche.php                  |  4 +-
 htdocs/comm/address.php                      |  7 +--
 htdocs/comm/propal.php                       |  2 +-
 htdocs/comm/remise.php                       |  4 +-
 htdocs/compta/bank/account.php               | 25 +++++---
 htdocs/compta/deplacement/fiche.php          | 20 +++----
 htdocs/compta/dons/fiche.php                 | 29 +++++----
 htdocs/compta/paiement/cheque/fiche.php      |  9 +--
 htdocs/fichinter/fiche.php                   |  2 +-
 htdocs/fourn/facture/fiche.php               | 63 +++++++++-----------
 htdocs/fourn/facture/paiement.php            |  3 -
 htdocs/product/admin/product_extrafields.php |  2 -
 htdocs/product/composition/fiche.php         | 15 ++---
 htdocs/projet/tasks.php                      |  6 +-
 htdocs/societe/consumption.php               |  8 ---
 22 files changed, 98 insertions(+), 151 deletions(-)

diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index fa7d59f040e64..c3fdd1176a1b0 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -52,7 +52,6 @@
 $extrafields = new ExtraFields($db);
 $adht = new AdherentType($db);
 $errmsg='';
-$errmsgs=array();
 
 $defaultdelay=1;
 $defaultdelayunit='y';
@@ -108,7 +107,7 @@
 		{
 			$langs->load("errors");
 			$errmsg=$langs->trans($company->error);
-			$errmsgs=$company->errors;
+			setEventMessage($company->errors, 'errors');
 		}
 		else
 		{
@@ -282,7 +281,7 @@
         {
             $error++;
             $errmsg=$object->error;
-            $errmsgs=$object->errors;
+	        setEventMessage($object->errors, 'errors');
         }
 
         if (! $error)
@@ -444,7 +443,7 @@
                         if (! ($bank_line_id > 0))
                         {
                             $errmsg=$paiement->error;
-                            $errmsgs=$paiement->errors;
+	                        setEventMessage($paiement->errors, 'errors');
                             $error++;
                         }
                     }
@@ -689,7 +688,7 @@
     dol_fiche_end();
 
 
-    dol_htmloutput_errors($errmsg,$errmsgs);
+    dol_htmloutput_errors($errmsg);
 
 
     /*
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index bc140735c6175..0a23b26f36c69 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -34,7 +34,6 @@
 
 $rowid = GETPOST('rowid','int');
 $action = GETPOST('action','alpha');
-$errmesg='';
 
 // Define possible position of boxes
 $pos_name = getStaticMember('InfoBox','listOfPages');
@@ -80,7 +79,7 @@
 		}
 		else
 		{
-		    $errmesg=$db->lasterror();
+			setEventMessage($db->lasterror(), 'errors');
 		    $error++;
 		}
 	}
@@ -116,7 +115,7 @@
 	        $resql = $db->query($sql);
 	        if (! $resql)
 	        {
-		        $errmesg=$db->lasterror();
+		        setEventMessage($db->lasterror(), 'errors');
 	            $error++;
 	        }
 	    }
@@ -217,9 +216,6 @@
 
 print $langs->trans("BoxesDesc")." ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
 
-dol_htmloutput_errors($errmesg);
-
-
 /*
  * Recherche des boites actives par defaut pour chaque position possible
  * On stocke les boites actives par defaut dans $boxes[position][id_boite]=1
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 8c5dd6585f759..650def1f1af90 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -120,7 +120,10 @@
 
 if (empty($conf->use_javascript_ajax))
 {
-    dol_htmloutput_errors('',array($langs->trans("NotAvailable"),$langs->trans("JavascriptDisabled")),1);
+	setEventMessage(array(
+		$langs->trans("NotAvailable"),
+		$langs->trans("JavascriptDisabled")
+	), 'errors');
 }
 else
 {
diff --git a/htdocs/admin/fiscalyear.php b/htdocs/admin/fiscalyear.php
index 1cc06281a663c..dfb404b0b6b0f 100644
--- a/htdocs/admin/fiscalyear.php
+++ b/htdocs/admin/fiscalyear.php
@@ -43,7 +43,6 @@
 $statut2label=array('');
 foreach ($tmpstatut2label as $key => $val) $statut2label[$key]=$langs->trans($val);
 
-$mesg='';
 $errors=array();
 
 $object = new Fiscalyear($db);
@@ -64,8 +63,6 @@
 
 print_fiche_titre($langs->trans('FiscalYears'));
 
-dol_htmloutput_errors($mesg);
-
 $sql = "SELECT f.rowid, f.label, f.date_start, f.date_end, f.statut, f.entity";
 $sql.= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear as f";
 $sql.= " WHERE f.entity = ".$conf->entity;
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index b09b524b435a2..2e050a4bbe828 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -49,8 +49,6 @@
 }
 
 $error=0;
-$errmsgs=array();
-
 
 // Cette page peut etre longue. On augmente le delai autorise.
 // Ne fonctionne que si on est pas en safe_mode.
@@ -105,7 +103,8 @@
 				else
 				{
 					$error++;
-					$errmsgs[]='Failed to initialize menu '.$key.'.';
+					//TODO: Translate
+					setEventMessage('Failed to initialize menu '.$key.'.', 'errors');
 					$db->rollback();
 				}
 			}
@@ -268,10 +267,6 @@
 
 print '</div>';
 
-
-dol_htmloutput_errors('',$errmsgs);
-
-
 if ($action != 'edit')
 {
 	print '<div class="tabsAction">';
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index a5d207b5339cb..1484566dbaff2 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -37,8 +37,6 @@
 $fk_barcode_type=GETPOST('fk_barcode_type');
 $eraseallbarcode=GETPOST('eraseallbarcode');
 
-$mesg='';
-
 $action=GETPOST('action');
 
 $producttmp=new Product($db);
@@ -198,8 +196,6 @@
 print $langs->trans("MassBarcodeInitDesc").'<br>';
 print '<br>';
 
-dol_htmloutput_errors($mesg);
-
 //print img_picto('','puce').' '.$langs->trans("PrintsheetForOneBarCode").'<br>';
 //print '<br>';
 
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 0c61ab8cca684..aa82fdb455d82 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -80,12 +80,12 @@
 	if (empty($categorie->label))
 	{
 		$action = 'create';
-		$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("Label"));
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), 'errors');
 	}
 	if (empty($categorie->description))
 	{
 		$action = 'create';
-		$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("Description"));
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Description")), 'errors');
 	}
 	if (empty($categorie->error))
 	{
@@ -98,12 +98,12 @@
 		}
 		else
 		{
-			$mesg=$categorie->error;
+			setEventMessage($categorie->error, 'errors');
 		}
 	}
 	else
 	{
-		$mesg=$categorie->error;
+		setEventMessage($categorie->error, 'errors');
 	}
 }
 
@@ -117,10 +117,6 @@
 
 print_fiche_titre($langs->trans("ModifCat"));
 
-
-dol_htmloutput_errors($mesg);
-
-
 $object->fetch($id);
 
 $form = new Form($db);
diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php
index aca14acce2bc1..66370022c2078 100644
--- a/htdocs/categories/fiche.php
+++ b/htdocs/categories/fiche.php
@@ -131,7 +131,7 @@
 	if (! $object->label)
 	{
 		$error++;
-		$errors[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref"));
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref")), 'errors');
 		$action = 'create';
 	}
 
@@ -224,8 +224,6 @@
 
 		print_fiche_titre($langs->trans("CreateCat"));
 
-		dol_htmloutput_errors('',$errors);
-
 		print '<table width="100%" class="border">';
 
 		// Ref
diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php
index 8e892845c669c..86333a3996c66 100644
--- a/htdocs/comm/address.php
+++ b/htdocs/comm/address.php
@@ -106,7 +106,7 @@
         }
         else
         {
-            $mesg = $object->error;
+	        setEventMessage($object->error, 'errors');
             $action='create';
         }
     }
@@ -147,7 +147,7 @@
         else
         {
             $reload = 0;
-            $mesg = $object->error;
+	        setEventMessage($object->error, 'errors');
             $actino= "edit";
         }
     }
@@ -181,9 +181,6 @@
 $formcompany = new FormCompany($db);
 $countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-dol_htmloutput_errors($mesg);
-
-
 if ($action == 'create')
 {
     if ($user->rights->societe->creer)
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index c2183a2b6e1be..64a3475572ece 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1645,7 +1645,7 @@
 			$numref = $object->getNextNumRef($soc);
 			if (empty($numref)) {
 				$error ++;
-				dol_htmloutput_errors($object->error);
+				setEventMessage($object->error, 'errors');
 			}
 		} else {
 			$numref = $object->ref;
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index 5fc0c7ec9bb8c..544ef6197201b 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -71,7 +71,7 @@
 	}
 	else
 	{
-		$errmesg=$soc->error;
+		setEventMessage($soc->error, 'errors');
 	}
 }
 
@@ -97,8 +97,6 @@
 	$objsoc->id=$socid;
 	$objsoc->fetch($socid);
 
-	dol_htmloutput_errors($errmesg);
-
 	$head = societe_prepare_head($objsoc);
 
 	dol_fiche_head($head, 'relativediscount', $langs->trans("ThirdParty"),0,'company');
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 8a8f00d235767..699624983125e 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -72,8 +72,6 @@
     if ($page > GETPOST("nbpage")) $page = GETPOST("nbpage");
 }
 
-$mesg='';
-
 $object = new Account($db);
 
 /*
@@ -83,6 +81,8 @@
 
 if ($action == 'add' && $id && ! isset($_POST["cancel"]) && $user->rights->banque->modifier)
 {
+	$error = 0;
+
 	if (price2num($_POST["credit"]) > 0)
 	{
 		$amount = price2num($_POST["credit"]);
@@ -98,11 +98,20 @@
 	$label=$_POST["label"];
 	$cat1=$_POST["cat1"];
 
-	if (! $dateop)    $mesg=$langs->trans("ErrorFieldRequired",$langs->trans("Date"));
-	if (! $operation) $mesg=$langs->trans("ErrorFieldRequired",$langs->trans("Type"));
-	if (! $amount)    $mesg=$langs->trans("ErrorFieldRequired",$langs->trans("Amount"));
+	if (! $dateop) {
+		$error++;
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Date")), 'errors');
+	}
+	if (! $operation) {
+		$error++;
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Type")), 'errors');
+	}
+	if (! $amount) {
+		$error++;
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Amount")), 'errors');
+	}
 
-	if (! $mesg)
+	if (! $error)
 	{
 		$object->fetch($id);
 		$insertid = $object->addline($dateop, $operation, $label, $amount, $num_chq, $cat1, $user);
@@ -114,7 +123,7 @@
 		}
 		else
 		{
-			$mesg=$object->error;
+			setEventMessage($object->error, 'errors');
 		}
 	}
 	else
@@ -295,8 +304,6 @@
 
 	print '<br>';
 
-	dol_htmloutput_errors($mesg);
-
 	/**
 	 * Search form
 	 */
diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php
index e0183094d231b..9df4bb9065257 100644
--- a/htdocs/compta/deplacement/fiche.php
+++ b/htdocs/compta/deplacement/fiche.php
@@ -44,8 +44,6 @@
 $action = GETPOST('action','alpha');
 $confirm = GETPOST('confirm','alpha');
 
-$mesg = '';
-
 $object = new Deplacement($db);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
@@ -73,7 +71,7 @@
         }
         else
         {
-            $mesg=$object->error;
+	        setEventMessage($object->error, 'errors');
         }
     }
 }
@@ -88,7 +86,7 @@
     }
     else
     {
-        $mesg=$object->error;
+	    setEventMessage($object->error, 'errors');
     }
 }
 
@@ -109,17 +107,17 @@
 
         if (! $object->date)
         {
-            $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date"));
+	        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")), 'errors');
             $error++;
         }
         if ($object->type == '-1') 	// Otherwise it is TF_LUNCH,...
         {
-            $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'</div>';
+	        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")), 'errors');
             $error++;
         }
         if (! ($object->fk_user > 0))
         {
-            $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Person")).'</div>';
+	        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Person")), 'errors');
             $error++;
         }
 
@@ -134,7 +132,7 @@
             }
             else
             {
-                $mesg=$object->error;
+	            setEventMessage($object->error, 'errors');
                 $action='create';
             }
         }
@@ -174,7 +172,7 @@
         }
         else
         {
-            $mesg=$object->error;
+	        setEventMessage($object->error, 'errors');
         }
     }
     else
@@ -226,8 +224,6 @@
 
     print_fiche_titre($langs->trans("NewTrip"));
 
-    dol_htmloutput_errors($mesg);
-
     $datec = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
 
     print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
@@ -299,8 +295,6 @@
     $result = $object->fetch($id);
     if ($result > 0)
     {
-        dol_htmloutput_mesg($mesg);
-
         $head = trip_prepare_head($object);
 
         dol_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip');
diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php
index 9f9f8793ad592..1b09863d4dd1d 100644
--- a/htdocs/compta/dons/fiche.php
+++ b/htdocs/compta/dons/fiche.php
@@ -43,9 +43,6 @@
 $cancel=GETPOST('cancel');
 $amount=GETPOST('amount');
 
-$mesg="";
-$mesgs=array();
-
 $don = new Don($db);
 $donation_date=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 
@@ -72,14 +69,14 @@
 
     if (empty($donation_date))
     {
-        $mesgs[]=$langs->trans("ErrorFieldRequired",$langs->trans("Date"));
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Date")), 'errors');
         $action = "create";
         $error++;
     }
 
 	if (empty($amount))
 	{
-		$mesgs[]=$langs->trans("ErrorFieldRequired",$langs->trans("Amount"));
+		$setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Amount")), 'errors');
 		$action = "create";
 		$error++;
 	}
@@ -125,14 +122,14 @@
 
     if (empty($donation_date))
     {
-        $mesgs[]=$langs->trans("ErrorFieldRequired",$langs->trans("Date"));
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Date")), 'errors');
         $action = "create";
         $error++;
     }
 
 	if (empty($amount))
 	{
-		$mesgs[]=$langs->trans("ErrorFieldRequired",$langs->trans("Amount"));
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Amount")), 'errors');
 		$action = "create";
 		$error++;
 	}
@@ -182,7 +179,9 @@
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
 	}
-    else $mesg=$don->error;
+    else {
+	    setEventMessage($don->error, 'errors');
+    }
 }
 if ($action == 'set_cancel')
 {
@@ -191,7 +190,9 @@
         header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
         exit;
     }
-    else $mesg=$don->error;
+    else {
+	    setEventMessage($don->error, 'errors');
+    }
 }
 if ($action == 'set_paid')
 {
@@ -200,7 +201,9 @@
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
 	}
-    else $mesg=$don->error;
+    else {
+	    setEventMessage($don->error, 'errors');
+    }
 }
 if ($action == 'set_encaisse')
 {
@@ -209,7 +212,9 @@
         header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
 	}
-    else $mesg=$don->error;
+    else {
+	    setEventMessage($don->error, 'errors');
+    }
 }
 
 /*
@@ -263,8 +268,6 @@
 {
 	print_fiche_titre($langs->trans("AddDonation"));
 
-	dol_htmloutput_errors($mesg,$mesgs);
-
 	print '<form name="add" action="fiche.php" method="post">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<table class="border" width="100%">';
diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php
index a2bf8a7bedee3..920a1328a62b3 100644
--- a/htdocs/compta/paiement/cheque/fiche.php
+++ b/htdocs/compta/paiement/cheque/fiche.php
@@ -47,8 +47,6 @@
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'cheque', $id, 'bordereau_cheque','','',$fieldname);
 
-$mesg='';
-
 $sortfield=GETPOST('sortfield', 'alpha');
 $sortorder=GETPOST('sortorder', 'alpha');
 $page=GETPOST('page', 'int');
@@ -122,12 +120,12 @@
 		$result=$object->set_number($user,$number);
 		if ($result < 0)
 		{
-		    $mesg='<div class="error">'.$object->error.'</div>';
+			setEventMessage($object->error, 'errors');
 		}
 	}
 	else
 	{
-	    $mesg='<div class="error">'.$object->error.'</div>';
+		setEventMessage($object->error, 'errors');
 	}
 }
 
@@ -337,9 +335,6 @@
 	}
 }
 
-
-dol_htmloutput_errors($mesg);
-
 $accounts = array();
 
 if ($action == 'new')
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 1c69741b6a86b..637591d0606bd 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -1117,7 +1117,7 @@
 			if (empty($numref))
 			{
 				$error++;
-				dol_htmloutput_errors($object->error);
+				setEventMessage($object->error, 'errors');
 			}
 		}
 		else
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 4e1c3246effff..ebd02a4df9113 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -52,8 +52,6 @@
 $langs->load('products');
 $langs->load('banks');
 
-$mesg='';
-$errors=array();
 $id			= (GETPOST('facid','int') ? GETPOST('facid','int') : GETPOST('id','int'));
 $action		= GETPOST("action");
 $confirm	= GETPOST("confirm");
@@ -92,12 +90,12 @@
 // Action clone object
 if ($action == 'confirm_clone' && $confirm == 'yes')
 {
-    if (1==0 && empty($_REQUEST["clone_content"]) && empty($_REQUEST["clone_receivers"]))
-    {
-        $mesg='<div class="error">'.$langs->trans("NoCloneOptionsSpecified").'</div>';
-    }
-    else
-    {
+//    if (1==0 && empty($_REQUEST["clone_content"]) && empty($_REQUEST["clone_receivers"]))
+//    {
+//        $mesg='<div class="error">'.$langs->trans("NoCloneOptionsSpecified").'</div>';
+//    }
+//    else
+//    {
         $result=$object->createFromClone($id);
         if ($result > 0)
         {
@@ -107,10 +105,10 @@
         else
         {
             $langs->load("errors");
-            $mesg='<div class="error">'.$langs->trans($object->error).'</div>';
+	        setEventMessage($langs->trans($object->error), 'errors');
             $action='';
         }
-    }
+//    }
 }
 
 elseif ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->fournisseur->facture->valider)
@@ -137,7 +135,7 @@
         if (! $idwarehouse || $idwarehouse == -1)
         {
             $error++;
-            $errors[]=$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse"));
+	        setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), 'errors');
             $action='';
         }
     }
@@ -165,7 +163,7 @@
     }
     else
     {
-        $mesg='<div class="error">'.$object->error.'</div>';
+	    setEventMessage($object->error, 'errors');
     }
 }
 
@@ -180,7 +178,7 @@
 	}
 	else
 	{
-		$mesg='<div class="error">'.$object->error.'</div>';
+		setEventMessage($object->error, 'errors');
 		/* Fix bug 1485 : Reset action to avoid asking again confirmation on failure */
 		$action='';
 	}
@@ -258,7 +256,9 @@
     	$paiementfourn = new PaiementFourn($db);
         $result=$paiementfourn->fetch(GETPOST('paiement_id'));
         if ($result > 0) $result=$paiementfourn->delete(); // If fetch ok and found
-        if ($result < 0) $mesg='<div class="error">'.$paiementfourn->error.'</div>';
+        if ($result < 0) {
+	        setEventMessage($paiementfourn->error, 'errors');
+        }
     }
 }
 
@@ -272,21 +272,21 @@
 
     if (GETPOST('socid','int')<1)
     {
-    	$mesg='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentities('Supplier')).'</div>';
+	    setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('Supplier')), 'errors');
     	$action='create';
     	$error++;
     }
 
     if ($datefacture == '')
     {
-        $mesg='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentities('DateInvoice')).'</div>';
+	    setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('DateInvoice')), 'errors');
         $action='create';
         $_GET['socid']=$_POST['socid'];
         $error++;
     }
     if (! GETPOST('ref_supplier'))
     {
-        $mesg='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentities('RefSupplier')).'</div>';
+	    setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('RefSupplier')), 'errors');
         $action='create';
         $_GET['socid']=$_POST['socid'];
         $error++;
@@ -457,7 +457,7 @@
         {
             $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'];
         }
@@ -631,14 +631,14 @@
             // Product not selected
             $error++;
             $langs->load("errors");
-            $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ProductOrService")).'</div>';
+	        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ProductOrService")), 'errors');
         }
         if ($idprod == -1)
         {
             // Quantity too low
             $error++;
             $langs->load("errors");
-            $mesg='<div class="error">'.$langs->trans("ErrorQtyTooLowForThisSupplier").'</div>';
+	        setEventMessage($langs->trans("ErrorQtyTooLowForThisSupplier"), 'errors');
         }
     }
     else if( GETPOST('price_ht')!=='' || GETPOST('price_ttc')!=='' )
@@ -732,10 +732,7 @@
     else
 	{
     	$db->rollback();
-		if (empty($mesg))
-	    {
-	        $mesg='<div class="error">'.$object->error.'</div>';
-	    }
+	    setEventMessage($object->error, 'errors');
     }
 
     $action = '';
@@ -798,7 +795,7 @@
         }
         else
         {
-            $mesg='<div class="error">'.$object->error.'</div>';
+	        setEventMessage($object->error, 'errors');
         }
     }
 }
@@ -948,7 +945,6 @@
                     else
                     {
                         $langs->load("other");
-                        $mesg='<div class="error">';
                         if ($mailfile->error)
                         {
                             $mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
@@ -958,7 +954,7 @@
                         {
                             $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
                         }
-                        $mesg.='</div>';
+	                    setEventMessage($mesg, 'errors');
                     }
                 }
             }
@@ -966,7 +962,7 @@
             else
             {
                 $langs->load("other");
-                $mesg='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').'</div>';
+	            setEventMessage($langs->trans('ErrorMailRecipientIsEmpty'), 'errors');
                 dol_syslog('Recipient email is empty');
             }
 /*        }
@@ -980,7 +976,7 @@
     else
     {
         $langs->load("other");
-        $mesg='<div class="error">'.$langs->trans('ErrorFailedToReadEntity',$langs->trans("Invoice")).'</div>';
+	    setEventMessage($langs->trans('ErrorFailedToReadEntity',$langs->trans("Invoice")), 'errors');
         dol_syslog('Unable to read data from the invoice. The invoice file has perhaps not been generated.');
     }
 
@@ -1064,11 +1060,11 @@
 			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');
 			}
 		}
 	}
@@ -1119,7 +1115,6 @@
 {
     print_fiche_titre($langs->trans('NewBill'));
 
-    dol_htmloutput_mesg($mesg);
     dol_htmloutput_events();
 
     $societe='';
@@ -1146,7 +1141,6 @@
                 $element = $subelement = 'commande';
             }
             if ($element == 'propal')   {
-                dol_htmloutput_errors('',$errors);
                 $element = 'comm/propal'; $subelement = 'propal';
             }
             if ($element == 'contract') {
@@ -1479,9 +1473,6 @@
 
         dol_fiche_head($head, 'card', $titre, 0, 'bill');
 
-        dol_htmloutput_mesg($mesg);
-        dol_htmloutput_errors('',$errors);
-
         // Confirmation de la suppression d'une ligne produit
         if ($action == 'confirm_delete_line')
         {
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index f02e48a9be5cd..5e7658d25b0e0 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -503,9 +503,6 @@
 
         print_barre_liste($langs->trans('SupplierPayments'), $page, 'paiement.php',$paramlist,$sortfield,$sortorder,'',$num);
 
-        if ($mesg) dol_htmloutput_mesg($mesg);
-        if ($errmsg) dol_htmloutput_errors($errmsg);
-
         print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php
index fd31abaa80ead..58b4624f5bca7 100644
--- a/htdocs/product/admin/product_extrafields.php
+++ b/htdocs/product/admin/product_extrafields.php
@@ -89,8 +89,6 @@
 print $langs->trans('DefineHereComplementaryAttributes', $tab).'<br>'."\n";
 print '<br>';
 
-dol_htmloutput_errors($mesg);
-
 // Load attribute_label
 $extrafields->fetch_name_optionals_label($elementtype);
 
diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php
index 26761a2d56be4..47f7bf9c42a4e 100644
--- a/htdocs/product/composition/fiche.php
+++ b/htdocs/product/composition/fiche.php
@@ -49,8 +49,6 @@
 $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 
-$mesg = '';
-
 $product = new Product($db);
 $productid=0;
 if ($id > 0 || ! empty($ref))
@@ -83,8 +81,11 @@
 			{
 				$error++;
 				$action = 're-edit';
-				if ($product->error == "isFatherOfThis") $mesg = $langs->trans("ErrorAssociationIsFatherOfThis");
-				else $mesg=$product->error;
+				if ($product->error == "isFatherOfThis") {
+					setEventMessage($langs->trans("ErrorAssociationIsFatherOfThis"), 'errors');
+				} else {
+					setEventMessage($product->error, 'errors');
+				}
 			}
 		}
 		else
@@ -97,7 +98,7 @@
 			{
 				$error++;
 				$action = 're-edit';
-				$mesg=$product->error;
+				setEventMessage($product->error, 'errors');
 			}
 		}
 	}
@@ -161,10 +162,6 @@
 
 llxHeader("","",$langs->trans("CardProduct".$product->type));
 
-
-dol_htmloutput_errors($mesg);
-
-
 $head=product_prepare_head($product, $user);
 $titre=$langs->trans("CardProduct".$product->type);
 $picto=($product->type==1?'service':'product');
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 7c94401f86135..de9ef77746df5 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -90,13 +90,13 @@
 	{
 		if (empty($label))
 		{
-			$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label"));
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), 'errors');
 			$action='create';
 			$error++;
 		}
 		else if (empty($_POST['task_parent']))
 		{
-			$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("ChildOfTask"));
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("ChildOfTask")), 'errors');
 			$action='create';
 			$error++;
 		}
@@ -267,8 +267,6 @@
 
 	print_fiche_titre($langs->trans("NewTask"));
 
-	dol_htmloutput_errors($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="createtask">';
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 07479c59d340f..93fd8672c16d8 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -442,14 +442,6 @@
 print "</table>";
 print "</form>";
 
-
-/*
- * Errors
- */
-
-dol_htmloutput_errors($warning);
-dol_htmloutput_errors($error,$errors);
-
 llxFooter();
 
 $db->close();

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 4/4] 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 8a520a55c4ef6..740a5c978790c 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -60,11 +60,11 @@
 
  	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 @@
 
 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 b02fa90baa9f1..c05dc78af83ab 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -60,8 +60,6 @@
 
 if ($action == 'dolibarr2ldap')
 {
-	$message="";
-
 	$db->begin();
 
 	$ldap=new Ldap();
@@ -157,10 +155,6 @@
 
 print '</div>';
 
-
-dol_htmloutput_mesg($message);
-
-
 /*
  * Barre d'actions
  */
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index d6a7d15126711..a866ecd9a70f2 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -43,7 +43,6 @@
 
 $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 @@
 	{
 		$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 @@
 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 66bc4fb22ba49..95e3f555b6dec 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -57,8 +57,6 @@
 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 ad480f6cf7f31..68adb30f7abf6 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -42,12 +42,12 @@
 	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 '</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 65dab22f8137a..b4430edcbe118 100644
--- a/htdocs/boutique/admin/boutique.php
+++ b/htdocs/boutique/admin/boutique.php
@@ -56,7 +56,7 @@
 	if ($i >= 4)
 	{
 		$db->commit();
-		$mesg = "<font class=\"ok\">".$langs->trans("OSCommerceSetupSaved")."</font>";
+		setEventMessage($langs->trans("OSCommerceSetupSaved"));
 	}
 	else
 	{
@@ -88,28 +88,29 @@
 		$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 "</form>\n";
 
-
-dol_htmloutput_mesg($mesg);
-
 $db->close();
 
 llxFooter();
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 692b055659b0a..277dc81820b57 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -67,12 +67,12 @@
  	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 "</form>\n";
 
-dol_htmloutput_mesg($mesg);
-
 $db->close();
 
 llxFooter();
diff --git a/htdocs/comm/action/contact.php b/htdocs/comm/action/contact.php
index 84b5089384478..334da53a2f4f6 100644
--- a/htdocs/comm/action/contact.php
+++ b/htdocs/comm/action/contact.php
@@ -156,8 +156,6 @@
 
 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 f34678787fa82..3df7acec76525 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -37,9 +37,6 @@
 $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 @@
 	$result=$cat->write_file(GETPOST('id','int'));
 	if ($result < 0)
 	{
-		$mesg=$cat->error;
+		setEventMessage($cat->error, 'errors');
 	}
 }
 
@@ -97,8 +94,6 @@
 
 	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 bd2bf9630ea18..76176930da3f3 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -87,7 +87,7 @@
 	$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 @@
 	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 14aea7c89c71a..df51f91e1a2f4 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -38,8 +38,6 @@
 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 @@
 
 	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 7bdc468085392..6f2f592892516 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -445,6 +445,8 @@
 // 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 @@
 	$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 @@
 	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 @@
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
 		}
-		$mesg=$object->error;
+		$mesg = $object->error;
 	}
 
 	setEventMessage($mesg, 'errors');
@@ -535,25 +546,31 @@
 
 	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 @@
 				{
 					// 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 @@
 				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 d7b082fc65e10..601db34c964a1 100644
--- a/htdocs/compta/bank/virement.php
+++ b/htdocs/compta/bank/virement.php
@@ -45,7 +45,6 @@
 {
 	$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 (! $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 (! $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 @@
 
 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 c3c629bc68dcd..8fe20cd66f6d7 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -127,7 +127,6 @@
 /* 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 d8b40784c0a7a..4a34d49c41302 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -453,8 +453,6 @@
 	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 c7ee207f85346..0a4a2d99943f8 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -104,8 +104,6 @@
 
 	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 1583c8ebc498f..bce22caaed602 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -69,7 +69,7 @@
 	}
 	else
 	{
-		$mesg='<div class="error">'.$chargesociales->error.'</div>';
+		setEventMessage($chargesociales->error, 'errors');
 	}
 }
 
@@ -81,22 +81,22 @@
 	$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 @@
 	$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 @@
 	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 ($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 e7f0d3a2b1bb1..022aaf14ff00d 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -127,10 +127,6 @@
 		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 c10f7f4509cae..9bb4337782efd 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -102,8 +102,6 @@
 	
 	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 dcec3598e7fc3..7156b69777c11 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -67,15 +67,14 @@
 	}
 	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 @@
 $contactstatic=new Contact($db);
 $userstatic=new User($db);
 
-dol_htmloutput_mesg($mesg);
-
 /* *************************************************************************** */
 /*                                                                             */
 /* Mode vue et edition                                                         */
@@ -129,8 +126,6 @@
 {
 	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 3ac3ca47496dc..cd782d734445f 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -64,8 +64,6 @@
 
 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 a785b49964209..84465cfd1c0d7 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -269,7 +269,7 @@ function initfields()
 
 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 facca267160c0..49b8369263079 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -87,15 +87,14 @@
 	}
 	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 @@
 /* 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 d244a209b92db..cbaf3277be89c 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -166,6 +166,8 @@
         }
 	    //print_r($array_selected);
 	    $_SESSION["export_selected_fields"]=$array_selected;
+
+	    setEventMessage($warnings, 'warnings');
     }
 
 }
@@ -488,9 +490,6 @@
     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 9c59a7bf4ff2b..95d0a4397de3f 100644
--- a/htdocs/externalsite/admin/externalsite.php
+++ b/htdocs/externalsite/admin/externalsite.php
@@ -59,12 +59,12 @@
     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 "</form>\n";
 
-
-dol_htmloutput_mesg($mesg);
-
-
 llxFooter();
 
 $db->close();
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index f5f355b315a38..8f540dd2ebd99 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -64,15 +64,14 @@
 	}
 	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 @@
 
 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 d263620ae4777..3c5fce7caa229 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -60,8 +60,6 @@
 
 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 8311e8bfc9f4d..ba32a143f8cd5 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -69,11 +69,11 @@
 		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 @@
 /* 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 dbac3c4230dd8..9e9cabc86b345 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -638,7 +638,7 @@
     }
     else
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Delivery")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Delivery")), 'errors');
     }
 }
 
@@ -767,7 +767,7 @@
 
     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 @@
         {
             $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 @@
 {
 	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 2536174686907..c33b078886f97 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -69,11 +69,11 @@
 		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 @@
 /* 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 a7a98dcc734af..1b252c480af25 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -58,18 +58,17 @@
 	$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 @@
 
 }
 
-dol_htmloutput_mesg($mesg);
-
-
 llxFooter();
 
 $db->close();
diff --git a/htdocs/holiday/admin/holiday.php b/htdocs/holiday/admin/holiday.php
index aabf8362c0553..0ed80121042e4 100644
--- a/htdocs/holiday/admin/holiday.php
+++ b/htdocs/holiday/admin/holiday.php
@@ -59,7 +59,6 @@
 // Contrôle du formulaire
 if ($action == "add")
 {
-    $message = '';
     $error = 0;
 
     // Option du groupe de validation
@@ -156,12 +155,9 @@
     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 @@
 
     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 @@
         $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 @@
         // 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 bf1bf046783ef..4b37a8b53c5ab 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -102,7 +102,7 @@
 
     if ($error)
     {
-        $message = '<div class="error">'.$langs->trans('ErrorAddEventToUserCP').'</div>';
+	    setEventMessage($langs->trans('ErrorAddEventToUserCP'), 'errors');
     }
     else
 	{
@@ -115,10 +115,8 @@
 
         $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 93b426b5ad3e6..797bce3171f5e 100644
--- a/htdocs/holiday/fiche.php
+++ b/htdocs/holiday/fiche.php
@@ -705,7 +705,7 @@
                     break;
             }
 
-            dol_htmloutput_mesg('',$errors,'error');
+	        setEventMessage($errors, 'errors');
         }
 
 
@@ -890,7 +890,7 @@ function valider()
                         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 ca77dabe8c45d..e79ffcf13c68e 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -91,12 +91,12 @@
 	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 (! $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 @@
 	}
 	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 8d82b5548a558..7e4c4f12b10f1 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -230,7 +230,9 @@
     	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 93e8bf9564700..a88dbf8b0fbca 100644
--- a/htdocs/projet/activity/list.php
+++ b/htdocs/projet/activity/list.php
@@ -97,7 +97,7 @@
     }
     else
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorTimeSpentIsEmpty").'</div>';
+	    setEventMessage($langs->trans("ErrorTimeSpentIsEmpty"), 'errors');
     }
 }
 
@@ -128,17 +128,9 @@
 $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 c564a23a480eb..a23f65edafbbb 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -60,11 +60,11 @@
 
 	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 (! $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
 		{
-			$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
 		{
-			$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 @@
 
 print '</table><br/>';
 
-dol_htmloutput_mesg($mesg);
-
 $db->close();
 
 llxFooter();
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index c6880547c60f8..ebee8cd3fa4cb 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -79,11 +79,11 @@
 		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 @@
 /* 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 00fdf65d15a22..a2b5fa40e8294 100644
--- a/htdocs/projet/fiche.php
+++ b/htdocs/projet/fiche.php
@@ -92,7 +92,7 @@
 		    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 @@
 	    else
 	    {
 	        dol_syslog($object->error,LOG_DEBUG);
-	        $mesg='<div class="error">'.$langs->trans("CantRemoveProject").'</div>';
+		    setEventMessage($langs->trans("CantRemoveProject"), 'errors');
 	    }
 	}
 
@@ -120,12 +120,12 @@
 	    $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 ($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 @@
 	    {
 	        $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 ($result < 0)
 	    		{
 	    			$error++;
-	    			$mesg='<div class="error">'.$langs->trans("ErrorShiftTaskDate").':'.$object->error.'</div>';
+				    setEventMessage($langs->trans("ErrorShiftTaskDate").':'.$object->error, 'errors');
 	    		}
 	    	}
 	    }
@@ -306,7 +306,7 @@
 	    $result = $object->setValid($user);
 	    if ($result <= 0)
 	    {
-	        $mesg='<div class="error">'.$object->error.'</div>';
+		    setEventMessage($object->error, 'errors');
 	    }
 	}
 
@@ -315,7 +315,7 @@
 	    $result = $object->setClose($user);
 	    if ($result <= 0)
 	    {
-	        $mesg='<div class="error">'.$object->error.'</div>';
+		    setEventMessage($object->error, 'errors');
 	    }
 	}
 
@@ -324,7 +324,7 @@
 	    $result = $object->setValid($user);
 	    if ($result <= 0)
 	    {
-	        $mesg='<div class="error">'.$object->error.'</div>';
+		    setEventMessage($object->error, 'errors');
 	    }
 	}
 
@@ -355,7 +355,7 @@
 	    $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 @@
 
     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 @@
      * 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 de9ef77746df5..f72b8c6963d4a 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -199,8 +199,6 @@
 	$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 722e3c9aaae53..3cc8b51ca1a5c 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -75,11 +75,11 @@
 		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 @@
 		//$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 14339291c4ca4..5a445f4f0131e 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -69,7 +69,7 @@
 	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 @@
 		else
 		{
 			$langs->load("errors");
-			$mesg='<div class="error">'.$langs->trans($object->error).'</div>';
+			setEventMessage($langs->trans($object->error), 'errors');
 			$action='';
 		}
 	}
@@ -294,8 +294,6 @@
 		//$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 19a0bd5f99f35..73249620cbbcc 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -263,8 +263,6 @@
 		$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 52a72e954ae87..b1680d2803ec9 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -77,11 +77,11 @@
 		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 (! $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 (! $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 (! $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 @@
 
 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 198739398a2a3..18de91a6a3152 100644
--- a/htdocs/societe/notify/fiche.php
+++ b/htdocs/societe/notify/fiche.php
@@ -66,12 +66,12 @@
 
     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 @@
     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 ea64135bd43dc..b95839d67b9b0 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -79,7 +79,7 @@
 	$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 @@
 	    $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 @@
         header('Location: '.$url);
         exit;
     } else {
-        $message=$db->lasterror;
+	    setEventMessage($db->lasterror, 'errors');
     }
 }
 
@@ -176,12 +176,12 @@
 		}
 		else
 		{
-			$message = $account->error;
+			setEventMessage($account->error, 'errors');
 		}
 	}
 	else
 	{
-         $message = $account->error;
+		setEventMessage($account->error, 'errors');
     }
 }
 
@@ -399,8 +399,6 @@
 
 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 == '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 c8d2d68ebb70c..f0b3532018b45 100644
--- a/htdocs/societe/societe.php
+++ b/htdocs/societe/societe.php
@@ -284,7 +284,7 @@
     // 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");