Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0

Conflicts: htdocs/core/actions_massactions.inc.php
2022-07-08 10:20:55 +02:00 · 2022-07-08 10:20:55 +02:00 · 3ab82a93ec
commit 3ab82a93ec
parent 8360ea9711 7741826d34
1 changed files with 1 additions and 0 deletions
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@ -669,6 +669,7 @@ if (!$error && $massaction == 'confirm_presend') {
 	}
 }

+
 if (!$error && $massaction == 'cancelorders') {
 	$db->begin();