Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
4f10adfb76
1 changed files with 1 additions and 1 deletions
|
@ -696,7 +696,7 @@ class ReportsController extends Controller
|
|||
->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'))) {
|
||||
|
|
Loading…
Add table
Reference in a new issue