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