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

Conflicts:
	htdocs/core/js/lib_head.js.php

dev/initdemo/mysqldump_dolibarr_17.0.0.sql

@@ -1962,6 +1962,7 @@ CREATE TABLE `llx_c_holiday_types` (
   `delay` int(11) NOT NULL,
   `newbymonth` double(8,5) NOT NULL DEFAULT 0.00000,
   `fk_country` int(11) DEFAULT NULL,
+  `block_if_negative` int(11) NOT NULL DEFAULT 0,
   `active` int(11) DEFAULT 1,
   `sortorder` smallint(6) DEFAULT NULL,
   PRIMARY KEY (`rowid`),

htdocs/bookmarks/card.php

@@ -332,7 +332,7 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
 
 	// Remove
 	if ($permissiontodelete && $action != 'edit') {
-		print '<a class="butActionDelete" href="list.php?bid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>'."\n";
+		print '<a class="butActionDelete" href="list.php?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>'."\n";
 	}
 
 	print '</div>';

htdocs/core/js/lib_head.js.php

@@ -1320,6 +1320,9 @@ jQuery(document).ready(function() {
  * TODO: Recheck with the select2 GH issue and remove once this is fixed on their side
  */
 
+<?php
+if (empty($conf->global->MAIN_DISABLE_SELECT2_FOCUS_PROTECTION) && !defined('DISABLE_SELECT2_FOCUS_PROTECTION')) {
+	?>
 $(document).on('select2:open', (e) => {
 	console.log("Execute the focus (click on combo or use space when on component");
 	const target = $(e.target);
@@ -1329,6 +1332,9 @@ $(document).on('select2:open', (e) => {
 		document.querySelector('input[aria-controls*='+id+']').focus();
 	}
 });
+	<?php
+}
+?>
 
 
 // End of lib_head.js.php

htdocs/langs/en_US/help.lang

@@ -11,7 +11,7 @@ TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (free)
 TypeSupportCommercial=Commercial
 TypeOfHelp=Type
-NeedHelpCenter=Need help or support?
+NeedHelpCenter=Need support?
 Efficiency=Efficiency
 TypeHelpOnly=Help only
 TypeHelpDev=Help+Development