mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-15 18:14:09 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
109c0f202a
|
@ -1178,6 +1178,10 @@ class ReportsController extends Controller
|
|||
}
|
||||
}
|
||||
|
||||
if ($assetItem->assignedTo->email == ''){
|
||||
return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.no_email'));
|
||||
}
|
||||
|
||||
return redirect()->route('reports/unaccepted_assets')->with('success', trans('admin/reports/general.reminder_sent'));
|
||||
}
|
||||
|
||||
|
|
|
@ -201,6 +201,7 @@ return [
|
|||
'new_password' => 'New Password',
|
||||
'next' => 'Next',
|
||||
'next_audit_date' => 'Next Audit Date',
|
||||
'no_email' => 'No email address associated with this user',
|
||||
'last_audit' => 'Last Audit',
|
||||
'new' => 'new!',
|
||||
'no_depreciation' => 'No Depreciation',
|
||||
|
|
Loading…
Reference in a new issue