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-09-05 14:24:13 +02:00
parent 4a19f510fd
commit f893854986
13 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1008,7 +1008,7 @@ class Contact extends CommonObject
// Removed extrafields
if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) {
// For avoid conflicts if trigger used
$result=$this->deleteExtraFields($this);
$result=$this->deleteExtraFields();
if ($result < 0) $error++;
}

6
htdocs/core/lib/agenda.lib.php
View File

@ -549,15 +549,13 @@ function calendars_prepare_head($param)
$h++;
$object=new stdClass();
// Show more tabs from modules
// Entries must be declared in modules descriptor with line
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
// $this->tabs = array('entity:-tabname); to remove a tab
complete_head_from_modules($conf, $langs, $object, $head, $h, 'agenda');
complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda');
complete_head_from_modules($conf, $langs, $object, $head, $h, 'agenda', 'remove');
complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda', 'remove');
return $head;
}

1
htdocs/core/lib/bank.lib.php
View File

@ -163,7 +163,6 @@ function bank_admin_prepare_head($object)
*/
function various_payment_prepare_head($object)
{
global $db, $langs, $conf;
$h = 0;

2
htdocs/core/lib/donation.lib.php
View File

@ -80,7 +80,7 @@ function donation_prepare_head($object)
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
$upload_dir = $conf->don->dir_output . '/' . get_exdir($filename, 2, 0, 1, $object, 'donation'). '/'. dol_sanitizeFileName($object->ref);
$upload_dir = $conf->don->dir_output . '/' . dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
$nbLinks=Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/don/document.php?id='.$object->id;

2
htdocs/core/lib/multicurrency.lib.php
View File

@ -40,7 +40,7 @@ function multicurrencyAdminPrepareHead()
$head[$h][2] = 'settings';
$h++;
complete_head_from_modules($conf, $langs, $object, $head, $h, 'multicurrency');
complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency');
return $head;
}

2
htdocs/core/lib/ticket.lib.php
View File

@ -59,7 +59,7 @@ function ticketAdminPrepareHead()
//$this->tabs = array(
// 'entity:-tabname:Title:@ticket:/ticket/mypage.php?id=__ID__'
//); // to remove a tab
complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticketadmin');
complete_head_from_modules($conf, $langs, null, $head, $h, 'ticketadmin');
return $head;
}

4
htdocs/datapolicy/lib/datapolicy.lib.php
View File

@ -48,7 +48,9 @@ function datapolicyAdminPrepareHead()
$h++;
}
complete_head_from_modules($conf, $langs, $object, $head, $h, 'datapolicy');
complete_head_from_modules($conf, $langs, null, $head, $h, 'datapolicy');
complete_head_from_modules($conf, $langs, null, $head, $h, 'datapolicy', 'remove');
return $head;
}

4
htdocs/dav/dav.lib.php
View File

@ -63,9 +63,9 @@ function dav_admin_prepare_head()
// Entries must be declared in modules descriptor with line
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
// $this->tabs = array('entity:-tabname); to remove a tab
complete_head_from_modules($conf, $langs, $object, $head, $h, 'admindav');
complete_head_from_modules($conf, $langs, null, $head, $h, 'admindav');
complete_head_from_modules($conf, $langs, $object, $head, $h, 'admindav', 'remove');
complete_head_from_modules($conf, $langs, null, $head, $h, 'admindav', 'remove');
return $head;
}

2
htdocs/emailcollector/lib/emailcollector.lib.php
View File

@ -81,5 +81,7 @@ function emailcollectorPrepareHead($object)
//); // to remove a tab
complete_head_from_modules($conf, $langs, $object, $head, $h, 'emailcollector');
complete_head_from_modules($conf, $langs, $object, $head, $h, 'emailcollector', 'remove');
return $head;
}

2
htdocs/modulebuilder/template/lib/mymodule_myobject.lib.php
View File

@ -79,5 +79,7 @@ function myobjectPrepareHead($object)
//); // to remove a tab
complete_head_from_modules($conf, $langs, $object, $head, $h, 'myobject@mymodule');
complete_head_from_modules($conf, $langs, $object, $head, $h, 'myobject@mymodule', 'remove');
return $head;
}

2
htdocs/product/inventory/lib/inventory.lib.php
View File

@ -50,7 +50,7 @@ function inventoryAdminPrepareHead()
//$this->tabs = array(
// 'entity:-tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
//); // to remove a tab
complete_head_from_modules($conf, $langs, $object, $head, $h, 'inventory');
complete_head_from_modules($conf, $langs, null, $head, $h, 'inventory');
return $head;
}

4
htdocs/takepos/lib/takepos.lib.php
View File

@ -52,7 +52,9 @@ function takeposAdminPrepareHead()
//$this->tabs = array(
// 'entity:-tabname:Title:@takepos:/takepos/mypage.php?id=__ID__'
//); // to remove a tab
complete_head_from_modules($conf, $langs, $object, $head, $h, 'takepos');
complete_head_from_modules($conf, $langs, null, $head, $h, 'takepos');
complete_head_from_modules($conf, $langs, null, $head, $h, 'takepos', 'remove');
return $head;
}

2
htdocs/website/lib/websiteaccount.lib.php
View File

@ -79,5 +79,7 @@ function websiteaccountPrepareHead($object)
//); // to remove a tab
complete_head_from_modules($conf, $langs, $object, $head, $h, 'websiteaccount@website');
complete_head_from_modules($conf, $langs, $object, $head, $h, 'websiteaccount@website', 'remove');
return $head;
}