Merge remote-tracking branch 'origin/develop'

snipe · Apr 4, 2024 · 4f10adf · 4f10adf
2 parents d44202e + f22803c
commit 4f10adf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
@@ -696,7 +696,7 @@ public function postCustom(CustomAssetReportRequest $request)
                                               ->whereBetween('action_date',[$checkout_start, $checkout_end])
                                                   ->pluck('item_id');
 
-                $assets->whereIn('id',$actionlogassets);
+                $assets->whereIn('assets.id',$actionlogassets);
             }
 
             if (($request->filled('checkin_date_start'))) {