Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2023-09-05 16:10:30 +01:00
commit 32407b531b

View file

@ -161,7 +161,7 @@ class ActionlogsTransformer
{ $location = Location::withTrashed()->get();
$supplier = Supplier::withTrashed()->get();
$model = AssetModel::withTrashed()->get();
$company = Company::withTrashed()->get();
$company = Company::get();
if(array_key_exists('rtd_location_id',$clean_meta)) {