diff --git a/resources/lang/en/admin/depreciations/general.php b/resources/lang/en/admin/depreciations/general.php index 1e536085f..1a5666f9d 100644 --- a/resources/lang/en/admin/depreciations/general.php +++ b/resources/lang/en/admin/depreciations/general.php @@ -10,4 +10,7 @@ return [ 'number_of_months' => 'Number of Months', 'update' => 'Update Depreciation', 'depreciation_min' => 'Minimum Value after Depreciation', + 'no_depreciations_warning' => 'Warning: + You do not currently have any depreciations set up. + Please set up at least one depreciation to view the depreciation report.', ]; diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index f831f363a..2b9ffc74f 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -68,6 +68,7 @@ 'currency' => '$', // this is deprecated 'current' => 'Current', 'current_password' => 'Current Password', + 'customize_report' => 'Customize Report', 'custom_report' => 'Custom Asset Report', 'dashboard' => 'Dashboard', 'days' => 'days', @@ -205,9 +206,10 @@ 'request_canceled' => 'Request Canceled', 'save' => 'Save', 'select' => 'Select', + 'select_all' => 'Select All', 'search' => 'Search', 'select_category' => 'Select a Category', - 'select_department' => 'Select a Department', + 'select_department' => 'Select a Department', 'select_depreciation' => 'Select a Depreciation Type', 'select_location' => 'Select a Location', 'select_manufacturer' => 'Select a Manufacturer', @@ -290,9 +292,16 @@ 'setup_create_admin' => 'Create Admin User', 'setup_done' => 'Finished!', 'bulk_edit_about_to' => 'You are about to edit the following: ', - 'checked_out_to' => 'Checked out to', - 'last_checkout' => 'Last Checkout', - 'due_to_checkin' => 'The following :count items are due to be checked in soon:', - 'expected_checkin' => 'Expected Checkin', + 'checked_out_to' => 'Checked out to', + 'fields' => 'Fields', + 'last_checkout' => 'Last Checkout', + 'due_to_checkin' => 'The following :count items are due to be checked in soon:', + 'expected_checkin' => 'Expected Checkin', 'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.', + 'changed' => 'Changed', + 'to' => 'To', + 'report_fields_info' => '
Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.
+If you would like to export only certain assets, use the options below to fine-tune your results.
', + 'range' => 'Range', + 'bom_remark' => 'Add a BOM (byte-order mark) to this CSV', ]; diff --git a/resources/lang/en/table.php b/resources/lang/en/table.php index e5de4c440..3b5b9b937 100644 --- a/resources/lang/en/table.php +++ b/resources/lang/en/table.php @@ -6,5 +6,4 @@ return [ 'action' => 'Action', 'by' => 'By', 'item' => 'Item', - ]; diff --git a/resources/views/reports/activity.blade.php b/resources/views/reports/activity.blade.php index cb4daee9f..92af14ed0 100644 --- a/resources/views/reports/activity.blade.php +++ b/resources/views/reports/activity.blade.php @@ -50,9 +50,9 @@