DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #14551 from snipe/bug/sc-25221/ambiguous_id_in_custom_report

Browse source 
Fixed ambiguous id clause in custom report
This commit is contained in:
snipe 2024-04-04 14:25:43 +01:00 committed by GitHub
parent df95447ea4 a72d4e5dc1
commit f22803c59f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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'))) {