diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 00345c87566..70f98d5df81 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -7,7 +7,6 @@ * Copyright (C) 2008 Patrick Raguin * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2011-2013 Alexandre Spangaro - * Copyright (C) 2015 Jean-François Ferry * Copyright (C) 2015 Marcos García * * This program is free software; you can redistribute it and/or modify @@ -1775,6 +1774,20 @@ else print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,"action-delete"); } + if ($action == 'merge') { + $form = new Form($db); + + $options = array( + array( + 'label' => $langs->trans('MergeOriginThirdparty'), + 'type' => 'other', + 'value' => $form->select_company('', 'soc_origin', 's.rowid != '.$object->id, 1) + ) + ); + + print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id,$langs->trans("MergeThirdparties"),$langs->trans("ConfirmMergeThirdparties"),"confirm_merge",$options,'',1); + } + dol_htmloutput_errors($error,$errors); $showlogo=$object->logo; @@ -2225,6 +2238,8 @@ else $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action); // Note that $action and $object may have been modified by hook if (empty($reshook)) { + print ''; + if (! empty($object->email)) { $langs->load("mails");