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

develop
This commit is contained in:
Laurent Destailleur 2025-09-12 03:06:08 +02:00
commit 59dadae226
2 changed files with 6 additions and 1 deletions

View file

@ -1,3 +1,4 @@
# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
name: "Check tag branch"
on:

View file

@ -3240,7 +3240,11 @@ abstract class CommonObject
if (!$notrigger) {
// Call trigger
$this->context = array('shippingmethodupdate' => 1);
$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);
$triggerPrefix = (empty($this->TRIGGER_PREFIX) ? strtoupper(get_class($this)) : $this->TRIGGER_PREFIX);
if (get_class($this) == 'Commande') {
$triggerPrefix = 'ORDER'; // TODO Remove this when TRIGGER_PREFI in order is implemented
}
$result = $this->call_trigger($triggerPrefix.'_MODIFY', $userused);
if ($result < 0) {
$error++;
}