Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2021-09-15 13:55:12 -07:00
commit 7e611fa699

View file

@ -102,11 +102,7 @@ class ReportsController extends Controller
{ {
$this->authorize('reports.view'); $this->authorize('reports.view');
$depreciations = Depreciation::get(); $depreciations = Depreciation::get();
// Grab all the assets return view('reports/depreciation')->with('depreciations',$depreciations);
$assets = Asset::with( 'assignedTo', 'assetstatus', 'defaultLoc', 'location', 'company', 'model.category', 'model.depreciation')
->orderBy('created_at', 'DESC')->get();
return view('reports/depreciation', compact('assets'))->with('depreciations',$depreciations);
} }
/** /**