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

Fix remove warnings

Browse Source
This commit is contained in:
Laurent Destailleur 2019-03-23 12:04:50 +01:00
parent 82d90a201c
commit c569e71bc8
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/html.form.class.php
View File

@ -6610,7 +6610,11 @@ class Form
// Can complete the possiblelink array // Can complete the possiblelink array
$hookmanager->initHooks(array('commonobject')); $hookmanager->initHooks(array('commonobject'));
$parameters=array('listofidcompanytoscan' => $listofidcompanytoscan); $parameters=array('listofidcompanytoscan' => $listofidcompanytoscan);
$reshook=$hookmanager->executeHooks('showLinkToObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
if (! empty($listofidcompanytoscan)) // If empty, we don't have criteria to scan the object we can link to
{
$reshook=$hookmanager->executeHooks('showLinkToObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
}
if (empty($reshook)) if (empty($reshook))
{ {

5
htdocs/expensereport/card.php
View File

@ -2657,7 +2657,6 @@ if (GETPOST('modelselected', 'alpha')) {
if ($action != 'presend') if ($action != 'presend')
{ {
/* /*
* Generate documents * Generate documents
*/ */
@ -2677,11 +2676,15 @@ if ($action != 'presend')
$somethingshown = $formfile->numoffiles; $somethingshown = $formfile->numoffiles;
} }
// Disabled for expensereport, there is no thirdparty on expensereport, so nothing to define the list of other object we can suggest to link to
/*
if ($action != 'create' && $action != 'edit' && ($id || $ref)) if ($action != 'create' && $action != 'edit' && ($id || $ref))
{ {
$linktoelem = $form->showLinkToObjectBlock($object, null, array('expensereport')); $linktoelem = $form->showLinkToObjectBlock($object, null, array('expensereport'));
$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
} }
*/
print '</div><div class="fichehalfright"><div class="ficheaddleft">'; print '</div><div class="fichehalfright"><div class="ficheaddleft">';
// List of actions on element // List of actions on element
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';