diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php index 141e76a892b..5f0f7af2410 100644 --- a/htdocs/societe/commerciaux.php +++ b/htdocs/societe/commerciaux.php @@ -37,6 +37,7 @@ $socid = isset($_GET["socid"])?$_GET["socid"]:''; if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'societe','',''); +$hookmanager->initHooks(array('salesrepresentativescard')); /* * Actions @@ -44,12 +45,22 @@ $result = restrictedArea($user, 'societe','',''); if($_GET["socid"] && $_GET["commid"]) { + $action = 'add'; + if ($user->rights->societe->creer) { + $soc = new Societe($db); $soc->id = $_GET["socid"]; $soc->fetch($_GET["socid"]); - $soc->add_commercial($user, $_GET["commid"]); + + + $parameters=array('id'=>$_GET["commid"]); + $reshook=$hookmanager->executeHooks('doActions',$parameters,$soc,$action); // Note that $action and $object may have been modified by some hooks + $error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors); + + + if (empty($reshook)) $soc->add_commercial($user, $_GET["commid"]); header("Location: commerciaux.php?socid=".$soc->id); exit; @@ -63,12 +74,20 @@ if($_GET["socid"] && $_GET["commid"]) if($_GET["socid"] && $_GET["delcommid"]) { + $action = 'delete'; + if ($user->rights->societe->creer) { $soc = new Societe($db); $soc->id = $_GET["socid"]; $soc->fetch($_GET["socid"]); - $soc->del_commercial($user, $_GET["delcommid"]); + + $parameters=array('id'=>$_GET["delcommid"]); + $reshook=$hookmanager->executeHooks('doActions',$parameters,$soc,$action); // Note that $action and $object may have been modified by some hooks + $error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors); + + + if (empty($reshook)) $soc->del_commercial($user, $_GET["delcommid"]); header("Location: commerciaux.php?socid=".$soc->id); exit; @@ -96,6 +115,8 @@ if ($_GET["socid"]) $soc->id = $_GET["socid"]; $result=$soc->fetch($_GET["socid"]); + $action='view'; + $head=societe_prepare_head2($soc); dol_fiche_head($head, 'salesrepresentative', $langs->trans("ThirdParty"),0,'company'); @@ -158,6 +179,13 @@ if ($_GET["socid"]) { $obj = $db->fetch_object($resql); + $parameters=array('socid'=>$soc->id); + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$obj,$action); // Note that $action and $object may have been modified by hook + if (empty($reshook)) { + + null; // actions in normal case + } + print ''; print img_object($langs->trans("ShowUser"),"user").' '; print $obj->firstname." " .$obj->name."\n";