diff --git a/.github/workflows/ci-tag-check.yml b/.github/workflows/ci-tag-check.yml.disabled similarity index 82% rename from .github/workflows/ci-tag-check.yml rename to .github/workflows/ci-tag-check.yml.disabled index 9d62c3bda84..b874c6b69e3 100644 --- a/.github/workflows/ci-tag-check.yml +++ b/.github/workflows/ci-tag-check.yml.disabled @@ -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: diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 322f5539ffd..26fab7f5286 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -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++; }