Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2023-10-26 21:46:45 +01:00
commit b58dea07a7

View file

@ -744,7 +744,7 @@ class ReportsController extends Controller
}
if ($request->filled('eol')) {
$row[] = ($asset->purchase_date != '') ? $asset->present()->eol_date() : '';
$row[] = ($asset->asset_eol_date) ? $asset->asset_eol_date : '';
}
if ($request->filled('order')) {