From 9508c3e0b9e3de01f610f84cde1cdfb3b19d0443 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 29 Nov 2017 16:34:44 +0100
Subject: [PATCH] Fix trigger was not called

---
 htdocs/societe/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 3a66733adf5..d059b63c0e7 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -239,7 +239,7 @@ if (empty($reshook))
 				}
 
 
-				if (! $error && $call_trigger)
+				if (! $error)
 				{
 					$object->context=array('merge'=>1, 'mergefromid'=>$soc_origin->id);
 
@@ -1994,7 +1994,7 @@ else
 			    )
 		    );
 
-		    print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("MergeThirdparties"), $langs->trans("ConfirmMergeThirdparties"), "confirm_merge", $formquestion, 'no', 1, 200);
+		    print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("MergeThirdparties"), $langs->trans("ConfirmMergeThirdparties"), "confirm_merge", $formquestion, 'no', 1, 250);
 	    }
 
         dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');