Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2023-06-29 17:14:15 +01:00
commit 4dd71e0332

View file

@ -1566,7 +1566,7 @@ class Asset extends Depreciable
*/ */
public function scopeOrderModelNumber($query, $order) public function scopeOrderModelNumber($query, $order)
{ {
return $query->leftJoin('models as model_number_sort', 'assets.model_id', '=', 'models.id')->orderBy('models.model_number', $order); return $query->leftJoin('models as model_number_sort', 'assets.model_id', '=', 'model_number_sort.id')->orderBy('model_number_sort.model_number', $order);
} }