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

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Browse Source
This commit is contained in:
Laurent Destailleur 2018-06-18 13:20:11 +02:00
commit 16fee19b6f
4 changed files with 75 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/class/adherent.class.php
View File

@ -599,6 +599,7 @@ class Adherent extends CommonObject
$error++; $error++;
} }
} }
}
if (! $error && ! $notrigger) if (! $error && ! $notrigger)
{ {
@ -607,7 +608,6 @@ class Adherent extends CommonObject
if ($result < 0) { $error++; } if ($result < 0) { $error++; }
// End call triggers // End call triggers
} }
}
if (! $error) if (! $error)
{ {

2
htdocs/fourn/commande/card.php
View File

@ -409,7 +409,7 @@ if (empty($reshook))
$localtax2_tx, $localtax2_tx,
$idprod, $idprod,
$productsupplier->product_fourn_price_id, $productsupplier->product_fourn_price_id,
$productsupplier->fourn_ref, $productsupplier->ref_supplier,
$remise_percent, $remise_percent,
'HT', 'HT',
$pu_ttc, $pu_ttc,

2
htdocs/societe/class/societe.class.php
View File

@ -2010,7 +2010,7 @@ class Societe extends CommonObject
$hookmanager=new HookManager($this->db); $hookmanager=new HookManager($this->db);
} }
$hookmanager->initHooks(array('societedao')); $hookmanager->initHooks(array('societedao'));
$parameters=array('id'=>$this->id); $parameters=array('id'=>$this->id, 'linkclose'=>$linkclose);
$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) $linkclose = $hookmanager->resPrint; if ($reshook > 0) $linkclose = $hookmanager->resPrint;
} }

5
htdocs/user/card.php
View File

@ -1619,6 +1619,10 @@ else
print '<div class="tabsAction">'; print '<div class="tabsAction">';
$parameters=array();
$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
if (empty($reshook))
{
if (! empty($object->email)) if (! empty($object->email))
{ {
$langs->load("mails"); $langs->load("mails");
@ -1697,6 +1701,7 @@ else
print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("MustBeAdminToDeleteOtherAdmin")).'">'.$langs->trans("DeleteUser").'</a></div>'; print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("MustBeAdminToDeleteOtherAdmin")).'">'.$langs->trans("DeleteUser").'</a></div>';
} }
} }
}
print "</div>\n"; print "</div>\n";