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

Fix trigger was not called

Browse Source
This commit is contained in:
Laurent Destailleur 2017-11-29 16:34:44 +01:00
parent 4245ad6e2a
commit 9508c3e0b9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/societe/card.php
View File

@ -239,7 +239,7 @@ if (empty($reshook))
} }
if (! $error && $call_trigger) if (! $error)
{ {
$object->context=array('merge'=>1, 'mergefromid'=>$soc_origin->id); $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'); dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');