diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index fdb7e064cf..eb15ca3ace 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -682,7 +682,7 @@ class ReportsController extends Controller $diff = ($asset->purchase_cost - $depreciation); $row[] = Helper::formatCurrencyOutput($depreciation); $row[] = Helper::formatCurrencyOutput($diff); - $row[] = ($asset->depreciated_date()!='') ? $asset->depreciated_date()->format('Y-m-d') : ''; + $row[] = ($asset->depreciation) ? $asset->depreciated_date()->format('Y-m-d') : ''; } if ($request->filled('checkout_date')) { diff --git a/config/version.php b/config/version.php index 0c1d1c552a..e5d87281a9 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v5.0.5', - 'full_app_version' => 'v5.0.5 - build 5457-', + 'app_version' => 'v5.0.5-pre', + 'full_app_version' => 'v5.0.5-pre - build 5457-', 'build_version' => '5457', 'prerelease_version' => '', 'hash_version' => '', - 'full_hash' => 'v5.0.4', - 'branch' => 'develop', + 'full_hash' => 'v5.0.5-pre', + 'branch' => 'master', ); \ No newline at end of file diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php index 0673a3c688..82be53c897 100644 --- a/resources/lang/en/admin/settings/general.php +++ b/resources/lang/en/admin/settings/general.php @@ -6,7 +6,7 @@ return array( 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User doesn\'t require to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'This is an Active Directory server', diff --git a/routes/api.php b/routes/api.php index e631b98352..569b9533f8 100644 --- a/routes/api.php +++ b/routes/api.php @@ -808,10 +808,10 @@ Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api'] ); - Route::get('{user}/licenses', + Route::get('{user}/accessories', [ - 'as' => 'api.users.licenselist', - 'uses' => 'UsersController@licenses' + 'as' => 'api.users.accessorieslist', + 'uses' => 'UsersController@accessories' ] );