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

Merge pull request #702 from atm-alexis/develop

Browse Source 
Ajout de la gestion des Hooks sur la page d'ajout des commerciaux
This commit is contained in:
Laurent Destailleur 2013-03-01 03:48:21 -08:00
commit efa7a617b6
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/societe/commerciaux.php
View File

@ -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 '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">';
print img_object($langs->trans("ShowUser"),"user").' ';
print $obj->firstname." " .$obj->name."\n";