Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Http/Transformers/AssetModelsTransformer.php

@@ -56,7 +56,7 @@ public function transformAssetModel(AssetModel $assetmodel)
             'assets_count' => (int) $assetmodel->assets_count,
             'assets_assigned_count' => (int) $assetmodel->assets_assigned_count,
             'assets_archived_count' => (int) $assetmodel->assets_archived_count,
-            'remaining' => (int) ($assetmodel->assets_count - $assetmodel->assets_assigned_count),
+            'remaining' => (int) ($assetmodel->assets_count - (int) $assetmodel->assets_assigned_count) - (int) $assetmodel->assets_archived_count,
             'category' => ($assetmodel->category) ? [
                 'id' => (int) $assetmodel->category->id,
                 'name'=> e($assetmodel->category->name),