diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 3b1d0787d5..2268008bf7 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -453,6 +453,7 @@ return [ 'item_notes' => ':item Notes', 'item_name_var' => ':item Name', 'error_user_company' => 'User and Asset companies missmatch', + 'error_user_company_accpept_view' => 'User and Asset companies doesn\'t match so you can\'t accept nor deny it, please check with your manager', 'importer' => [ 'checked_out_to_fullname' => 'Checked Out to: Full Name', 'checked_out_to_first_name' => 'Checked Out to: First Name', diff --git a/resources/views/account/accept/index.blade.php b/resources/views/account/accept/index.blade.php index 58ed542dc6..71949f6383 100755 --- a/resources/views/account/accept/index.blade.php +++ b/resources/views/account/accept/index.blade.php @@ -44,8 +44,11 @@ @if ($acceptance->checkoutable)