From ff4fa9977caeadb4ef07ce0b1dceeaa09ae6698a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Nov 2016 15:47:05 +0100
Subject: [PATCH] FIX #5895

---
 htdocs/langs/en_US/mails.lang | 2 +-
 htdocs/societe/soc.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 1c1a3bf3245..072bbdd9750 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -97,7 +97,7 @@ ToAddRecipientsChooseHere=Add recipients by choosing from the lists
 NbOfEMailingsReceived=Mass emailings received
 NbOfEMailingsSend=Mass emailings sent
 IdRecord=ID record
-DeliveryReceipt=Delivery Receipt
+DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
 TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 0220f775d7b..126404292e3 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -109,7 +109,7 @@ if (empty($reshook))
         }
     }
 
-	if ($action == 'confirm_merge' && $confirm == 'yes')
+	if ($action == 'confirm_merge' && $confirm == 'yes' && $user->rights->societe->creer)
 	{
 		$object->fetch($socid);