lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX #5895

Browse Source
This commit is contained in:
Laurent Destailleur 2016-11-20 15:47:05 +01:00
parent e6894eda0e
commit ff4fa9977c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/mails.lang
View File

@ -97,7 +97,7 @@ ToAddRecipientsChooseHere=Add recipients by choosing from the lists
NbOfEMailingsReceived=Mass emailings received NbOfEMailingsReceived=Mass emailings received
NbOfEMailingsSend=Mass emailings sent NbOfEMailingsSend=Mass emailings sent
IdRecord=ID record IdRecord=ID record
DeliveryReceipt=Delivery Receipt DeliveryReceipt=Delivery Ack.
YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients. YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
TagCheckMail=Track mail opening TagCheckMail=Track mail opening
TagUnsubscribe=Unsubscribe link TagUnsubscribe=Unsubscribe link

2
htdocs/societe/soc.php
View File

@ -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); $object->fetch($socid);