Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts: htdocs/core/actions_massactions.inc.php
This commit is contained in:
commit
3ab82a93ec
1 changed files with 1 additions and 0 deletions
|
|
@ -669,6 +669,7 @@ if (!$error && $massaction == 'confirm_presend') {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
if (!$error && $massaction == 'cancelorders') {
|
||||
$db->begin();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue