diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php
index 4222a4dacab..e5d42b5cafd 100644
--- a/htdocs/societe/notify/fiche.php
+++ b/htdocs/societe/notify/fiche.php
@@ -52,6 +52,8 @@ $pagenext = $page + 1;
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="c.name";
 
+$now=dol_now();
+
 
 /*
  * Actions
@@ -60,33 +62,61 @@ if (! $sortfield) $sortfield="c.name";
 // Add a notification
 if ($action == 'add')
 {
-	$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
-	$sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$_POST["contactid"]." AND fk_action=".$_POST["actionid"];
-	if ($db->query($sql))
-	{
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
-		$sql .= " VALUES (".$db->idate(mktime()).",".$socid.",".$_POST["contactid"].",".$_POST["actionid"].")";
+    $error=0;
 
-		if ($db->query($sql))
-		{
+    if (empty($contactid))
+    {
+        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Contact")).'</div>';
+        $error++;
+    }
+    if ($actionid <= 0)
+    {
+        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Action")).'</div>';
+        $error++;
+    }
 
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    if (! $error)
+    {
+        $db->begin();
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
+        $sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$contactid." AND fk_action=".$actionid;
+        if ($db->query($sql))
+        {
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
+            $sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
+
+            if ($db->query($sql))
+            {
+
+            }
+            else
+            {
+                $error++;
+                dol_print_error($db);
+            }
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+
+        if (! $error)
+        {
+            $db->commit();
+        }
+        else
+        {
+            $db->rollback();
+        }
+    }
 }
 
 // Remove a notification
 if ($action == 'delete')
 {
-	$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".$_GET["actid"].";";
-	$db->query($sql);
+    $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".$_GET["actid"].";";
+    $db->query($sql);
 }
 
 
@@ -104,75 +134,100 @@ $result=$soc->fetch($socid);
 
 if ($result > 0)
 {
-	$html = new Form($db);
-	$langs->load("other");
+    $html = new Form($db);
+    $langs->load("other");
 
 
-	$head = societe_prepare_head($soc);
+    $head = societe_prepare_head($soc);
 
-	dol_fiche_head($head, 'notify', $langs->trans("ThirdParty"),0,'company');
+    dol_fiche_head($head, 'notify', $langs->trans("ThirdParty"),0,'company');
 
 
-	print '<table class="border"width="100%">';
+    print '<table class="border"width="100%">';
 
-	print '<tr><td width="20%">'.$langs->trans("ThirdPartyName").'</td><td colspan="3">';
-	print $form->showrefnav($soc,'socid','',($user->societe_id?0:1),'rowid','nom');
-	print '</td></tr>';
+    print '<tr><td width="20%">'.$langs->trans("ThirdPartyName").'</td><td colspan="3">';
+    print $form->showrefnav($soc,'socid','',($user->societe_id?0:1),'rowid','nom');
+    print '</td></tr>';
 
-	print '<tr><td width="30%">'.$langs->trans("NbOfActiveNotifications").'</td>';
-	print '<td colspan="3">';
-	$sql = "SELECT COUNT(n.rowid) as nb";
-	$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n";
-	$sql.= " WHERE fk_soc = ".$soc->id;
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-			$nb=$obj->nb;
-			$i++;
-		}
-	}
-	else {
-		dol_print_error($db);
-	}
-	print $nb;
-	print '</td></tr>';
-	print '</table>';
+    // Prefix
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+    }
 
-	print '</div>';
+    if ($object->client)
+    {
+        print '<tr><td>';
+        print $langs->trans('CustomerCode').'</td><td colspan="3">';
+        print $object->code_client;
+        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        print '</td></tr>';
+    }
+
+    if ($object->fournisseur)
+    {
+        print '<tr><td>';
+        print $langs->trans('SupplierCode').'</td><td colspan="3">';
+        print $object->code_fournisseur;
+        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        print '</td></tr>';
+    }
+
+    print '<tr><td width="30%">'.$langs->trans("NbOfActiveNotifications").'</td>';
+    print '<td colspan="3">';
+    $sql = "SELECT COUNT(n.rowid) as nb";
+    $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n";
+    $sql.= " WHERE fk_soc = ".$soc->id;
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0;
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+            $nb=$obj->nb;
+            $i++;
+        }
+    }
+    else {
+        dol_print_error($db);
+    }
+    print $nb;
+    print '</td></tr>';
+    print '</table>';
+
+    print '</div>';
 
 
-	// Help
-	print $langs->trans("NotificationsDesc").'<br><br>';
+    // Help
+    print $langs->trans("NotificationsDesc").'<br><br>';
 
 
-	print "\n";
+    print "\n";
 
-	// Add notification form
-	print_fiche_titre($langs->trans("AddNewNotification"),'','');
+    // Add notification form
+    print_fiche_titre($langs->trans("AddNewNotification"),'','');
 
-	print '<form action="fiche.php?socid='.$socid.'" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<form action="fiche.php?socid='.$socid.'" method="post">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="add">';
 
-	// Line with titles
-	print '<table width="100%" class="noborder">';
-	print '<tr class="liste_titre">';
-	$param="&socid=".$socid;
-	print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name",'',$param,'"width="45%"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',$param,'"width="35%"',$sortfield,$sortorder);
+    // Line with titles
+    print '<table width="100%" class="noborder">';
+    print '<tr class="liste_titre">';
+    $param="&socid=".$socid;
+    print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name",'',$param,'"width="45%"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',$param,'"width="35%"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Type"),"fiche.php","",'',$param,'"width="10%"',$sortfield,$sortorder);
-	print_liste_field_titre('');
-	print '</tr>';
+    print_liste_field_titre('');
+    print '</tr>';
 
-	$var=false;
-	$listofemails=$soc->thirdparty_and_contact_email_array();
-	if (count($listofemails) > 0)
-	{
-	    $actions=array();
+    $var=false;
+    $listofemails=$soc->thirdparty_and_contact_email_array();
+    if (count($listofemails) > 0)
+    {
+        $actions=array();
 
         // Load array of available notifications
         $notificationtrigger=new InterfaceNotification($db);
@@ -183,172 +238,172 @@ if ($result > 0)
             $label=$langs->trans("Notify_".$notifiedevent['code'])!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label'];
             $actions[$notifiedevent['rowid']]=$label;
         }
-		print '<input type="hidden" name="action" value="add">';
-		print '<tr '.$bc[$var].'><td>';
-		print $html->selectarray("contactid",$listofemails);
-		print '</td>';
-		print '<td>';
-		print $html->selectarray("actionid",$actions,'',1);
-		print '</td>';
+        print '<tr '.$bc[$var].'><td>';
+        print $html->selectarray("contactid",$listofemails);
+        print '</td>';
+        print '<td>';
+        print $html->selectarray("actionid",$actions,'',1);
+        print '</td>';
         print '<td>';
         $type=array('email'=>$langs->trans("EMail"));
         print $html->selectarray("typeid",$type);
         print '</td>';
-		print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
-		print '</tr>';
-	}
-	else
-	{
-		print '<tr '.$bc[$var].'><td colspan="4">';
-		print $langs->trans("YouMustCreateContactFirst");
-		print '</td></tr>';
-	}
+        print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
+        print '</tr>';
+    }
+    else
+    {
+        print '<tr '.$bc[$var].'><td colspan="4">';
+        print $langs->trans("YouMustCreateContactFirst");
+        print '</td></tr>';
+    }
 
-	print '</table>';
+    print '</table>';
 
-	print '</form>';
-	print '<br>';
+    print '</form>';
+    print '<br>';
 
+    dol_htmloutput_mesg($mesg);
 
-	// List of active notifications
-	print_fiche_titre($langs->trans("ListOfActiveNotifications"),'','');
-	$var=true;
+    // List of active notifications
+    print_fiche_titre($langs->trans("ListOfActiveNotifications"),'','');
+    $var=true;
 
-	// Line with titles
-	print '<table width="100%" class="noborder">';
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name",'',$param,'"width="45%"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',$param,'"width="35%"',$sortfield,$sortorder);
+    // Line with titles
+    print '<table width="100%" class="noborder">';
+    print '<tr class="liste_titre">';
+    print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name",'',$param,'"width="45%"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',$param,'"width="35%"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Type"),"fiche.php","",'',$param,'"width="10%"',$sortfield,$sortorder);
-	print_liste_field_titre('','','');
-	print '</tr>';
+    print_liste_field_titre('','','');
+    print '</tr>';
 
-	// List of notifications for contacts
-	$sql = "SELECT n.rowid, n.type,";
-	$sql.= " a.code, a.label,";
+    // List of notifications for contacts
+    $sql = "SELECT n.rowid, n.type,";
+    $sql.= " a.code, a.label,";
     $sql.= " c.rowid as contactid, c.name, c.firstname, c.email";
-	$sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-	$sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
-	$sql.= " ".MAIN_DB_PREFIX."socpeople c";
-	$sql.= " WHERE a.rowid = n.fk_action";
-	$sql.= " AND c.rowid = n.fk_contact";
-	$sql.= " AND c.fk_soc = ".$soc->id;
+    $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+    $sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
+    $sql.= " ".MAIN_DB_PREFIX."socpeople c";
+    $sql.= " WHERE a.rowid = n.fk_action";
+    $sql.= " AND c.rowid = n.fk_contact";
+    $sql.= " AND c.fk_soc = ".$soc->id;
 
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0;
 
-		$contactstatic=new Contact($db);
+        $contactstatic=new Contact($db);
 
-		while ($i < $num)
-		{
-			$var = !$var;
+        while ($i < $num)
+        {
+            $var = !$var;
 
-			$obj = $db->fetch_object($resql);
+            $obj = $db->fetch_object($resql);
 
-			$contactstatic->id=$obj->contactid;
-			$contactstatic->name=$obj->name;
-			$contactstatic->firstname=$obj->firstname;
-			print '<tr '.$bc[$var].'><td>'.$contactstatic->getNomUrl(1);
-			if ($obj->type == 'email')
-			{
-				if (isValidEmail($obj->email))
-				{
-					print ' &lt;'.$obj->email.'&gt;';
-				}
-				else
-				{
-					$langs->load("errors");
-					print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail",$obj->email);
-				}
-			}
-			print '</td>';
-			print '<td>';
-			$label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
-			print $label;
-			print '</td>';
+            $contactstatic->id=$obj->contactid;
+            $contactstatic->name=$obj->name;
+            $contactstatic->firstname=$obj->firstname;
+            print '<tr '.$bc[$var].'><td>'.$contactstatic->getNomUrl(1);
+            if ($obj->type == 'email')
+            {
+                if (isValidEmail($obj->email))
+                {
+                    print ' &lt;'.$obj->email.'&gt;';
+                }
+                else
+                {
+                    $langs->load("errors");
+                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail",$obj->email);
+                }
+            }
+            print '</td>';
+            print '<td>';
+            $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
+            print $label;
+            print '</td>';
             print '<td>';
             if ($obj->type == 'email') print $langs->trans("Email");
             if ($obj->type == 'sms') print $langs->trans("SMS");
             print '</td>';
             print '<td align="right"><a href="fiche.php?socid='.$socid.'&action=delete&actid='.$obj->rowid.'">'.img_delete().'</a></td>';
-			print '</tr>';
-			$i++;
-		}
-		$db->free($resql);
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+            print '</tr>';
+            $i++;
+        }
+        $db->free($resql);
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 
-	print '</table>';
-	print '<br>';
+    print '</table>';
+    print '<br>';
 
 
-	// List of notifications done
-	print_fiche_titre($langs->trans("ListOfNotificationsDone"),'','');
-	$var=true;
+    // List of notifications done
+    print_fiche_titre($langs->trans("ListOfNotificationsDone"),'','');
+    $var=true;
 
-	// Line with titles
-	print '<table width="100%" class="noborder">';
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name",'',"&socid=$socid",'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',"&socid=$socid",'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Date"),"fiche.php","a.titre",'',"&socid=$socid",'align="right"',$sortfield,$sortorder);
-	print '</tr>';
+    // Line with titles
+    print '<table width="100%" class="noborder">';
+    print '<tr class="liste_titre">';
+    print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name",'',"&socid=$socid",'',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',"&socid=$socid",'',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Date"),"fiche.php","a.titre",'',"&socid=$socid",'align="right"',$sortfield,$sortorder);
+    print '</tr>';
 
-	// List
-	$sql = "SELECT n.rowid, n.daten, n.email, n.objet_type, n.objet_id,";
-	$sql.= " c.rowid as id, c.name, c.firstname, c.email,";
-	$sql.= " a.code, a.label";
-	$sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-	$sql.= " ".MAIN_DB_PREFIX."notify as n, ";
+    // List
+    $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type, n.objet_id,";
+    $sql.= " c.rowid as id, c.name, c.firstname, c.email,";
+    $sql.= " a.code, a.label";
+    $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+    $sql.= " ".MAIN_DB_PREFIX."notify as n, ";
     $sql.= " ".MAIN_DB_PREFIX."socpeople as c";
     $sql.= " WHERE a.rowid = n.fk_action";
     $sql.= " AND c.rowid = n.fk_contact";
     $sql.= " AND c.fk_soc = ".$soc->id;
 
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0;
 
-		$contactstatic=new Contact($db);
+        $contactstatic=new Contact($db);
 
-		while ($i < $num)
-		{
-			$var = !$var;
+        while ($i < $num)
+        {
+            $var = !$var;
 
-			$obj = $db->fetch_object($resql);
+            $obj = $db->fetch_object($resql);
 
-			$contactstatic->id=$obj->id;
-			$contactstatic->name=$obj->name;
-			$contactstatic->firstname=$obj->firstname;
-			print '<tr '.$bc[$var].'><td>'.$contactstatic->getNomUrl(1);
-			print $obj->email?' &lt;'.$obj->email.'&gt;':$langs->trans("NoMail");
-			print '</td>';
-			print '<td>';
-			$label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
-			print $label;
-			print '</td>';
-			// TODO Add link to object here
-			// print
-			print'<td align="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
-			print '</tr>';
-			$i++;
-		}
-		$db->free($resql);
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+            $contactstatic->id=$obj->id;
+            $contactstatic->name=$obj->name;
+            $contactstatic->firstname=$obj->firstname;
+            print '<tr '.$bc[$var].'><td>'.$contactstatic->getNomUrl(1);
+            print $obj->email?' &lt;'.$obj->email.'&gt;':$langs->trans("NoMail");
+            print '</td>';
+            print '<td>';
+            $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
+            print $label;
+            print '</td>';
+            // TODO Add link to object here
+            // print
+            print'<td align="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
+            print '</tr>';
+            $i++;
+        }
+        $db->free($resql);
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 
-	print '</table>';
+    print '</table>';
 }
 else dol_print_error('','RecordNotFound');