diff --git a/module/product/model.php b/module/product/model.php index 3e0b7d983f..3cb4d9c698 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -133,6 +133,7 @@ class productModel extends model ->beginIF($status = 'noclosed')->andWhere('status')->ne('closed')->fi() ->beginIF($status != 'all' and $status != 'noclosed')->andWhere('status')->in($status)->fi() ->beginIF($limit > 0)->limit($limit)->fi() + ->orderBy('code') ->fetchAll('id'); } diff --git a/module/project/model.php b/module/project/model.php index be1c9b5fc6..8fcc101eca 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -493,7 +493,7 @@ class projectModel extends model ->andWhere('t2.iscat')->eq(0) ->beginIF($status == 'undone')->andWhere('t2.status')->ne('done')->fi() ->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi() - ->orderBy('status') + ->orderBy('code') ->beginIF($limit)->limit($limit)->fi() ->fetchAll('id'); } @@ -503,7 +503,7 @@ class projectModel extends model ->beginIF($status == 'undone')->andWhere('status')->ne('done')->fi() ->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi() ->andWhere('deleted')->eq(0) - ->orderBy($this->config->project->orderBy) + ->orderBy('code') ->beginIF($limit)->limit($limit)->fi() ->fetchAll('id'); }