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 develop

Browse Source 
Conflicts:
	htdocs/core/class/hookmanager.class.php
This commit is contained in:
Laurent Destailleur 2018-04-05 13:29:27 +02:00
commit 533de639ae
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
htdocs/core/class/hookmanager.class.php
View File

@ -134,28 +134,29 @@ class HookManager
if (in_array( if (in_array(
$method, $method,
array( array(
'addCalendarChoice', 'addCalendarChoice',
'addMoreActionsButtons', 'addMoreActionsButtons',
'addMoreMassActions', 'addMoreMassActions',
'addSearchEntry', 'addSearchEntry',
'addStatisticLine', 'addStatisticLine',
'createDictionaryFieldList', 'createDictionaryFieldlist',
'editDictionaryFieldlist', 'editDictionaryFieldlist',
'getFormMail', 'getFormMail',
'deleteFile', 'deleteFile',
'doActions', 'doActions',
'doMassActions', 'doMassActions',
'formatEvent',
'formCreateThirdpartyOptions', 'formCreateThirdpartyOptions',
'formObjectOptions', 'formObjectOptions',
'formattachOptions', 'formattachOptions',
'formBuilddocLineOptions', 'formBuilddocLineOptions',
'formatNotificationMessage', 'formatNotificationMessage',
'getFormMail', 'getFormMail',
'getIdProfUrl', 'getIdProfUrl',
'getDirList', 'getDirList',
'moveUploadedFile', 'moveUploadedFile',
'moreHtmlStatus', 'moreHtmlStatus',
'pdf_build_address', 'pdf_build_address',
'pdf_writelinedesc', 'pdf_writelinedesc',
'pdf_getlinenum', 'pdf_getlinenum',
'pdf_getlineref', 'pdf_getlineref',
@ -176,12 +177,11 @@ class HookManager
'printAddress', 'printAddress',
'printSearchForm', 'printSearchForm',
'printTabsHead', 'printTabsHead',
'formatEvent', 'printObjectLine',
'printObjectLine', 'printObjectSubLine',
'printObjectSubLine',
'showLinkToObjectBlock',
'sendMail', 'sendMail',
'sendMailAfter' 'sendMailAfter',
'showLinkToObjectBlock'
) )
)) $hooktype='addreplace'; )) $hooktype='addreplace';