Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts: htdocs/core/modules/expedition/doc/pdf_espadon.modules.php htdocs/product/stock/class/entrepot.class.php htdocs/product/stock/list.php
2020-04-10 01:22:22 +02:00
parent 401b8b2dcc f7d1ce1e09
commit 83af4ebea4
10 changed files with 242 additions and 320 deletions
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -208,7 +208,8 @@ class HookManager
 				'sendMailAfter',
 				'showLinkToObjectBlock',
 				'setContentSecurityPolicy',
-				'setHtmlTitle'
+				'setHtmlTitle',
+                'completeTabsHead'
 				)
 			)) $hooktype='addreplace';