From 6bd72125bda8698dc067c1ed914753bbfef917b0 Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Thu, 23 Feb 2023 22:31:41 -0600 Subject: [PATCH 1/3] Deletes problematic cast --- app/Models/License.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Models/License.php b/app/Models/License.php index b715adf180..94263ee0d8 100755 --- a/app/Models/License.php +++ b/app/Models/License.php @@ -36,7 +36,6 @@ class License extends Depreciable 'purchase_date' => 'datetime', 'expiration_date' => 'datetime', 'termination_date' => 'datetime', - 'seats' => 'integer', 'category_id' => 'integer', 'company_id' => 'integer', ]; From 3e47d9e689efead37cfad1f4048d03e70f84d5f1 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 24 Feb 2023 09:54:46 -0800 Subject: [PATCH 2/3] Pass the existing asset name to the bulk checkout form Signed-off-by: snipe --- app/Http/Controllers/Assets/BulkAssetsController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php index ca48d91f43..bcaa3900b6 100644 --- a/app/Http/Controllers/Assets/BulkAssetsController.php +++ b/app/Http/Controllers/Assets/BulkAssetsController.php @@ -288,7 +288,8 @@ class BulkAssetsController extends Controller foreach ($asset_ids as $asset_id) { $asset = Asset::findOrFail($asset_id); $this->authorize('checkout', $asset); - $error = $asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->get('note')), null); + + $error = $asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->get('note')), $asset->name, null); if ($target->location_id != '') { $asset->location_id = $target->location_id; From 95501bf57cd7fb1ba9c857bc5db00fa68576e6c9 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 24 Feb 2023 09:57:25 -0800 Subject: [PATCH 3/3] Bumped hash Signed-off-by: snipe --- config/version.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/version.php b/config/version.php index f111cfb8d1..1eeb07c2c5 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v6.0.14', - 'full_app_version' => 'v6.0.14 - build 9161-g799c9c910', - 'build_version' => '9161', + 'full_app_version' => 'v6.0.14 - build 9599-g1415c8c6e', + 'build_version' => '9599', 'prerelease_version' => '', - 'hash_version' => 'g799c9c910', - 'full_hash' => 'v6.0.14-117-g799c9c910', - 'branch' => 'master', + 'hash_version' => 'g1415c8c6e', + 'full_hash' => 'v6.0.14-555-g1415c8c6e', + 'branch' => 'develop', ); \ No newline at end of file