Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php
Added German (Informal) to select list
2022-08-08 15:33:10 -07:00 · 2022-08-08 15:30:58 -07:00 · 2022-08-08 15:29:28 -07:00 · 2022-08-08 14:35:04 -07:00 · 2022-08-05 18:16:20 -07:00 · 2022-08-05 18:05:21 -07:00
571 changed files with 5139 additions and 1787 deletions
@@ -2662,8 +2662,17 @@
      "avatar_url": "https://avatars.githubusercontent.com/u/7991086?v=4",
      "profile": "https://github.com/reederda",
      "contributions": [
-        "translations",
        "translation",
+        "translation",
+        "code"
+      ]
+    },
+    {
+      "login": "vickyjaura183",
+      "name": "vickyjaura183",
+      "avatar_url": "https://avatars.githubusercontent.com/u/109422491?v=4",
+      "profile": "https://github.com/vickyjaura183",
+      "contributions": [
        "code"
      ]
    }
@@ -155,8 +155,8 @@ RESET_PASSWORD_LINK_EXPIRES=900
 # --------------------------------------------
 # OPTIONAL: MISC
 # --------------------------------------------
-APP_LOG=stderr
-APP_LOG_MAX_FILES=10
+LOG_CHANNEL=stderr
+LOG_MAX_DAYS=10
 APP_LOCKED=false
 APP_CIPHER=AES-256-CBC
 GOOGLE_MAPS_API=
@@ -93,7 +93,7 @@ DISABLE_NOSAML_LOCAL_LOGIN=true
 # --------------------------------------------
 # OPTIONAL: MISC
 # --------------------------------------------
-APP_LOG=single
+LOG_CHANNEL=single
 LOG_LEVEL=debug
 LOG_CHANNEL=stack
 LOG_SLACK_WEBHOOK_URL=null
@@ -158,8 +158,8 @@ PASSWORD_RESET_MAX_ATTEMPTS_PER_MIN=50
 # --------------------------------------------
 # OPTIONAL: MISC
 # --------------------------------------------
-APP_LOG=single
-APP_LOG_MAX_FILES=10
+LOG_CHANNEL=single
+LOG_MAX_DAYS=10
 APP_LOCKED=false
 APP_CIPHER=AES-256-CBC
 APP_FORCE_TLS=false
@@ -70,5 +70,5 @@ SECURE_COOKIES=false
 # --------------------------------------------
 # OPTIONAL: APP LOG FORMAT
 # --------------------------------------------
-APP_LOG=single
-APP_LOG_LEVEL=debug
+LOG_CHANNEL=single
+LOG_LEVEL=debug
@@ -34,4 +34,4 @@ IMAGE_LIB=gd
 # --------------------------------------------
 # OPTIONAL: APP LOG FORMAT
 # --------------------------------------------
-APP_LOG=single
+LOG_CHANNEL=single
@@ -1,5 +1,5 @@
 ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-292-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
+[![All Contributors](https://img.shields.io/badge/all_contributors-294-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)

 ## Snipe-IT - Open Source Asset Management System

@@ -66,8 +66,9 @@ Since the release of the JSON REST API, several third-party developers have been
 - [Snipe-IT Kubernetes Helm Chart](https://github.com/t3n/helm-charts/tree/master/snipeit) - For more information, [click here](https://hub.helm.sh/charts/t3n/snipeit).
 - [Snipe-IT Bulk Edit](https://github.com/bricelabelle/snipe-it-bulkedit) - Google Script files to use Google Sheets as a bulk checkout/checkin/edit tool for Snipe-it.
 - [MosyleSnipeSync](https://github.com/RodneyLeeBrands/MosyleSnipeSync) by [@RodneyLeeBrands](https://github.com/RodneyLeeBrands) - Python script to synchronize information between Mosyle and Snipe-IT
+- [WWW::SnipeIT](https://github.com/SEDC/perl-www-snipeit) by [@SEDC](https://github.com/SEDC) - perl module for accessing the API
                                                     
-As these were created by third-parties, Snipe-IT cannot provide support for these project, and you should contact the developers directly if you need assistance. Additionally, Snipe-IT makes no guarantees as to the reliability, accuracy or maintainability of these libraries. Use at your own risk. :) 
+As these were created by third-parties, Snipe-IT cannot provide support for these project, and you should contact the developers directly if you need assistance. Additionally, Snipe-IT makes no guarantees as to the reliability, accuracy or maintainability of these libraries. Use at your own risk. :)

 -----

@@ -133,7 +134,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/84392209?v=4" width="110px;"/><br /><sub>Toreg87</sub>](https://github.com/Toreg87)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Toreg87 "Code") | [<img src="https://avatars.githubusercontent.com/u/67638596?v=4" width="110px;"/><br /><sub>Matthew Nickson</sub>](https://github.com/Computroniks)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Computroniks "Code") | [<img src="https://avatars.githubusercontent.com/u/1646397?v=4" width="110px;"/><br /><sub>Jethro Nederhof</sub>](https://jethron.id.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jethron "Code") | [<img src="https://avatars.githubusercontent.com/u/23289826?v=4" width="110px;"/><br /><sub>Oskar Stenberg</sub>](https://github.com/01ste02)<br />[💻](https://github.com/snipe/snipe-it/commits?author=01ste02 "Code") | [<img src="https://avatars.githubusercontent.com/u/82208283?v=4" width="110px;"/><br /><sub>Robert-Azelis</sub>](https://github.com/Robert-Azelis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Robert-Azelis "Code") | [<img src="https://avatars.githubusercontent.com/u/60648387?v=4" width="110px;"/><br /><sub>Alexander William Smith</sub>](https://github.com/alwism)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alwism "Code") | [<img src="https://avatars.githubusercontent.com/u/24418301?v=4" width="110px;"/><br /><sub>LEITWERK AG</sub>](https://www.leitwerk.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leitwerk-ag "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/1911435?v=4" width="110px;"/><br /><sub>Adam</sub>](http://www.aboutcher.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamboutcher "Code") | [<img src="https://avatars.githubusercontent.com/u/16104273?v=4" width="110px;"/><br /><sub>Ian</sub>](https://snksrv.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sneak-it "Code") | [<img src="https://avatars.githubusercontent.com/u/4023909?v=4" width="110px;"/><br /><sub>Shao Yu-Lung (Allen)</sub>](http://blog.bestlong.idv.tw/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bestlong "Code") | [<img src="https://avatars.githubusercontent.com/u/76475453?v=4" width="110px;"/><br /><sub>Haxatron</sub>](https://github.com/Haxatron)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Haxatron "Code") | [<img src="https://avatars.githubusercontent.com/u/88776392?v=4" width="110px;"/><br /><sub>PlaneNuts</sub>](https://github.com/PlaneNuts)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PlaneNuts "Code") | [<img src="https://avatars.githubusercontent.com/u/3842948?v=4" width="110px;"/><br /><sub>Bradley Coudriet</sub>](http://bjcpgd.cias.rit.edu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=exula "Code") | [<img src="https://avatars.githubusercontent.com/u/21966173?v=4" width="110px;"/><br /><sub>Dalton Durst</sub>](https://daltondur.st)<br />[💻](https://github.com/snipe/snipe-it/commits?author=UniversalSuperBox "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/38761237?v=4" width="110px;"/><br /><sub>Alex Janes</sub>](https://adagiohealth.org)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adagioajanes "Code") | [<img src="https://avatars.githubusercontent.com/u/32387849?v=4" width="110px;"/><br /><sub>Nuraeil</sub>](https://github.com/nuraeil)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nuraeil "Code") | [<img src="https://avatars.githubusercontent.com/u/48162670?v=4" width="110px;"/><br /><sub>TenOfTens</sub>](https://github.com/TenOfTens)<br />[💻](https://github.com/snipe/snipe-it/commits?author=TenOfTens "Code") | [<img src="https://avatars.githubusercontent.com/u/9415391?v=4" width="110px;"/><br /><sub>waffle</sub>](https://ditisjens.be/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=insert-waffle "Code") | [<img src="https://avatars.githubusercontent.com/u/19945501?v=4" width="110px;"/><br /><sub>Yevhenii Huzii</sub>](https://github.com/QveenSi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=QveenSi "Code") | [<img src="https://avatars.githubusercontent.com/u/3839381?v=4" width="110px;"/><br /><sub>Achmad Fienan Rahardianto</sub>](https://github.com/veenone)<br />[💻](https://github.com/snipe/snipe-it/commits?author=veenone "Code") | [<img src="https://avatars.githubusercontent.com/u/19945501?v=4" width="110px;"/><br /><sub>Yevhenii Huzii</sub>](https://github.com/QveenSi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=QveenSi "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/97299851?v=4" width="110px;"/><br /><sub>Christian Weirich</sub>](https://github.com/chrisweirich)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chrisweirich "Code") | [<img src="https://avatars.githubusercontent.com/u/1294403?v=4" width="110px;"/><br /><sub>denzfarid</sub>](https://github.com/denzfarid)<br /> | [<img src="https://avatars.githubusercontent.com/u/94018771?v=4" width="110px;"/><br /><sub>ntbutler-nbcs</sub>](https://github.com/ntbutler-nbcs)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ntbutler-nbcs "Code") | [<img src="https://avatars.githubusercontent.com/u/172697?v=4" width="110px;"/><br /><sub>Naveen</sub>](https://naveensrinivasan.dev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=naveensrinivasan "Code") | [<img src="https://avatars.githubusercontent.com/u/55674383?v=4" width="110px;"/><br /><sub>Mike Roquemore</sub>](https://github.com/mikeroq)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikeroq "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/97299851?v=4" width="110px;"/><br /><sub>Christian Weirich</sub>](https://github.com/chrisweirich)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chrisweirich "Code") | [<img src="https://avatars.githubusercontent.com/u/1294403?v=4" width="110px;"/><br /><sub>denzfarid</sub>](https://github.com/denzfarid)<br /> | [<img src="https://avatars.githubusercontent.com/u/94018771?v=4" width="110px;"/><br /><sub>ntbutler-nbcs</sub>](https://github.com/ntbutler-nbcs)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ntbutler-nbcs "Code") | [<img src="https://avatars.githubusercontent.com/u/172697?v=4" width="110px;"/><br /><sub>Naveen</sub>](https://naveensrinivasan.dev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=naveensrinivasan "Code") | [<img src="https://avatars.githubusercontent.com/u/55674383?v=4" width="110px;"/><br /><sub>Mike Roquemore</sub>](https://github.com/mikeroq)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikeroq "Code") | [<img src="https://avatars.githubusercontent.com/u/7991086?v=4" width="110px;"/><br /><sub>Daniel Reeder</sub>](https://github.com/reederda)<br />[🌍](#translation-reederda "Translation") [🌍](#translation-reederda "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=reederda "Code") | [<img src="https://avatars.githubusercontent.com/u/109422491?v=4" width="110px;"/><br /><sub>vickyjaura183</sub>](https://github.com/vickyjaura183)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vickyjaura183 "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
@@ -118,7 +118,7 @@
        "description": "The duration (in seconds) that the user should be blocked from attempting to authenticate again.",
        "value": "60"
      },
-      "APP_LOG": {
+      "LOG_CHANNEL": {
        "description": "Driver to send logs to. (errorlog for stderr)",
        "value": "errorlog"
      },
@@ -623,7 +623,7 @@ class Helper
    {
        $consumables = Consumable::withCount('consumableAssignments as consumable_assignments_count')->whereNotNull('min_amt')->get();
        $accessories = Accessory::withCount('users as users_count')->whereNotNull('min_amt')->get();
-        $components = Component::withCount('assets as assets_count')->whereNotNull('min_amt')->get();
+        $components = Component::whereNotNull('min_amt')->get();

        $avail_consumables = 0;
        $items_array = [];
@@ -668,7 +668,7 @@ class Helper
        }

        foreach ($components as $component) {
-            $avail = $component->qty - $component->assets_count;
+            $avail = $component->numRemaining();
            if ($avail < ($component->min_amt) + \App\Models\Setting::getSettings()->alert_threshold) {
                if ($component->qty > 0) {
                    $percent = number_format((($avail / $component->qty) * 100), 0);
@@ -63,7 +63,7 @@ class AccessoryCheckoutController extends Controller
        $this->authorize('checkout', $accessory);

        if (! $user = User::find($request->input('assigned_to'))) {
-            return redirect()->route('checkout/accessory', $accessory->id)->with('error', trans('admin/accessories/message.checkout.user_does_not_exist'));
+            return redirect()->route('accessories.checkout.show', $accessory->id)->with('error', trans('admin/accessories/message.checkout.user_does_not_exist'));
        }

        // Update the accessory data
@@ -885,11 +885,9 @@ class AssetsController extends Controller
        if ($request->has('status_id')) {
            $asset->status_id = $request->input('status_id');
        }
+        
+        $checkin_at = $request->filled('checkin_at') ? $request->input('checkin_at').' '. date('H:i:s') : date('Y-m-d H:i:s');

-        $checkin_at = null;
-        if ($request->filled('checkin_at')) {
-            $checkin_at = $request->input('checkin_at');
-        }

        if ($asset->save()) {
            event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note'), $checkin_at));
@@ -912,7 +910,7 @@ class AssetsController extends Controller
        $this->authorize('checkin', Asset::class);
        $asset = Asset::where('asset_tag', $request->input('asset_tag'))->first();

-        if($asset) {
+        if ($asset) {
            return $this->checkin($request, $asset->id);
        }

@@ -20,7 +20,7 @@ class ReportsController extends Controller
    {
        $this->authorize('reports.view');

-        $actionlogs = Actionlog::with('item', 'user', 'target', 'location');
+        $actionlogs = Actionlog::with('item', 'user', 'admin', 'target', 'location');

        if ($request->filled('search')) {
            $actionlogs = $actionlogs->TextSearch(e($request->input('search')));
@@ -12,6 +12,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Session;
+use App\Http\Requests\AssetCheckoutRequest;

 class BulkAssetsController extends Controller
 {
@@ -239,7 +240,7 @@ class BulkAssetsController extends Controller
     * Process Multiple Checkout Request
     * @return View
     */
-    public function storeCheckout(Request $request)
+    public function storeCheckout(AssetCheckoutRequest $request)
    {

        $this->authorize('checkout', Asset::class);
@@ -250,7 +251,7 @@ class BulkAssetsController extends Controller
            $target = $this->determineCheckoutTarget();

            if (! is_array($request->get('selected_assets'))) {
-                return redirect()->route('hardware/bulkcheckout')->withInput()->with('error', trans('admin/hardware/message.checkout.no_assets_selected'));
+                return redirect()->route('hardware.bulkcheckout.show')->withInput()->with('error', trans('admin/hardware/message.checkout.no_assets_selected'));
            }

            $asset_ids = array_filter($request->get('selected_assets'));
@@ -297,9 +298,9 @@ class BulkAssetsController extends Controller
                return redirect()->to('hardware')->with('success', trans('admin/hardware/message.checkout.success'));
            }
            // Redirect to the asset management page with error
-            return redirect()->to('hardware/bulk-checkout')->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($errors);
+            return redirect()->route('hardware.bulkcheckout.show')->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($errors);
        } catch (ModelNotFoundException $e) {
-            return redirect()->to('hardware/bulk-checkout')->with('error', $e->getErrors());
+            return redirect()->route('hardware.bulkcheckout.show')->with('error', $e->getErrors());
        }
    }
 }
@@ -142,6 +142,6 @@ class SamlController extends Controller
            return view('errors.403');
        }

-        return redirect()->route('logout')->with(['saml_logout' => true,'saml_slo_redirect_url' => $sloUrl]);
+        return redirect()->route('logout.get')->with(['saml_logout' => true,'saml_slo_redirect_url' => $sloUrl]);
    }
 }
@@ -56,7 +56,7 @@ class ConsumableCheckoutController extends Controller
        // Check if the user exists
        if (is_null($user = User::find($assigned_to))) {
            // Redirect to the consumable management page with error
-            return redirect()->route('checkout/consumable', $consumable)->with('error', trans('admin/consumables/message.checkout.user_does_not_exist'));
+            return redirect()->route('consumables.checkout.show', $consumable)->with('error', trans('admin/consumables/message.checkout.user_does_not_exist'));
        }

        // Update the consumable data
@@ -552,6 +552,10 @@ class ReportsController extends Controller
                $header[] = trans('general.updated_at');
            }

+            if ($request->filled('deleted_at')) {
+                $header[] = trans('general.deleted');
+            }
+
            if ($request->filled('last_audit_date')) {
                $header[] = trans('general.last_audit');
            }
@@ -586,7 +590,6 @@ class ReportsController extends Controller
            }

            if ($request->filled('by_rtd_location_id')) {
-                \Log::debug('RTD location should match: '.$request->input('by_rtd_location_id'));
                $assets->where('assets.rtd_location_id', $request->input('by_rtd_location_id'));
            }

@@ -607,7 +610,6 @@ class ReportsController extends Controller
            }

            if ($request->filled('by_dept_id')) {
-                \Log::debug('Only users in dept '.$request->input('by_dept_id'));
                $assets->CheckedOutToTargetInDepartment($request->input('by_dept_id'));
            }

@@ -642,9 +644,15 @@ class ReportsController extends Controller
            if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) {
                $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]);
            }
