DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-30 07:59:50 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-04-04 14:27:35 +01:00
parent d44202e55b f22803c59f
commit 4f10adfb76
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/ReportsController.php
View file

@ -696,7 +696,7 @@ class ReportsController extends Controller
->whereBetween('action_date',[$checkout_start, $checkout_end]) ->whereBetween('action_date',[$checkout_start, $checkout_end])
->pluck('item_id'); ->pluck('item_id');
$assets->whereIn('id',$actionlogassets); $assets->whereIn('assets.id',$actionlogassets);
} }
if (($request->filled('checkin_date_start'))) { if (($request->filled('checkin_date_start'))) {