Merge remote-tracking branch 'upstream/3.9' into 3.9
This commit is contained in:
commit
2d645c74dc
@ -193,11 +193,17 @@ else {
|
|||||||
{
|
{
|
||||||
$parameters=array('fk_parent_line'=>GETPOST('fk_parent_line','int'));
|
$parameters=array('fk_parent_line'=>GETPOST('fk_parent_line','int'));
|
||||||
$reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
|
$reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
|
||||||
|
if (!empty($hookmanager->resPrint)) {
|
||||||
|
print $hookmanager->resPrint;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (is_object($hookmanager) && ! empty($senderissupplier))
|
if (is_object($hookmanager) && ! empty($senderissupplier))
|
||||||
{
|
{
|
||||||
$parameters=array('htmlname'=>'addproduct');
|
$parameters=array('htmlname'=>'addproduct');
|
||||||
$reshook=$hookmanager->executeHooks('formCreateProductSupplierOptions',$parameters,$object,$action);
|
$reshook=$hookmanager->executeHooks('formCreateProductSupplierOptions',$parameters,$object,$action);
|
||||||
|
if (!empty($hookmanager->resPrint)) {
|
||||||
|
print $hookmanager->resPrint;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user