-            if($request->filled('exclude_archived')){
+            if ($request->filled('exclude_archived')) {
                $assets->notArchived();
            }
+            if ($request->input('deleted_assets') == '1') {
+                $assets->withTrashed();
+            }
+            if ($request->input('deleted_assets') == '0') {
+                $assets->onlyTrashed();
+            }

            $assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) {
            
@@ -783,7 +791,7 @@ class ReportsController extends Controller

                    if ($request->filled('warranty')) {
                        $row[] = ($asset->warranty_months) ? $asset->warranty_months : '';
-                        $row[] = $asset->present()->warrantee_expires();
+                        $row[] = $asset->present()->warranty_expires();
                    }

                    if ($request->filled('depreciation')) {
@@ -810,6 +818,10 @@ class ReportsController extends Controller
                        $row[] = ($asset->updated_at) ? $asset->updated_at : '';
                    }

+                    if ($request->filled('deleted_at')) {
+                        $row[] = ($asset->deleted_at) ? $asset->deleted_at : '';
+                    }
+
                    if ($request->filled('last_audit_date')) {
                        $row[] = ($asset->last_audit_date) ? $asset->last_audit_date : '';
                    }
@@ -5,10 +5,13 @@ namespace App\Http\Controllers\Users;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\Accessory;
+use App\Models\License;
 use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\Group;
 use App\Models\LicenseSeat;
+use App\Models\ConsumableAssignment;
+use App\Models\Consumable;
 use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -162,13 +165,11 @@ class BulkUsersController extends Controller
        if ((! $request->filled('ids')) || (count($request->input('ids')) == 0)) {
            return redirect()->back()->with('error', 'No users selected');
        }
-        if ((! $request->filled('status_id')) || ($request->input('status_id') == '')) {
-            return redirect()->route('users.index')->with('error', 'No status selected');
-        }

        if (config('app.lock_passwords')) {
            return redirect()->route('users.index')->with('error', 'Bulk delete is not enabled in this installation');
        }
+
        $user_raw_array = request('ids');

        if (($key = array_search(Auth::id(), $user_raw_array)) !== false) {
@@ -179,11 +180,18 @@ class BulkUsersController extends Controller
        $assets = Asset::whereIn('assigned_to', $user_raw_array)->where('assigned_type', \App\Models\User::class)->get();
        $accessories = DB::table('accessories_users')->whereIn('assigned_to', $user_raw_array)->get();
        $licenses = DB::table('license_seats')->whereIn('assigned_to', $user_raw_array)->get();
+        $consumables = DB::table('consumables_users')->whereIn('assigned_to', $user_raw_array)->get();
+
+        if ((($assets->count() > 0) && ((!$request->filled('status_id')) || ($request->input('status_id') == '')))) {
+            return redirect()->route('users.index')->with('error', 'No status selected');
+        }


        $this->logItemCheckinAndDelete($assets, Asset::class);
        $this->logItemCheckinAndDelete($accessories, Accessory::class);
-        $this->logItemCheckinAndDelete($licenses, LicenseSeat::class);
+        $this->logItemCheckinAndDelete($licenses, License::class);
+        $this->logItemCheckinAndDelete($consumables, Consumable::class);
+

        Asset::whereIn('id', $assets->pluck('id'))->update([
            'status_id'     => e(request('status_id')),
@@ -193,13 +201,26 @@ class BulkUsersController extends Controller


        LicenseSeat::whereIn('id', $licenses->pluck('id'))->update(['assigned_to' => null]);
+        ConsumableAssignment::whereIn('id', $consumables->pluck('id'))->delete();
+

        foreach ($users as $user) {
+
+            $user->consumables()->sync([]);
            $user->accessories()->sync([]);
-            $user->delete();
+            if ($request->input('delete_user')=='1') {
+                $user->delete();
+            }
+
        }

-        return redirect()->route('users.index')->with('success', 'Your selected users have been deleted and their assets have been updated.');
+        $msg = trans('general.bulk_checkin_success');
+        if ($request->input('delete_user')=='1') {
+            $msg = trans('general.bulk_checkin_delete_success');
+        }
+
+
+        return redirect()->route('users.index')->with('success', $msg);
    }

    /**
@@ -217,7 +238,7 @@ class BulkUsersController extends Controller
            $logAction->target_id = $item->assigned_to;
            $logAction->target_type = User::class;
            $logAction->user_id = Auth::id();
-            $logAction->note = 'Bulk checkin items and delete user';
+            $logAction->note = 'Bulk checkin items';
            $logAction->logaction('checkin from');
        }
    }
@@ -95,11 +95,11 @@ class ActionlogsTransformer
            'next_audit_date' => ($actionlog->itemType()=='asset') ? Helper::getFormattedDateObject($actionlog->calcNextAuditDate(null, $actionlog->item), 'date'): null,
            'days_to_next_audit' => $actionlog->daysUntilNextAudit($settings->audit_interval, $actionlog->item),
            'action_type'   => $actionlog->present()->actionType(),
-            'admin' => ($actionlog->user) ? [
-                'id' => (int) $actionlog->user->id,
-                'name' => e($actionlog->user->getFullNameAttribute()),
-                'first_name'=> e($actionlog->user->first_name),
-                'last_name'=> e($actionlog->user->last_name)
+            'admin' => ($actionlog->admin) ? [
+                'id' => (int) $actionlog->admin->id,
+                'name' => e($actionlog->admin->getFullNameAttribute()),
+                'first_name'=> e($actionlog->admin->first_name),
+                'last_name'=> e($actionlog->admin->last_name)
            ] : null,
            'target' => ($actionlog->target) ? [
                'id' => (int) $actionlog->target->id,
@@ -55,6 +55,11 @@ class AssetImporter extends ItemImporter
    {
        $editingAsset = false;
        $asset_tag = $this->findCsvMatch($row, 'asset_tag');
+
+        if(empty($asset_tag)){
+            $asset_tag = Asset::autoincrement_asset();
+        }
+
        $asset = Asset::where(['asset_tag'=> $asset_tag])->first();
        if ($asset) {
            if (! $this->updating) {
@@ -43,7 +43,9 @@ class Actionlog extends SnipeModel
     */
    protected $searchableRelations = [
        'company' => ['name'],
-        'user' => ['first_name','last_name','username'],
+        'admin' => ['first_name','last_name','username', 'email'],
+        'user'  => ['first_name','last_name','username', 'email'],
+        'assets'  => ['asset_tag','name'],
    ];

    /**
@@ -95,6 +97,19 @@ class Actionlog extends SnipeModel
        return $this->hasMany(\App\Models\Company::class, 'id', 'company_id');
    }

+
+    /**
+     * Establishes the actionlog -> asset relationship
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function assets()
+    {
+        return $this->hasMany(\App\Models\Asset::class, 'id', 'item_id');
+    }
+
    /**
     * Establishes the actionlog -> item type relationship
     *
@@ -154,6 +169,19 @@ class Actionlog extends SnipeModel
        return $this->target();
    }

+    /**
+     * Establishes the actionlog -> admin user relationship
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function admin()
+    {
+        return $this->belongsTo(User::class, 'user_id')
+                    ->withTrashed();
+    }
+
    /**
     * Establishes the actionlog -> user relationship
     *
@@ -163,8 +191,8 @@ class Actionlog extends SnipeModel
     */
    public function user()
    {
-        return $this->belongsTo(User::class, 'user_id')
-                    ->withTrashed();
+        return $this->belongsTo(User::class, 'target_id')
+            ->withTrashed();
    }

    /**
@@ -76,8 +76,9 @@ class AssetMaintenance extends Model implements ICompanyableChild
            trans('admin/asset_maintenances/general.upgrade')     => trans('admin/asset_maintenances/general.upgrade'),
            'PAT test'      => 'PAT test',
            trans('admin/asset_maintenances/general.calibration')     => trans('admin/asset_maintenances/general.calibration'),
-            'Software Support'      => trans('admin/asset_maintenances/general.software_support'),
-            'Hardware Support'      => trans('admin/asset_maintenances/general.hardware_support'),
+            trans('admin/asset_maintenances/general.software_support')      => trans('admin/asset_maintenances/general.software_support'),
+            trans('admin/asset_maintenances/general.hardware_support')      => trans('admin/asset_maintenances/general.hardware_support'),
+            trans('admin/asset_maintenances/general.configuration_change')     => trans('admin/asset_maintenances/general.configuration_change'),
        ];
    }

@@ -87,7 +87,7 @@ class CustomFieldset extends Model
            }

            if ($field->is_unique == '1') {
-                    $rule[] = 'unique';
+                    $rule[] = 'unique_undeleted';
            }

            array_push($rule, $field->attributes['format']);
@@ -498,10 +498,10 @@ class AssetPresenter extends Presenter
    }

    /**
-     * Date the warantee expires.
+     * Date the warranty expires.
     * @return false|string
     */
-    public function warrantee_expires()
+    public function warranty_expires()
    {
        if (($this->purchase_date) && ($this->warranty_months)) {
            $date = date_create($this->purchase_date);
@@ -371,7 +371,7 @@ class DepreciationReportPresenter extends Presenter
     * Date the warantee expires.
     * @return false|string
     */
-    public function warrantee_expires()
+    public function warranty_expires()
    {
        if (($this->purchase_date) && ($this->warranty_months)) {
            $date = date_create($this->purchase_date);
@@ -27,13 +27,12 @@
    "arietimmerman/laravel-scim-server": "dev-master",
    "bacon/bacon-qr-code": "^2.0",
    "barryvdh/laravel-debugbar": "^3.6",
-    "barryvdh/laravel-dompdf": "^1.0",
+    "barryvdh/laravel-dompdf": "^2.0",
    "doctrine/cache": "^1.10",
    "doctrine/common": "^2.12",
    "doctrine/dbal": "^3.1",
    "doctrine/inflector": "^1.3",
    "doctrine/instantiator": "^1.3",
-    "dompdf/dompdf": "^1.2",
    "eduardokum/laravel-mail-auto-embed": "^1.0",
    "enshrined/svg-sanitize": "^0.15.0",
    "erusev/parsedown": "^1.7",
@@ -127,4 +126,4 @@
    "discard-changes": true,
    "process-timeout": 3000
  }
-}
+}
@@ -129,55 +129,6 @@ return [

    'cipher' =>  env('APP_CIPHER', 'AES-256-CBC'),

-    /*
-    |--------------------------------------------------------------------------
-    | Logging Configuration
-    |--------------------------------------------------------------------------
-    |
-    | Here you may configure the log settings for your application. Out of
-    | the box, Laravel uses the Monolog PHP logging library. This gives
-    | you a variety of powerful log handlers / formatters to utilize.
-    |
-    | Available Settings: "single", "daily", "syslog", "errorlog"
-    |
-    */
-
-    'log' => env('APP_LOG', 'single'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Logging Max Files
-    |--------------------------------------------------------------------------
-    |
-    | When using the daily log mode, Laravel will only retain 5
-    | days of log files by default.
-    |
-    | To change this, set the APP_LOG_MAX_FILES option in your .env.
-    |
-    */
-
-    'log_max_files' => env('APP_LOG_MAX_FILES', 5),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Logging Detail
-    |--------------------------------------------------------------------------
-    |
-    | By default, Laravel writes all log levels to storage. However, in your
-    | production environment, you may wish to configure the minimum severity that
-    | should be logged by editing your APP_LOG_LEVEL env config.
-    |
-    | Laravel will log all levels greater than or equal to the specified severity.
-    | For example, a default log_level of error will log error, critical, alert,
-    | and emergency messages.
-    |
-    | APP_LOG_LEVEL options are:
-    | "debug", "info", "notice", "warning", "error", "critical", "alert", "emergency"
-    |
-    */
-
-    'log_level' => env('APP_LOG_LEVEL', 'error'),
-
    /*
    |--------------------------------------------------------------------------
    | Default Storage path for private uploads
@@ -44,14 +44,14 @@ return [
        'single' => [
            'driver' => 'single',
            'path' => storage_path('logs/laravel.log'),
-            'level' => env('LOG_LEVEL', 'debug'),
+            'level' => env('LOG_LEVEL', 'warning'),
        ],

        'daily' => [
            'driver' => 'daily',
            'path' => storage_path('logs/laravel.log'),
-            'level' => env('LOG_LEVEL', 'debug'),
-            'days' => 14,
+            'level' => env('LOG_LEVEL', 'warning'),
+            'days' => env('LOG_MAX_DAYS', 14),
        ],

        'slack' => [
@@ -64,7 +64,7 @@ return [

        'papertrail' => [
            'driver' => 'monolog',
-            'level' => env('LOG_LEVEL', 'debug'),
+            'level' => env('LOG_LEVEL', 'warning'),
            'handler' => SyslogUdpHandler::class,
            'handler_with' => [
                'host' => env('PAPERTRAIL_URL'),
@@ -74,7 +74,7 @@ return [

        'stderr' => [
            'driver' => 'monolog',
-            'level' => env('LOG_LEVEL', 'debug'),
+            'level' => env('LOG_LEVEL', 'warning'),
            'handler' => StreamHandler::class,
            'formatter' => env('LOG_STDERR_FORMATTER'),
            'with' => [
@@ -84,12 +84,12 @@ return [

        'syslog' => [
            'driver' => 'syslog',
-            'level' => env('LOG_LEVEL', 'debug'),
+            'level' => env('LOG_LEVEL', 'warning'),
        ],

        'errorlog' => [
            'driver' => 'errorlog',
-            'level' => env('LOG_LEVEL', 'debug'),
+            'level' => env('LOG_LEVEL', 'warning'),
        ],

        'null' => [
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v6.0.8',
-  'full_app_version' => 'v6.0.8 - build 8409-gff5d64fcb',
-  'build_version' => '8409',
+  'app_version' => 'v6.0.9',
+  'full_app_version' => 'v6.0.9 - build 8515-g51f729872',
+  'build_version' => '8515',
  'prerelease_version' => '',
-  'hash_version' => 'gff5d64fcb',
-  'full_hash' => 'v6.0.8-56-gff5d64fcb',
+  'hash_version' => 'g51f729872',
+  'full_hash' => 'v6.0.9-103-g51f729872',
  'branch' => 'master',
-);
+);
@@ -1381,7 +1381,6 @@
            "version": "2.1.5",
            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-            "dev": true,
            "requires": {
                "@nodelib/fs.stat": "2.0.5",
                "run-parallel": "^1.1.9"
@@ -1390,14 +1389,12 @@
        "@nodelib/fs.stat": {
            "version": "2.0.5",
            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-            "dev": true
+            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
        },
        "@nodelib/fs.walk": {
            "version": "1.2.8",
            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-            "dev": true,
            "requires": {
                "@nodelib/fs.scandir": "2.1.5",
                "fastq": "^1.6.0"
@@ -1416,6 +1413,11 @@
                "defer-to-connect": "^2.0.0"
            }
        },
+        "@tokenizer/token": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz",
+            "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="
+        },
        "@trysound/sax": {
            "version": "0.2.0",
            "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
@@ -2204,17 +2206,9 @@
            "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU="
        },
        "array-union": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-            "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-            "requires": {
-                "array-uniq": "^1.0.1"
-            }
-        },
-        "array-uniq": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-            "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz",
+            "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw=="
        },
        "asn1.js": {
            "version": "5.4.1",
@@ -3207,7 +3201,6 @@
            "version": "3.0.2",
            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-            "dev": true,
            "requires": {
                "fill-range": "^7.0.1"
            }
@@ -4620,7 +4613,6 @@
            "version": "3.0.1",
            "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
            "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-            "dev": true,
            "requires": {
                "path-type": "^4.0.0"
            }
@@ -5152,7 +5144,6 @@
            "version": "3.2.11",
            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
            "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
-            "dev": true,
            "requires": {
                "@nodelib/fs.stat": "^2.0.2",
                "@nodelib/fs.walk": "^1.2.3",
@@ -5191,7 +5182,6 @@
            "version": "1.13.0",
            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
            "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-            "dev": true,
            "requires": {
                "reusify": "^1.0.4"
            }
@@ -5256,15 +5246,19 @@
            "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
        },
        "file-type": {
-            "version": "4.4.0",
-            "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
-            "integrity": "sha1-G2AOX8ofvcboDApwxxyNul95BsU="
+            "version": "16.5.4",
+            "resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz",
+            "integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
+            "requires": {
+                "readable-web-to-node-stream": "^3.0.0",
+                "strtok3": "^6.2.4",
+                "token-types": "^4.1.1"
+            }
        },
        "fill-range": {
            "version": "7.0.1",
            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-            "dev": true,
            "requires": {
                "to-regex-range": "^5.0.1"
            }
@@ -14944,7 +14938,6 @@
            "version": "5.1.2",
            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-            "dev": true,
            "requires": {
                "is-glob": "^4.0.1"
            }
@@ -14961,15 +14954,23 @@
            "dev": true
        },
        "globby": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-            "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+            "version": "12.2.0",
+            "resolved": "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz",
+            "integrity": "sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA==",
            "requires": {
-                "array-union": "^1.0.1",
-                "glob": "^7.0.3",
-                "object-assign": "^4.0.1",
-                "pify": "^2.0.0",
-                "pinkie-promise": "^2.0.0"
+                "array-union": "^3.0.1",
+                "dir-glob": "^3.0.1",
+                "fast-glob": "^3.2.7",
+                "ignore": "^5.1.9",
+                "merge2": "^1.4.1",
+                "slash": "^4.0.0"
+            },
+            "dependencies": {
+                "slash": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+                    "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="
+                }
            }
        },
        "got": {
@@ -15410,8 +15411,7 @@
        "ignore": {
            "version": "5.2.0",
            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-            "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-            "dev": true
+            "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="
        },
        "image-size": {
            "version": "0.5.5",
@@ -15420,16 +15420,24 @@
            "optional": true
        },
        "imagemin": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-5.3.1.tgz",
-            "integrity": "sha1-8Zwu7h5xumxlWMUV+fyWaAGJptQ=",
+            "version": "8.0.1",
+            "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-8.0.1.tgz",
+            "integrity": "sha512-Q/QaPi+5HuwbZNtQRqUVk6hKacI6z9iWiCSQBisAv7uBynZwO7t1svkryKl7+iSQbkU/6t9DWnHz04cFs2WY7w==",
            "requires": {
-                "file-type": "^4.1.0",
-                "globby": "^6.1.0",
-                "make-dir": "^1.0.0",
-                "p-pipe": "^1.1.0",
-                "pify": "^2.3.0",
-                "replace-ext": "^1.0.0"
+                "file-type": "^16.5.3",
+                "globby": "^12.0.0",
+                "graceful-fs": "^4.2.8",
+                "junk": "^3.1.0",
+                "p-pipe": "^4.0.0",
+                "replace-ext": "^2.0.0",
+                "slash": "^3.0.0"
+            },
+            "dependencies": {
+                "replace-ext": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
+                    "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug=="
+                }
            }
        },
        "img-loader": {
@@ -15636,8 +15644,7 @@
        "is-extglob": {
            "version": "2.1.1",
            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-            "dev": true
+            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
        },
        "is-fullwidth-code-point": {
            "version": "3.0.0",
@@ -15654,7 +15661,6 @@
            "version": "4.0.3",
            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-            "dev": true,
            "requires": {
                "is-extglob": "^2.1.1"
            }
@@ -15667,8 +15673,7 @@
        "is-number": {
            "version": "7.0.0",
            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-            "dev": true
+            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
        },
        "is-plain-obj": {
            "version": "3.0.0",
@@ -15815,9 +15820,9 @@
            "integrity": "sha1-G+i3twTdOFcVJwiu+x1KSzpp+zM="
        },
        "jquery-ui": {
-            "version": "1.13.1",
-            "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.1.tgz",
-            "integrity": "sha512-2VlU59N5P4HaumDK1Z3XEVjSvegFbEOQRgpHUBaB2Ak98Axl3hFhJ6RFcNQNuk9SfL6WxIbuLst8dW/U56NSiA==",
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.2.tgz",
+            "integrity": "sha512-wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q==",
            "requires": {
                "jquery": ">=1.8.0 <4.0.0"
            }
@@ -15911,8 +15916,7 @@
        "junk": {
            "version": "3.1.0",
            "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz",
-            "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==",
-            "dev": true
+            "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ=="
        },
        "jvectormap": {
            "version": "1.2.2",
@@ -16462,21 +16466,6 @@
                "sourcemap-codec": "^1.4.1"
            }
        },
-        "make-dir": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-            "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=",
-            "requires": {
-                "pify": "^3.0.0"
-            },
-            "dependencies": {
-                "pify": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-                    "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
-                }
-            }
-        },
        "md5": {
            "version": "2.3.0",
            "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
@@ -16550,8 +16539,7 @@
        "merge2": {
            "version": "1.4.1",
            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-            "dev": true
+            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
        },
        "methods": {
            "version": "1.1.2",
@@ -16563,7 +16551,6 @@
            "version": "4.0.5",
            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
            "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-            "dev": true,
            "requires": {
                "braces": "^3.0.2",
                "picomatch": "^2.3.1"
@@ -17182,9 +17169,9 @@
            }
        },
        "p-pipe": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz",
-            "integrity": "sha1-SxoROZoRUgpneQ7loMHViB1r7+k="
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-4.0.0.tgz",
+            "integrity": "sha512-HkPfFklpZQPUKBFXzKFB6ihLriIHxnmuQdK9WmLDwe4hf2PdhhfWT/FJa+pc3bA1ywvKXtedxIRmd4Y7BTXE4w=="
        },
        "p-retry": {
            "version": "4.6.2",
@@ -17333,8 +17320,7 @@
        "path-type": {
            "version": "4.0.0",
            "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-            "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-            "dev": true
+            "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
        },
        "pbkdf2": {
            "version": "3.1.1",
@@ -17381,6 +17367,11 @@
                }
            }
        },
+        "peek-readable": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz",
+            "integrity": "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg=="
+        },
        "performance-now": {
            "version": "2.1.0",
            "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -17395,26 +17386,7 @@
        "picomatch": {
            "version": "2.3.1",
            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-            "dev": true
-        },
-        "pify": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-            "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-        },
-        "pinkie": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-            "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
-        },
-        "pinkie-promise": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-            "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-            "requires": {
-                "pinkie": "^2.0.0"
-            }
+            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
        },
        "pkg-dir": {
            "version": "4.2.0",
@@ -18324,8 +18296,7 @@
        "queue-microtask": {
            "version": "1.2.3",
            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-            "dev": true
+            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
        },
        "quick-lru": {
            "version": "5.1.1",
@@ -18423,6 +18394,39 @@
                "util-deprecate": "~1.0.1"
            }
        },
+        "readable-web-to-node-stream": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
+            "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
+            "requires": {
+                "readable-stream": "^3.6.0"
+            },
+            "dependencies": {
+                "readable-stream": {
+                    "version": "3.6.0",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+                    "requires": {
+                        "inherits": "^2.0.3",
+                        "string_decoder": "^1.1.1",
+                        "util-deprecate": "^1.0.1"
+                    }
+                },
+                "safe-buffer": {
+                    "version": "5.2.1",
+                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+                    "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+                },
+                "string_decoder": {
+                    "version": "1.3.0",
+                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+                    "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+                    "requires": {
+                        "safe-buffer": "~5.2.0"
+                    }
+                }
+            }
+        },
        "readdirp": {
            "version": "3.6.0",
            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -18524,7 +18528,8 @@
        "replace-ext": {
            "version": "1.0.1",
            "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
-            "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw=="
+            "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+            "dev": true
        },
        "require-directory": {
            "version": "2.1.1",
@@ -18606,8 +18611,7 @@
        "reusify": {
            "version": "1.0.4",
            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-            "dev": true
+            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
        },
        "rgbcolor": {
            "version": "1.0.1",
@@ -18637,7 +18641,6 @@
            "version": "1.2.0",
            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-            "dev": true,
            "requires": {
                "queue-microtask": "^1.2.2"
            }
@@ -18914,8 +18917,7 @@
        "slash": {
            "version": "3.0.0",
            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-            "dev": true
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
        },
        "slimscroll": {
            "version": "0.9.1",
@@ -19321,6 +19323,15 @@
            "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
            "dev": true
        },
+        "strtok3": {
+            "version": "6.3.0",
+            "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz",
+            "integrity": "sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==",
+            "requires": {
+                "@tokenizer/token": "^0.3.0",
+                "peek-readable": "^4.1.0"
+            }
+        },
        "style-loader": {
            "version": "2.0.0",
            "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-2.0.0.tgz",
@@ -19587,7 +19598,6 @@
            "version": "5.0.1",
            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-            "dev": true,
            "requires": {
                "is-number": "^7.0.0"
            }
@@ -19598,6 +19608,15 @@
            "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
            "dev": true
        },
+        "token-types": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/token-types/-/token-types-4.2.0.tgz",
+            "integrity": "sha512-P0rrp4wUpefLncNamWIef62J0v0kQR/GfDVji9WKY7GDCWy5YbVSrKUTam07iWPZQGy0zWNOfstYTykMmPNR7w==",
+            "requires": {
+                "@tokenizer/token": "^0.3.0",
+                "ieee754": "^1.2.1"
+            }
+        },
        "tslib": {
            "version": "2.3.1",
            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
@@ -39,10 +39,10 @@
        "css-loader": "^3.6.0",
        "ekko-lightbox": "^5.1.1",
        "icheck": "^1.0.2",
-        "imagemin": "^5.3.1",
+        "imagemin": "^8.0.1",
        "jquery-form-validator": "^2.3.79",
        "jquery-slimscroll": "^1.3.8",
-        "jquery-ui": "^1.13.1",
+        "jquery-ui": "^1.13.2",
        "jquery-ui-bundle": "^1.12.1",
        "jquery.iframe-transport": "^1.0.0",
        "jspdf-autotable": "^3.5.24",
@@ -36,7 +36,7 @@
 */

 /*!
- * jQuery UI Widget 1.13.1
+ * jQuery UI Widget 1.13.2
 * http://jqueryui.com
 *
 * Copyright jQuery Foundation and other contributors
@@ -1,20 +1,20 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=1218df365997eb1079ea543e967cb778",
+    "/js/build/app.js": "/js/build/app.js?id=9b2bd6c2e9b882c53969c66a9628a150",
    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=940da5c039a1f104654e127e0d43b801",
    "/css/build/overrides.css": "/css/build/overrides.css?id=6a8926c5699dc8117fce282bddef6222",
    "/css/build/app.css": "/css/build/app.css?id=e319e07a1e4eeb413e5667136850ea12",
    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=f25c77ed07053646a42e9c19923d24fa",
    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=083eab0a6e1062adfe24ee21a829e6c3",
-    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=43789a18d950ebfc2bdac669bbd55160",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=f67e818ef24353945aa8abd0806bcdd0",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=0a733a5644b57ea25698223e025a12c6",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=0245911190e2ff51f1710360b9fd25c4",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=b56c0c0c824d6c61b2ec83bc23633184",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=6f96d990312f7399988d14cb99d93165",
    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=bcacab67c45f81a06e6f84c4872cfd84",
-    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=d3841de28dfd9af85b7413eceb7a4d6d",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=3a6f6c5794864b09096b6abf9760142b",
    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=06ff5fe6930e974a9d13794196fcf48a",
-    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=124e298c233b61f4f9ba725a93fc0e4c",
-    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=4d4b1c24e99c2afd417bd457bc396475",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=c2713ee362b046e0495fe162a981e860",
+    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=832480a768184432af05d0109acfd7c8",
    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=c3033f52259f665b0e46b9c88543035a",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=c93c7ecba14e699417ce89902b94539f",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=c13434c44fb6016396b1f7bac44e77d2",
    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=af9b811e81b591789d1155c0d4ed42af",
    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=fc501683e0cb04a8717593610d215baf",
    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=476ccb37fe487f4d29ebfb49c198e311",
@@ -34,20 +34,20 @@
    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=ee4896df8b8f008ce73a9a0c2549aefd",
    "/js/build/vendor.js": "/js/build/vendor.js?id=47ecbb4bb3b0e02315f391caadbdf971",
    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=14d9a2affec7b066d20fcba2e6e67ad2",
-    "/js/dist/all.js": "/js/dist/all.js?id=e25ec49ad10591b90f1aa358d1cc1805",
+    "/js/dist/all.js": "/js/dist/all.js?id=065a8f4827b94b2f743fa1598ff2f196",
    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=af9b811e81b591789d1155c0d4ed42af",
-    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=c93c7ecba14e699417ce89902b94539f",
+    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=c13434c44fb6016396b1f7bac44e77d2",
    "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=c3033f52259f665b0e46b9c88543035a",
-    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=4d4b1c24e99c2afd417bd457bc396475",
+    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=832480a768184432af05d0109acfd7c8",
    "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=940da5c039a1f104654e127e0d43b801",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=f67e818ef24353945aa8abd0806bcdd0",
+    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=b56c0c0c824d6c61b2ec83bc23633184",
    "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=bcacab67c45f81a06e6f84c4872cfd84",
-    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=0a733a5644b57ea25698223e025a12c6",
+    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=6f96d990312f7399988d14cb99d93165",
    "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=476ccb37fe487f4d29ebfb49c198e311",
-    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=124e298c233b61f4f9ba725a93fc0e4c",
+    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=c2713ee362b046e0495fe162a981e860",
    "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=06ff5fe6930e974a9d13794196fcf48a",
-    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=d3841de28dfd9af85b7413eceb7a4d6d",
+    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=3a6f6c5794864b09096b6abf9760142b",
    "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=083eab0a6e1062adfe24ee21a829e6c3",
-    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=43789a18d950ebfc2bdac669bbd55160",
+    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=0245911190e2ff51f1710360b9fd25c4",
    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=fc501683e0cb04a8717593610d215baf"
 }
@@ -92,6 +92,12 @@
  }
 }

+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}

 a {
  &:hover {
@@ -87,6 +87,13 @@
  }
 }

+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+

 a {
  &:hover {
@@ -87,6 +87,12 @@
  }
 }

+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}

 a {
  &:hover {
@@ -87,6 +87,13 @@
  }
 }

+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+
 .text-primary {
  color: #fff;
 }
@@ -88,6 +88,13 @@
 }


+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+
 a {
  &:hover {
    color: var(--hover-link);
@@ -88,6 +88,14 @@
 }


+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+
+
 a {
  &:hover {
    color: #fff;
@@ -78,6 +78,12 @@
  }
 }

+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}

 a {
  &:link {
@@ -11,4 +11,6 @@
        'calibration'        => 'Calibration',
        'software_support'   => 'Software Support',
        'hardware_support'   => 'Hardware Support',
+        'configuration_change'   => 'Configuration Change',
+        'pat_test'           => 'PAT Test',
    ];
@@ -34,7 +34,7 @@ return [
    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
    'remove_group_memberships' => 'Remove Group Memberships',
    'warning_deletion' => 'WARNING:',
-    'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
+    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
    'update_user_assets_status' => 'Update all assets for these users to this status',
    'checkin_user_properties' => 'Check in all properties associated with these users',
    'remote_label'   => 'This is a remote user',
@@ -14,6 +14,7 @@ return array(
    'ldap_not_configured'        => 'LDAP-integrasie is nie vir hierdie installasie gekonfigureer nie.',
    'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
    'password_reset_sent'       => 'A password reset link has been sent to :email!',
+    'user_has_no_email'         => 'This user does not have an email address in their profile.',


    'success' => array(
@@ -58,4 +59,4 @@ return array(
        'invalidfiles' => 'Een of meer van jou lêers is te groot of is \'n filetipe wat nie toegelaat word nie. Toegelate filetipes is png, gif, jpg, doc, docx, pdf en txt.',
    ),

-);
+);
@@ -4,7 +4,7 @@ return [
    'actions' 	                => 'aksies',
    'add'    	                => 'Voeg nuwe',
    'cancel'                    => 'kanselleer',
-    'checkin_and_delete'  	    => 'Kontroleer en verwyder gebruiker',
+    'checkin_and_delete'  	    => 'Checkin All / Delete User',
    'delete'  	                => 'verwyder',
    'edit'    	                => 'wysig',
    'restore' 	                => 'herstel',
@@ -37,7 +37,7 @@ return [
    'bulk_edit'             => 'Bulk Edit',
    'bulk_delete'           => 'Bulk Delete',
    'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin &amp; Delete',
+    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
    'bystatus'              => 'by Status',
    'cancel'  				=> 'kanselleer',
    'categories'			=> 'kategorieë',
@@ -101,6 +101,8 @@ return [
    'employee_number'       => 'Employee Number',
    'email_domain_help'		=> 'Dit word gebruik om e-posadresse te genereer wanneer u dit invoer',
    'error'				    => 'Error',
+    'exclude_archived'      => 'Exclude Archived Assets',
+    'exclude_deleted'       => 'Exclude Deleted Assets',
    'example'				=> 'Example: ',
    'filastname_format'			=> 'Eerste Voorletter (jsmith@voorbeeld.com)',
    'firstname_lastname_format'	=> 'Vir Naam Van (jane.smith@example.com)',
@@ -131,6 +133,7 @@ return [
    'id'  					=> 'ID',
    'image'                 => 'Image',
    'image_delete'         	=> 'Vee prent uit',
+    'include_deleted'       => 'Include Deleted Assets',
    'image_upload'         	=> 'Laai prent op',
    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
    'filetypes_size_help'   => 'Max upload size allowed is :size.',
@@ -184,6 +187,7 @@ return [
    'no'  					=> 'Geen',
    'notes'  				=> 'notas',
    'order_number'          => 'Bestellingnommer',
+    'only_deleted'          => 'Only Deleted Assets',
    'page_menu'				=> 'Wys _MENU_ items',
    'pagination_info'		=> 'Wys _START_ tot _END_ van _TOTAL_ items',
    'pending'				=> 'hangende',
@@ -364,5 +368,9 @@ return [
    'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
    'additional_files'           => 'Additional Files',
    'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
+    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
+    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
+    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
+

 ];
@@ -11,4 +11,6 @@
        'calibration'        => 'Calibration',
        'software_support'   => 'Software Support',
        'hardware_support'   => 'Hardware Support',
+        'configuration_change'   => 'Configuration Change',
+        'pat_test'           => 'PAT Test',
    ];
@@ -34,7 +34,7 @@ return [
    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
    'remove_group_memberships' => 'Remove Group Memberships',
    'warning_deletion' => 'WARNING:',
-    'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
+    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
    'update_user_assets_status' => 'Update all assets for these users to this status',
    'checkin_user_properties' => 'Check in all properties associated with these users',
    'remote_label'   => 'This is a remote user',
@@ -14,6 +14,7 @@ return array(
    'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
    'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
    'password_reset_sent'       => 'A password reset link has been sent to :email!',
+    'user_has_no_email'         => 'This user does not have an email address in their profile.',


    'success' => array(
@@ -58,4 +59,4 @@ return array(
        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
    ),

-);
+);
@@ -4,7 +4,7 @@ return [
    'actions' 	                => 'Actions',
    'add'    	                => 'Add New',
    'cancel'                    => 'Cancel',
-    'checkin_and_delete'  	    => 'Checkin & Delete User',
+    'checkin_and_delete'  	    => 'Checkin All / Delete User',
    'delete'  	                => 'Delete',
    'edit'    	                => 'Edit',
    'restore' 	                => 'Restore',
@@ -37,7 +37,7 @@ return [
    'bulk_edit'             => 'Bulk Edit',
    'bulk_delete'           => 'Bulk Delete',
    'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin &amp; Delete',
+    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
    'bystatus'              => 'by Status',
    'cancel'  				=> 'Cancel',
    'categories'			=> 'Categories',
@@ -101,6 +101,8 @@ return [
    'employee_number'       => 'Employee Number',
    'email_domain_help'		=> 'This is used to generate email addresses when importing',
    'error'				    => 'Error',
+    'exclude_archived'      => 'Exclude Archived Assets',
+    'exclude_deleted'       => 'Exclude Deleted Assets',
    'example'				=> 'Example: ',
    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
@@ -131,6 +133,7 @@ return [
    'id'  					=> 'ID',
    'image'                 => 'Image',
    'image_delete'         	=> 'Delete Image',
+    'include_deleted'       => 'Include Deleted Assets',
    'image_upload'         	=> 'Upload Image',
    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
    'filetypes_size_help'   => 'Max upload size allowed is :size.',
@@ -184,6 +187,7 @@ return [
    'no'  					=> 'No',
    'notes'  				=> 'Notes',
    'order_number'          => 'Order Number',
+    'only_deleted'          => 'Only Deleted Assets',
    'page_menu'				=> 'Showing _MENU_ items',
    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
    'pending'				=> 'Pending',
@@ -364,5 +368,9 @@ return [
    'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
    'additional_files'           => 'Additional Files',
    'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
+    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
+    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
+    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
+

 ];
@@ -11,4 +11,6 @@
        'calibration'        => 'المعايره',
        'software_support'   => 'دعم البرامج',
        'hardware_support'   => 'دعم الأجهزة',
+        'configuration_change'   => 'Configuration Change',
+        'pat_test'           => 'PAT Test',
    ];
@@ -34,7 +34,7 @@ return [
    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
    'remove_group_memberships' => 'Remove Group Memberships',
    'warning_deletion' => 'تحذير:',
-    'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
+    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
    'update_user_assets_status' => 'Update all assets for these users to this status',
    'checkin_user_properties' => 'Check in all properties associated with these users',
    'remote_label'   => 'This is a remote user',
@@ -14,6 +14,7 @@ return array(
    'ldap_not_configured'        => 'لم يتم تكوين دمج لداب لهذا التثبيت.',
    'password_resets_sent'      => 'تم إرسال رابط إعادة تعيين كلمة المرور للمستخدمين المحددين الذين تم تفعيلهم ولديهم عناوين بريد إلكتروني صالحة.',
    'password_reset_sent'       => 'تم إرسال رابط إعادة تعيين كلمة المرور إلى البريد الإلكتروني!',
+    'user_has_no_email'         => 'This user does not have an email address in their profile.',


    'success' => array(
@@ -58,4 +59,4 @@ return array(
        'invalidfiles' => 'واحد أو أكثر من الملفات كبير جدا أو هو نوع ملف غير مسموح به. أنواع الملفات المسموح بها هي ينغ و جيف و جبغ و دوك و دوك و بدف و تكست.',
    ),

-);
+);
@@ -4,7 +4,7 @@ return [
    'actions' 	                => 'الإجراءات',
    'add'    	                => 'إضافة جديد',
    'cancel'                    => 'إلغاء',
-    'checkin_and_delete'  	    => 'فحص وحذف المستخدم',
+    'checkin_and_delete'  	    => 'Checkin All / Delete User',
    'delete'  	                => 'حذف',
    'edit'    	                => 'تعديل',
    'restore' 	                => 'إستعادة',
@@ -37,7 +37,7 @@ return [
    'bulk_edit'             => 'تحرير بالجملة',
    'bulk_delete'           => 'حذف بالجملة',
    'bulk_actions'          => 'مجموعة إجراءات',
-    'bulk_checkin_delete'   => 'التدقيق بالجملة &amp; حذف',
+    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
    'bystatus'              => 'حسب الحالة',
    'cancel'  				=> 'إلغاء',
    'categories'			=> 'التصنيفات',
@@ -101,6 +101,8 @@ return [
    'employee_number'       => 'رقم الموظف',
    'email_domain_help'		=> 'يتم استخدام هذا لتوليد عناوين البريد الإلكتروني عند الاستيراد',
    'error'				    => 'خطأ',
+    'exclude_archived'      => 'Exclude Archived Assets',
+    'exclude_deleted'       => 'Exclude Deleted Assets',
    'example'				=> 'Example: ',
    'filastname_format'			=> 'الاسم الأخير الأول (jsmith@example.com)',
    'firstname_lastname_format'	=> 'الاسم الأول الاسم الأخير (jane.smith@example.com)',
@@ -131,6 +133,7 @@ return [
    'id'  					=> 'رقم التعريف',
    'image'                 => 'صورة',
    'image_delete'         	=> 'حذف الصورة',
+    'include_deleted'       => 'Include Deleted Assets',
    'image_upload'         	=> 'رفع صورة',
    'filetypes_accepted_help'    => 'نوع الملف المقبول هو :types. الحد الأقصى لحجم التحميل المسموح به هو :size.|أنواع الملف المقبول هي :types. الحد الأقصى لحجم التحميل المسموح به هو :size.',
    'filetypes_size_help'   => 'الحد الأقصى لحجم الرفع المسموح به هو :size.',
@@ -184,6 +187,7 @@ return [
    'no'  					=> 'لا',
    'notes'  				=> 'مُلاحظات',
    'order_number'          => 'رقم الأمر',
+    'only_deleted'          => 'Only Deleted Assets',
    'page_menu'				=> 'عرض عناصر _MENU_',
    'pagination_info'		=> 'عرض _START_ إلى _END_ من إجمالي العناصر البالغ عددها TOTAL_',
    'pending'				=> 'قيد الانتظار',
@@ -329,7 +333,7 @@ return [
    'invalid_category'      => 'فئة غير صالحة',
    'dashboard_info'        => 'هذه هي لوحة التحكم الخاصة بك. هناك العديد من هذه اللوحة، ولكن هذه اللوحة لك.',
    '60_percent_warning'    => 'تم اكمال 60% (تحذير)',
-    'dashboard_empty'       => 'يبدو أنك لم تضف أي شيء حتى الآن، لذلك ليس لدينا أي شيء رائع لعرضه. ابدأ بإضافة بعض الأصول، الملحقات، المواد الاستهلاكية، أو التراخيص الآن!',
+    'dashboard_empty'       => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
    'new_asset'             => 'أصل جديد',
    'new_license'           => 'ترخيص جديد',
    'new_accessory'         => 'ملحق الجودة',
@@ -364,5 +368,9 @@ return [
    'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
    'additional_files'           => 'Additional Files',
    'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
+    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
+    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
+    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
+

 ];
@@ -11,4 +11,6 @@
        'calibration'        => 'Калибриране',
        'software_support'   => 'Софтуерна Поддръжка',
        'hardware_support'   => 'Хардуерна Поддръжка',
+        'configuration_change'   => 'Configuration Change',
+        'pat_test'           => 'PAT Test',
    ];
@@ -34,7 +34,7 @@ return [
    'admin_permission_warning' => 'Само потребители с административни права може да дадат админ достъп.',
    'remove_group_memberships' => 'Премахни членовете на групата',
    'warning_deletion' => 'ВНИМАНИЕ:',
-    'warning_deletion_information' => 'Ще изтриете всичките :count потребител(и) посочени в списъка. Супер админ имената са оцветени в червено.',
+    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
    'update_user_assets_status' => 'Update all assets for these users to this status',
    'checkin_user_properties' => 'Впиши всички асоцирани настройки към тези потребители',
    'remote_label'   => 'This is a remote user',
@@ -14,6 +14,7 @@ return array(
    'ldap_not_configured'        => 'Интеграцията с LDAP не е конфигурирана за тази инсталация.',
    'password_resets_sent'      => 'Избраните потребители, които са активирани и имат валиден е-майл адрес им беше изпратен линк за смяна на парола.',
    'password_reset_sent'       => 'A password reset link has been sent to :email!',
+    'user_has_no_email'         => 'This user does not have an email address in their profile.',


    'success' => array(
@@ -58,4 +59,4 @@ return array(
        'invalidfiles' => 'Един или повече файлове са твърде големи или с неразрешен тип. Разрешените типове файлове са png, gif, jpg, doc, docx, pdf, и txt.',
    ),

-);
+);
@@ -4,7 +4,7 @@ return [
    'actions' 	                => 'Действия',
    'add'    	                => 'Добави нов',
    'cancel'                    => 'Отказ',
-    'checkin_and_delete'  	    => 'Вписване и изтриване на потребител',
+    'checkin_and_delete'  	    => 'Checkin All / Delete User',
    'delete'  	                => 'Изтриване',
    'edit'    	                => 'Редакция',
    'restore' 	                => 'Възстановяване',
@@ -37,7 +37,7 @@ return [
    'bulk_edit'             => 'Групово редактиране',
    'bulk_delete'           => 'Групово изтриване',
    'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin &amp; Delete',
+    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
    'bystatus'              => 'по Статус',
    'cancel'  				=> 'Отказ',
    'categories'			=> 'Категории',
@@ -101,6 +101,8 @@ return [
    'employee_number'       => 'Employee Number',
    'email_domain_help'		=> 'Използвайте това за да генерирате email адреси при въвеждане',
    'error'				    => 'Error',
+    'exclude_archived'      => 'Exclude Archived Assets',
+    'exclude_deleted'       => 'Exclude Deleted Assets',
    'example'				=> 'Example: ',
    'filastname_format'			=> 'Инициал на името Фамилия (jsmith@example.com)',
    'firstname_lastname_format'	=> 'Име Фамилия (jane.smith@example.com)',
@@ -131,6 +133,7 @@ return [
    'id'  					=> 'ID',
    'image'                 => 'Изображение',
    'image_delete'         	=> 'Изтриване на изображението',
+    'include_deleted'       => 'Include Deleted Assets',
    'image_upload'         	=> 'Качване на изображение',
    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
    'filetypes_size_help'   => 'Max upload size allowed is :size.',
@@ -184,6 +187,7 @@ return [
    'no'  					=> 'Не',
    'notes'  				=> 'Бележки',
    'order_number'          => 'Номер на поръчка',
+    'only_deleted'          => 'Only Deleted Assets',
    'page_menu'				=> 'Показване на _MENU_ записа',
    'pagination_info'		=> 'Показване на _START_ до _END_ от _TOTAL_ елемента',
    'pending'				=> 'Изчакване',
@@ -364,5 +368,9 @@ return [
    'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
    'additional_files'           => 'Additional Files',
    'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
+    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
+    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
+    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
+

 ];
@@ -11,4 +11,6 @@
        'calibration'        => 'Calibration',
        'software_support'   => 'Software Support',
        'hardware_support'   => 'Hardware Support',
+        'configuration_change'   => 'Configuration Change',
+        'pat_test'           => 'PAT Test',
    ];
@@ -34,7 +34,7 @@ return [
    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
    'remove_group_memberships' => 'Remove Group Memberships',
    'warning_deletion' => 'WARNING:',
-    'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
+    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
    'update_user_assets_status' => 'Update all assets for these users to this status',
    'checkin_user_properties' => 'Check in all properties associated with these users',
    'remote_label'   => 'This is a remote user',
@@ -14,6 +14,7 @@ return array(
    'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
    'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
    'password_reset_sent'       => 'A password reset link has been sent to :email!',
+    'user_has_no_email'         => 'This user does not have an email address in their profile.',


    'success' => array(
@@ -58,4 +59,4 @@ return array(
        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
    ),

-);
+);
@@ -4,7 +4,7 @@ return [
    'actions' 	                => 'Actions',
    'add'    	                => 'Add New',
    'cancel'                    => 'Cancel',
-    'checkin_and_delete'  	    => 'Checkin & Delete User',
+    'checkin_and_delete'  	    => 'Checkin All / Delete User',
    'delete'  	                => 'Delete',
    'edit'    	                => 'Edit',
    'restore' 	                => 'Restore',
@@ -37,7 +37,7 @@ return [
    'bulk_edit'             => 'Bulk Edit',
    'bulk_delete'           => 'Bulk Delete',
    'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin &amp; Delete',
+    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
    'bystatus'              => 'by Status',
    'cancel'  				=> 'Cancel·la',
    'categories'			=> 'Categories',
@@ -101,6 +101,8 @@ return [
    'employee_number'       => 'Employee Number',
    'email_domain_help'		=> 'This is used to generate email addresses when importing',
    'error'				    => 'Error',
+    'exclude_archived'      => 'Exclude Archived Assets',
+    'exclude_deleted'       => 'Exclude Deleted Assets',
    'example'				=> 'Example: ',
    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
@@ -131,6 +133,7 @@ return [
    'id'  					=> 'ID',
    'image'                 => 'Image',
    'image_delete'         	=> 'Delete Image',
+    'include_deleted'       => 'Include Deleted Assets',
    'image_upload'         	=> 'Upload Image',
    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
    'filetypes_size_help'   => 'Max upload size allowed is :size.',
@@ -184,6 +187,7 @@ return [
    'no'  					=> 'No',
    'notes'  				=> 'Notes',
    'order_number'          => 'Order Number',
+    'only_deleted'          => 'Only Deleted Assets',
    'page_menu'				=> 'Showing _MENU_ items',
    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
    'pending'				=> 'Pending',
@@ -364,5 +368,9 @@ return [
    'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
    'additional_files'           => 'Additional Files',
    'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
+    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
+    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
+    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
+

 ];
@@ -11,4 +11,6 @@
        'calibration'        => 'Kalibrace',
        'software_support'   => 'Softwarová podpora',
        'hardware_support'   => 'Hardwarová podpora',
+        'configuration_change'   => 'Configuration Change',
+        'pat_test'           => 'PAT Test',
    ];
@@ -34,7 +34,7 @@ return [
    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
    'remove_group_memberships' => 'Remove Group Memberships',
    'warning_deletion' => 'WARNING:',
-    'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
+    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
    'update_user_assets_status' => 'Update all assets for these users to this status',
    'checkin_user_properties' => 'Check in all properties associated with these users',
    'remote_label'   => 'This is a remote user',
@@ -14,6 +14,7 @@ return array(
    'ldap_not_configured'        => 'Integrace LDAP nebyla pro tuto instalaci nakonfigurována.',
    'password_resets_sent'      => 'Vybraným uživatelům, kteří jsou aktivováni a mají platné e-mailové adresy, byl zaslán odkaz pro obnovení hesla.',
    'password_reset_sent'       => 'Odkaz pro obnovení hesla byl odeslán na :email!',
+    'user_has_no_email'         => 'This user does not have an email address in their profile.',


    'success' => array(
@@ -58,4 +59,4 @@ return array(
        'invalidfiles' => 'Jeden nebo více označených souborů je příliš velkých nebo nejsou podporované. Povolenými příponami jsou png, gif, jpg, doc, docx, pdf a txt.',
    ),

-);
+);
@@ -4,7 +4,7 @@ return [
    'actions' 	                => 'Akce',
    'add'    	                => 'Přidej nový',
    'cancel'                    => 'Zrušit',
-    'checkin_and_delete'  	    => 'Zkontrolovat a odstranit uživatele',
+    'checkin_and_delete'  	    => 'Checkin All / Delete User',
    'delete'  	                => 'Smazat',
    'edit'    	                => 'Upravit',
    'restore' 	                => 'Obnovit',
@@ -37,7 +37,7 @@ return [
    'bulk_edit'             => 'Hromadná úprava',
    'bulk_delete'           => 'Hromadné odstranění',
    'bulk_actions'          => 'Hromadné akce',
-    'bulk_checkin_delete'   => 'Hromadné odepsání &amp; Odstranit',
+    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
    'bystatus'              => 'podle stavu',
    'cancel'  				=> 'Storno',
    'categories'			=> 'Kategorie',
@@ -101,6 +101,8 @@ return [
    'employee_number'       => 'Číslo zaměstnance',
    'email_domain_help'		=> 'Toto je použito na generování e-mailových adres při importu',
    'error'				    => 'Chyba',
+    'exclude_archived'      => 'Exclude Archived Assets',
+    'exclude_deleted'       => 'Exclude Deleted Assets',
    'example'				=> 'Example: ',
    'filastname_format'			=> 'Iniciál Jména Příjmení (jsmith@example.com)',
    'firstname_lastname_format'	=> 'Jméno Příjmení (jane.smith@example.com)',
@@ -131,6 +133,7 @@ return [
    'id'  					=> 'ID',
    'image'                 => 'Obrázek',
    'image_delete'         	=> 'Smazat obrázek',
+    'include_deleted'       => 'Include Deleted Assets',
    'image_upload'         	=> 'Nahrát obrázek',
    'filetypes_accepted_help'    => 'Přijatý typ souboru je :types. Maximální povolená velikost nahrávání je :size.|Přijaté typy souborů jsou :types. Maximální povolená velikost nahrávání je :size.',
    'filetypes_size_help'   => 'Maximální povolená velikost nahrávání je :size.',
@@ -184,6 +187,7 @@ return [
    'no'  					=> 'Ne',
    'notes'  				=> 'Poznámky',
    'order_number'          => 'Číslo objednávky',
+    'only_deleted'          => 'Only Deleted Assets',
    'page_menu'				=> 'Zobrazuji _MENU_ položky',
    'pagination_info'		=> 'Zobrazuji  _START_ to _END_ of _TOTAL_ položek',
    'pending'				=> 'Čeká na vyřízení',
@@ -364,5 +368,9 @@ return [
    'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
    'additional_files'           => 'Additional Files',
    'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
+    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
+    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
+    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
+

 ];
@@ -11,4 +11,6 @@
        'calibration'        => 'Graddnodi',
        'software_support'   => 'Cefnogaeth meddalwedd',
        'hardware_support'   => 'Cefnogaeth caledwedd',
+        'configuration_change'   => 'Configuration Change',
+        'pat_test'           => 'PAT Test',
    ];
@@ -11,6 +11,6 @@ return [
    'allow' 	 			=> 'Caniatau',
    'deny' 	 				=> 'Gwrthod',
    'permission'            => 'Permission',
-    'grant'                 => 'Grant',
+    'grant'                 => 'Caniatau',
    'no_permissions'        => 'This group has no permissions.'
 ];
@@ -16,7 +16,7 @@ return [
    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
    'requestable'               => 'Ar gael',
    'requested'				    => 'Gofynnwyd amdano',
-    'not_requestable'           => 'Not Requestable',
+    'not_requestable'           => 'Ddim ar gael',
    'requestable_status_warning' => 'Do not change  requestable status',
    'restore'  					=> 'Adfer Ased',
    'pending'  					=> 'Yn disgwl',
@@ -25,6 +25,6 @@ return [
    'assigned_to'    => 'Assigned To',
    'requesting_user' => 'Requesting User',
    'requested_date' => 'Requested Date',
-    'changed'       => 'Changed',
-    'icon' => 'Icon',
+    'changed'       => 'Wedi newid',
+    'icon' => 'Eicon',
 ];
@@ -21,8 +21,8 @@ return [
    'currency'                  => 'Arian y Lleoliad',
    'ldap_ou'                   => 'OU a denyddir wrth chwilio LDAP',
    'user_name'                 => 'User Name',
-    'department'                => 'Department',
-    'location'                  => 'Location',
+    'department'                => 'Adran',
+    'location'                  => 'Lleoliad',
    'asset_tag'                 => 'Assets Tag',
    'asset_name'                => 'Name',
    'asset_category'            => 'Category',
@@ -32,7 +32,7 @@ return [
    'asset_location'            => 'Location',
    'asset_checked_out'         => 'Checked Out',
    'asset_expected_checkin'    => 'Expected Checkin',
-    'date'                      => 'Date:',
+    'date'                      => 'Dyddiad:',
    'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
    'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
    'signed_by_location_manager' => 'Signed By (Location Manager):',
@@ -53,7 +53,7 @@ return [
    'display_eol'               => 'Dangos DB yn y tabl',
    'display_qr'                => 'Arddangos Codau Sgwâr',
    'display_alt_barcode'		=> 'Arddangos barcode 1D',
-    'email_logo'                => 'Email Logo',
+    'email_logo'                => 'Logo ebyst',
    'barcode_type'				=> 'Math Barcode 2D',
    'alt_barcode_type'			=> 'Math Barcode 1D',
    'email_logo_size'       => 'Square logos in email look best. ',
@@ -96,8 +96,8 @@ return [
    'ldap_uname'                => 'Enw defnyddiwr i cysylltu trwy LDAP',
    'ldap_dept'                 => 'LDAP Department',
    'ldap_phone'                => 'LDAP Telephone Number',
-    'ldap_jobtitle'             => 'LDAP Job Title',
-    'ldap_country'              => 'LDAP Country',
+    'ldap_jobtitle'             => 'Teitl Swydd LDAP',
+    'ldap_country'              => 'Gwlad LDAP',
    'ldap_pword'                => 'Cyfrinair i cysylltu trwy LDAP',
    'ldap_basedn'               => 'DN Cyswllt Sylfaenol',
    'ldap_filter'               => 'Hidlydd LDAP',
@@ -119,8 +119,8 @@ return [
    'load_remote_help_text'		=> 'Gellith Snipe-IT gosod scripts o\'r we.',
    'login'                     => 'Login Attempts',
    'login_attempt'             => 'Login Attempt',
-    'login_ip'                  => 'IP Address',
-    'login_success'             => 'Success?',
+    'login_ip'                  => 'Cyfeiriad IP',
+    'login_success'             => 'Llwyddiant?',
    'login_user_agent'          => 'User Agent',
    'login_help'                => 'List of attempted logins',
    'login_note'                => 'Nodyn Mewngofnodi',
@@ -215,7 +215,7 @@ return [
    'value'                     => 'Gwerth',
    'brand'                     => 'Brandio',
    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
-    'brand_help'                => 'Logo, Site Name',
+    'brand_help'                => 'Logo, Enw\'r Wefan',
    'web_brand'                 => 'Web Branding Type',
    'about_settings_title'      => 'Amdan Gosodiadau',
    'about_settings_text'       => 'Mae\'r gosodiadau yma yn caniatau i chi addasu elfennau o\'r system.',
@@ -285,10 +285,10 @@ return [
    'barcode_delete_cache' => 'Delete Barcode Cache',
    'branding_title' => 'Update Branding Settings',
    'general_title' => 'Update General Settings',
-    'mail_test' => 'Send Test',
+    'mail_test' => 'Danfon Profiad',
    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
    'filter_by_keyword' => 'Filter by setting keyword',
-    'security' => 'Security',
+    'security' => 'Diogelwch',
    'security_title' => 'Update Security Settings',
    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
    'security_help' => 'Two-factor, Password Restrictions',
@@ -301,7 +301,7 @@ return [
    'notifications' => 'Notifications',
    'notifications_help' => 'Email alerts, audit settings',
    'asset_tags_help' => 'Incrementing and prefixes',
-    'labels' => 'Labels',
+    'labels' => 'Labelau',
    'labels_title' => 'Update Label Settings',
    'labels_help' => 'Label sizes &amp; settings',
    'purge' => 'Purge',
@@ -34,7 +34,7 @@ return [
    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
    'remove_group_memberships' => 'Remove Group Memberships',
    'warning_deletion' => 'WARNING:',
-    'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
+    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
    'update_user_assets_status' => 'Update all assets for these users to this status',
    'checkin_user_properties' => 'Check in all properties associated with these users',
    'remote_label'   => 'This is a remote user',
@@ -14,6 +14,7 @@ return array(
    'ldap_not_configured'        => 'Nid ywr gosodiadau I dilysu trwy LDAP wedi gosod ar y system.',
    'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
    'password_reset_sent'       => 'A password reset link has been sent to :email!',
+    'user_has_no_email'         => 'This user does not have an email address in their profile.',


    'success' => array(
@@ -58,4 +59,4 @@ return array(
        'invalidfiles' => 'Mae un neu mwy o\'r ffeiliau unai yn rhy fawr neu ddim y math cywir. Derbynir png, gif, fjp, doc, docx, pdf a txt.',
    ),

-);
+);
@@ -4,11 +4,11 @@ return [
    'actions' 	                => 'Gweithredoedd',
    'add'    	                => 'Ychwanegu newydd',
    'cancel'                    => 'Canslo',
-    'checkin_and_delete'  	    => 'Nodi i fewn a dileu defnyddiwr',
+    'checkin_and_delete'  	    => 'Checkin All / Delete User',
    'delete'  	                => 'Dileu',
    'edit'    	                => 'Addasu',
    'restore' 	                => 'Adfer',
-    'remove'                    => 'Remove',
+    'remove'                    => 'Cael gwared',
    'request'                   => 'Gofynnwyd amdano',
    'submit'  	                => 'Cyflwyno',
    'upload'                    => 'Uwchlwytho',
@@ -16,9 +16,9 @@ return [
    'select_files'				=> 'Dewis ffeiliau...',
    'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
    'send_password_link'        => 'Send Password Reset Link',
-    'go'                        => 'Go',
+    'go'                        => 'Mynd',
    'bulk_actions'              => 'Bulk Actions',
    'add_maintenance'           => 'Add Maintenance',
    'append'                    => 'Append',
-    'new'                       => 'New',
+    'new'                       => 'Newydd',
 ];
@@ -20,7 +20,7 @@ return [
    'asset_report'          => 'Adroddiad Ased',
    'asset_tag'				=> 'Tag Ased',
    'asset_tags'            => 'Asset Tags',
-    'assets_available'		=> 'Assets available',
+    'assets_available'		=> 'Asedau ar gael',
    'accept_assets'         => 'Accept Assets :name',
    'accept_assets_menu'    => 'Accept Assets',
    'audit'				    => 'Awdit',
@@ -37,7 +37,7 @@ return [
    'bulk_edit'             => 'Bulk Edit',
    'bulk_delete'           => 'Bulk Delete',
    'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin &amp; Delete',
+    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
    'bystatus'              => 'by Status',
    'cancel'  				=> 'Canslo',
    'categories'			=> 'Categoriau',
@@ -65,8 +65,8 @@ return [
    'create'				=> 'Creu newydd',
    'created'               => 'Eitem wedi\'i Greu',
    'created_asset'			=> 'ased wedi creu',
-    'created_at' 			=> 'Created At',
-    'created_by'            => 'Created By',
+    'created_at' 			=> 'Crëwyd',
+    'created_by'            => 'Crëwyd Gan',
    'record_created' 		=> 'Record Created',
    'updated_at' 			=> 'Diweddarwyd ar',
    'currency'  			=> '$', // this is deprecated
@@ -100,7 +100,9 @@ return [
    'email_format'			=> 'Fformat Ebost',
    'employee_number'       => 'Employee Number',
    'email_domain_help'		=> 'Defnyddir hwn i gynhyrchu cyfeiriadau e-bost wrth fewnforio',
-    'error'				    => 'Error',
+    'error'				    => 'Gwall',
+    'exclude_archived'      => 'Exclude Archived Assets',
+    'exclude_deleted'       => 'Exclude Deleted Assets',
    'example'				=> 'Example: ',
    'filastname_format'			=> 'Llythyren Cyntaf Enw Cyntaf Cyfenw (jsmith@example.com)',
    'firstname_lastname_format'	=> 'Enw Cyntaf Enw Olaf (jane.smith@example.com)',
@@ -131,6 +133,7 @@ return [
    'id'  					=> 'Rhif Unigryw',
    'image'                 => 'Delwedd',
    'image_delete'         	=> 'Dileu Delwedd',
+    'include_deleted'       => 'Include Deleted Assets',
    'image_upload'         	=> 'Uwchlwytho delwedd',
    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
    'filetypes_size_help'   => 'Max upload size allowed is :size.',
@@ -184,6 +187,7 @@ return [
    'no'  					=> 'Na',
    'notes'  				=> 'Nodiadau',
    'order_number'          => 'Rhif Archeb',
+    'only_deleted'          => 'Only Deleted Assets',
    'page_menu'				=> 'Showing _MENU_ items',
    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
    'pending'				=> 'Yn disgwl',
@@ -214,7 +218,7 @@ return [
    'request_canceled'      => 'Cais wedi dileu',
    'save'  				=> 'Cadw',
    'select'				=> 'Dewis',
-    'select_all'            => 'Select All',
+    'select_all'            => 'Dewis Popeth',
    'search'				=> 'Chwilio',
    'select_category'       => 'Dewis Categorï',
    'select_department'     => 'Dewsi Adran',
@@ -364,5 +368,9 @@ return [
    'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
    'additional_files'           => 'Additional Files',
    'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
+    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
+    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
+    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
+

 ];
@@ -4,5 +4,5 @@ return [
    'sent'	        => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
    'user'			=> 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
    'token'         => 'This password reset token is invalid or expired, or does not match the username provided.',
-    'reset'         => 'Your password has been reset!',
+    'reset'         => 'Mae eich cyfrinair wedi cael ei ailosod!',
 ];
@@ -11,4 +11,6 @@
        'calibration'        => 'Kalibrering',
        'software_support'   => 'Software Support',
        'hardware_support'   => 'Hardware support',
+        'configuration_change'   => 'Configuration Change',
+        'pat_test'           => 'PAT Test',
    ];
@@ -34,7 +34,7 @@ return [
    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
    'remove_group_memberships' => 'Remove Group Memberships',
    'warning_deletion' => 'WARNING:',
-    'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
+    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
    'update_user_assets_status' => 'Update all assets for these users to this status',
    'checkin_user_properties' => 'Check in all properties associated with these users',
    'remote_label'   => 'This is a remote user',
@@ -14,6 +14,7 @@ return array(
    'ldap_not_configured'        => 'LDAP-integration er ikke konfigureret til denne installation.',
    'password_resets_sent'      => 'De valgte brugere, der er aktiveret og har en gyldig e-mail-adresser, har fået tilsendt et link til nulstilling af adgangskode.',
    'password_reset_sent'       => 'A password reset link has been sent to :email!',
+    'user_has_no_email'         => 'This user does not have an email address in their profile.',


    'success' => array(
@@ -58,4 +59,4 @@ return array(
        'invalidfiles' => 'En eller flere af dine filer er for store eller er en filtype, der ikke er tilladt. Tilladte filtyper er png, gif, jpg, doc, docx, pdf og txt.',
    ),

-);
+);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	80d91c0c51	Merge remote-tracking branch 'origin/develop' Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php	2022-08-08 15:33:10 -07:00
snipe	c39bf7b7e6	Added German (Informal) to select list Signed-off-by: snipe <snipe@snipe.net>	2022-08-08 15:30:58 -07:00
snipe	9db0b038a5	Updated translation strings Signed-off-by: snipe <snipe@snipe.net>	2022-08-08 15:29:28 -07:00
snipe	4f4c4ed5be	Bumped version Signed-off-by: snipe <snipe@snipe.net>	2022-08-08 14:35:04 -07:00
snipe	51f7298720	Merge remote-tracking branch 'origin/develop'	2022-08-05 18:16:20 -07:00
snipe	bc4032c2cd	Merge pull request #11617 from inietov/fixes/components_wrong_remaining_inventory Fixed wrong calculation of assigned components	2022-08-05 18:05:21 -07:00
Ivan Nieto Vivanco	c055c91739	Change db query for an existing method	2022-08-04 09:20:20 -05:00
Ivan Nieto Vivanco	ea8f12579d	Calculate the proper amount of assigned components	2022-08-04 07:58:25 -05:00
snipe	88db2d9e18	Merge remote-tracking branch 'origin/develop'	2022-08-03 17:57:07 -07:00
snipe	5f93d7b3be	Merge pull request #11615 from inietov/fixes/autoincrement_in_importer Fix auto incrementing in CSV importer [sc-19366]	2022-08-03 17:50:23 -07:00
snipe	1875ed55cc	Merge pull request #11612 from snipe/fixes/improved_report_search Added relations to report search	2022-08-03 17:49:59 -07:00
Ivan Nieto Vivanco	9f0ecba9b9	Add autoincrementing asset tags to the import if the CSV column is empty	2022-08-03 12:48:48 -05:00
snipe	9acfceba29	Added relations to report search Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 23:50:10 -07:00
snipe	92bf8b4436	Merge remote-tracking branch 'origin/develop'	2022-08-02 20:22:02 -07:00
snipe	b52c00d49b	Merge pull request #11611 from snipe/fixes/added_configuration_change_to_maintenance_types Added configuration change to maintenance types	2022-08-02 20:21:25 -07:00
snipe	20fcf7a1e9	Added configuration change to maintenance types Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 20:19:43 -07:00
snipe	095dd3ecf2	Added configuration, PAT test strings Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 20:19:28 -07:00
snipe	5a1b8bc4b6	Fixed icheck checkbox class Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 20:19:19 -07:00
snipe	eadb36cb26	Merge remote-tracking branch 'origin/develop'	2022-08-02 20:00:13 -07:00
snipe	6eac133caf	Merge pull request #11610 from snipe/fixes/adds_deleted_at_to_custom_report_export Added deleted at to custom report export	2022-08-02 19:59:39 -07:00
snipe	cc92d342ea	Added deleted at value Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:58:37 -07:00
snipe	02caa13222	Removed debugging Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:58:30 -07:00
snipe	975b4dee2f	Added deleted header Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:58:17 -07:00
snipe	65f0a3f535	Merge pull request #11609 from snipe/fixes/checkboxes_on_custom_report Fixed labels on radio buttons in custom report	2022-08-02 19:54:14 -07:00
snipe	9ae7c66b77	Fixed indenting Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:50:21 -07:00
snipe	77ab4ac1b5	Fixed labels on radio buttons in custom report Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:48:41 -07:00
snipe	b0e66ae445	Merge remote-tracking branch 'origin/develop' Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # resources/views/locations/print.blade.php	2022-08-02 19:41:17 -07:00
snipe	5fe8db541e	Merge pull request #11608 from snipe/features/add_time_diff_to_eol Added time diff to EOL in asset view	2022-08-02 19:40:10 -07:00
snipe	87bed9b294	Fixed typo in code comments Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:24:46 -07:00
snipe	da1c1dbdd9	Added warning icon Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:19:08 -07:00
snipe	56b6904564	Added time difference Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:13:02 -07:00
snipe	10e64deafe	Updated method name in mail Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:12:44 -07:00
snipe	ac72b69ece	Update method name Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:12:28 -07:00
snipe	8e18ce74b2	Update method name Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:12:18 -07:00
snipe	254ce72415	Add @vickyjaura183 as a contributor	2022-08-02 17:20:51 -07:00
snipe	1b657ee995	Merge pull request #11601 from vickyjaura183/bugfix/error_404_bulkcheckout Error 404 fixed on submitting without mandatory field	2022-08-02 17:19:22 -07:00
snipe	71facb1850	Merge pull request #11596 from snipe/fixes/unique_undeleted_for_custom_fields Use unique_undeleted instead of unique for custom fields	2022-08-02 17:16:12 -07:00
snipe	8d8c502546	Merge pull request #11605 from snipe/fixes/really_disable_consumable_checkout Disallow checkout if qty = 0	2022-08-02 12:31:29 -07:00
snipe	0a9bd07f20	Disallow checkout if qty = 0 Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 12:27:58 -07:00
snipe	688577c1ed	Merge pull request #11604 from snipe/fixes/only_show_requested_if_requestable_perms Hide requested assets if the user cannot see requestable items	2022-08-02 11:49:22 -07:00
snipe	8027039754	Hide requested assets if the user cannot see requestable items Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 11:48:45 -07:00
snipe	031b7998c9	Merge pull request #11603 from inietov/fixes/actions_on_licenses Use apropiate string for license actions	2022-08-02 10:40:20 -07:00
Ivan Nieto Vivanco	13053b85ef	Remove Actions button and pass the correct variable to the routes	2022-08-02 12:37:27 -05:00
snipe	e3b13143bf	Merge pull request #11594 from Godmartinz/adds_deleted_asset_options_to_custom_reports Adds options to include Deleted assets to custom asset reports	2022-08-02 10:33:57 -07:00
Godfrey M	e150ab58e9	reworded trans	2022-08-02 10:31:06 -07:00
Godfrey M	ff080a2d8f	replace checkboxes with radiobuttons	2022-08-02 10:27:55 -07:00
Ivan Nieto Vivanco	a63d00bb5c	Use apropiate string for license actions	2022-08-02 11:55:11 -05:00
vishalkumar183	96b40a5edd	Error 404 fixed on sumitting witout mandtory field	2022-08-02 18:44:16 +05:30
snipe	e07532dd1b	Applied master fix to develop Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 18:55:28 -07:00
snipe	04a467bdc7	One more Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 18:53:00 -07:00
snipe	06d60bb1d1	Applied date formatter PR to master Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 18:49:56 -07:00
snipe	9c6c01bab1	Merge pull request #11597 from snipe/fixes/missed_date_formatting_on_print Fixed date format for Current Date output on location print assigned	2022-08-01 18:48:41 -07:00
snipe	4133ac6ef0	Applied date formatter to Current Date output on location print assigned Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 18:47:29 -07:00
snipe	4834c33861	Missed a named route Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 18:43:54 -07:00
snipe	904b5c2886	Merge pull request #11595 from snipe/fixes/fix_routes_for_optimize Fixed routes for optimize	2022-08-01 17:55:34 -07:00
snipe	e79a819724	Fixed inconsistency in naming Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 17:45:39 -07:00
snipe	0fdbd410b6	Use unique_undeleted instead of unique for custom fields Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 17:10:39 -07:00
snipe	af7ccf3beb	Handle logout route names Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:17:40 -07:00
snipe	3e48f436af	Handled user route names Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:13:30 -07:00
snipe	5e488bd81f	Handle components route names Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:10:39 -07:00
snipe	53ff28d2b0	Handle consumables route names Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:07:56 -07:00
snipe	4a4636bd03	Handle accessories route names Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:06:28 -07:00
snipe	744d0d299e	Handle model route names Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:03:45 -07:00
snipe	b035003546	Handled hardware route names Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 15:59:54 -07:00
Godfrey M	842dafefec	adds options to include Deleted assets to custom asset reports	2022-08-01 14:52:12 -07:00
snipe	375963f92d	Merge remote-tracking branch 'origin/develop'	2022-08-01 14:08:16 -07:00
snipe	a51b446a10	Merge pull request #11578 from snipe/fixes/conditionally_add_nbsp Switched to conditionally adding the nbsp; that the table needs for proper layout if cell is empty	2022-08-01 14:07:50 -07:00
snipe	371aba9912	Merge pull request #11593 from snipe/fixes/add_bulk_assets_to_company_view Added bulk edit to company view	2022-08-01 14:07:14 -07:00
snipe	8b30992a11	Added bulk edit to company view Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 14:06:18 -07:00
snipe	33de45d8fb	Swirtched to conditionally adding the nbsp; that the table needs for proper layout if cell is empty Signed-off-by: snipe <snipe@snipe.net>	2022-07-29 00:57:20 -07:00
snipe	d7d0056b73	Merge remote-tracking branch 'origin/develop'	2022-07-27 15:10:38 -07:00
snipe	7d2fcef807	Merge pull request #11562 from uberbrady/clarify_logging Fixed inconsistent `*_LOG_LEVEL` variables; set reasonable defaults	2022-07-25 20:02:37 -07:00
Brady Wetherington	1981b79557	Good catch! APP_LOG -> LOG_CHANNEL	2022-07-25 19:57:14 -07:00
Brady Wetherington	0c7d4a709a	Cleaned up more logging options	2022-07-25 19:25:06 -07:00
snipe	6c8d226b21	Merge pull request #11561 from snipe/features/added_perl_module_link Added link to SEDC / perl-www-snipe	2022-07-25 18:54:57 -07:00
snipe	211bbeda5b	Added link to SEDC / perl-www-snipe Signed-off-by: snipe <snipe@snipe.net>	2022-07-25 18:53:17 -07:00
Brady Wetherington	7057cb0104	Make all *_LOG_LEVEL vars consistent; set default to 'warning'	2022-07-25 18:44:37 -07:00
snipe	658edb64d6	Merge remote-tracking branch 'origin/develop'	2022-07-22 19:06:28 -07:00
snipe	dc06f14505	Merge pull request #11554 from snipe/security/upgrade_dompdf Bumped packages	2022-07-22 18:21:51 -07:00
snipe	f446314ce6	Merge pull request #11547 from snipe/fixes/midnight_timestamp Applies current time to checkin date	2022-07-22 17:58:45 -07:00
snipe	443b1df5e1	Bumped packages Signed-off-by: snipe <snipe@snipe.net>	2022-07-22 17:55:19 -07:00
snipe	3c22e0d203	Merge remote-tracking branch 'origin/develop'	2022-07-22 17:28:43 -07:00
snipe	d636ad8e09	Merge pull request #11553 from snipe/security/upgrade_imagemin Upgraded imagemin	2022-07-22 17:27:35 -07:00
snipe	adfdbf3d44	Upgraded imagemin Signed-off-by: snipe <snipe@snipe.net>	2022-07-22 17:26:47 -07:00
snipe	8b03abde8d	Production assets for dark skin fix Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/dist/skins/skin-black-dark.css # public/css/dist/skins/skin-black-dark.min.css # public/css/dist/skins/skin-blue-dark.css # public/css/dist/skins/skin-blue-dark.min.css # public/css/dist/skins/skin-green-dark.css # public/css/dist/skins/skin-green-dark.min.css # public/css/dist/skins/skin-orange-dark.css # public/css/dist/skins/skin-orange-dark.min.css # public/css/dist/skins/skin-purple-dark.css # public/css/dist/skins/skin-purple-dark.min.css # public/css/dist/skins/skin-red-dark.css # public/css/dist/skins/skin-red-dark.min.css # public/css/dist/skins/skin-yellow-dark.css # public/css/dist/skins/skin-yellow-dark.min.css # public/mix-manifest.json	2022-07-22 15:39:46 -07:00
snipe	67320dc024	Merge pull request #11551 from snipe/fixes/dark_skin_dropdowns Fixed #11549 - dark skin dropdown menu fixes	2022-07-22 15:38:02 -07:00
snipe	c5530104ff	Fixed #11549 - dark skin dropdowbn menu fixes Signed-off-by: snipe <snipe@snipe.net>	2022-07-22 15:36:51 -07:00
snipe	78097df7ff	Aplpies current time to checkin date Signed-off-by: snipe <snipe@snipe.net>	2022-07-21 21:45:25 -07:00
snipe	072e6029b6	Merge remote-tracking branch 'origin/develop'	2022-07-21 12:20:24 -07:00
snipe	5926441984	Merge pull request #11542 from snipe/features/users_checkin_without_delete Features/users checkin without delete	2022-07-20 18:59:45 -07:00
snipe	a1fe2a8d58	Fixed translation reference Signed-off-by: snipe <snipe@snipe.net>	2022-07-20 18:01:55 -07:00
snipe	25cc46e416	Fixed button string Signed-off-by: snipe <snipe@snipe.net>	2022-07-20 18:01:41 -07:00
snipe	458d61fafe	Front-end updates for checkin without delete Signed-off-by: snipe <snipe@snipe.net>	2022-07-20 17:57:39 -07:00
snipe	32010d5387	Updated language strings Signed-off-by: snipe <snipe@snipe.net>	2022-07-20 17:57:27 -07:00
snipe	7313bca403	Checkin without deleting Signed-off-by: snipe <snipe@snipe.net>	2022-07-20 17:57:19 -07:00
snipe	b7c7e6c623	Added/updated language strings Signed-off-by: snipe <snipe@snipe.net>	2022-07-20 17:56:58 -07:00
snipe	0b4d243bf0	Merge pull request #11541 from Godmartinz/gh11540_Error_405_when_checking_out_Accessory Fixes #11540 - accessory api routes from get to posts	2022-07-20 14:14:15 -07:00
Godfrey M	377c0e7075	fixes component routes	2022-07-20 13:41:35 -07:00
Godfrey M	0c4c4fc352	changes api checkin and checkout routes to post	2022-07-20 11:52:54 -07:00
snipe	29a32c4726	Merge remote-tracking branch 'origin/develop'	2022-07-19 12:46:05 -07:00
snipe	e72c4f989f	Merge pull request #11528 from uberbrady/upgrade_laravel_scim_server Upgraded our fork of laravel-scim-server to better support scim creates	2022-07-18 19:56:06 -07:00
snipe	0d656e3963	Production assets Signed-off-by: snipe <snipe@snipe.net>	2022-07-18 17:29:37 -07:00
snipe	50ce471dc6	Production assets Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json	2022-07-18 17:29:29 -07:00
snipe	8113838eee	Merge pull request #11531 from snipe/security/upgrade_jquery_ui Upgraded jquery-UI	2022-07-18 17:28:22 -07:00
snipe	a92bb80055	Upgraded jquery-UI Signed-off-by: snipe <snipe@snipe.net>	2022-07-18 17:27:54 -07:00
Brady Wetherington	b2112e6792	Whoops, bump version to have the right syntax!	2022-07-18 15:16:45 -07:00
Brady Wetherington	250db10249	Upgrade our fork of laravel-scim-server to better support scim creates	2022-07-18 15:05:42 -07:00