Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2024-05-23 08:39:31 +01:00
commit fd42f1ef24

View file

@ -360,7 +360,7 @@ class LicensesController extends Controller
$license->order_number, $license->order_number,
$license->free_seat_count, $license->free_seat_count,
$license->seats, $license->seats,
$license->adminuser->present()->fullName(), ($license->adminuser ? $license->adminuser->present()->fullName() : trans('admin/reports/general.deleted_user')),
$license->depreciation ? $license->depreciation->name: '', $license->depreciation ? $license->depreciation->name: '',
$license->updated_at, $license->updated_at,
$license->deleted_at, $license->deleted_at,