diff --git a/module/action/model.php b/module/action/model.php index d8cc36c12f..455f0b9db5 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1944,7 +1944,7 @@ class actionModel extends model $beginAndEnd = $this->computeBeginAndEnd($period, '', $direction); $hasProduct = preg_match('/t2\.(`?)product/', $condition); - $condition = preg_replace("/AND +`?date`? +(<|>|<=|>=) +'\d{4}\-\d{2}\-\d{2}'/", '', $condition); + $condition = preg_replace("/AND +`?date`?\s?(<|>|<=|>=)\s?'\d{4}\-\d{2}\-\d{2}'/", '', $condition); $actions = $this->dao->select('action.id')->from(TABLE_ACTION)->alias('action') ->beginIF($hasProduct)->leftJoin(TABLE_ACTIONPRODUCT)->alias('t2')->on('action.id=t2.action')->fi() ->where($condition)