Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
32407b531b
1 changed files with 1 additions and 1 deletions
|
@ -161,7 +161,7 @@ class ActionlogsTransformer
|
||||||
{ $location = Location::withTrashed()->get();
|
{ $location = Location::withTrashed()->get();
|
||||||
$supplier = Supplier::withTrashed()->get();
|
$supplier = Supplier::withTrashed()->get();
|
||||||
$model = AssetModel::withTrashed()->get();
|
$model = AssetModel::withTrashed()->get();
|
||||||
$company = Company::withTrashed()->get();
|
$company = Company::get();
|
||||||
|
|
||||||
|
|
||||||
if(array_key_exists('rtd_location_id',$clean_meta)) {
|
if(array_key_exists('rtd_location_id',$clean_meta)) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue