From a8839e0ef412babcd930da1e27c0bd9fed3f4f9d Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 6 Jan 2017 02:52:10 -0800 Subject: [PATCH] Fixes #3104, #2914 and #2918 - auto-increment incorrectly generating next ID --- app/Models/Asset.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Models/Asset.php b/app/Models/Asset.php index f26beb968..c3541ffbc 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -485,9 +485,12 @@ class Asset extends Depreciable $settings = \App\Models\Setting::getSettings(); if ($settings->auto_increment_assets == '1') { - $asset_tag = \DB::table('assets') + $temp_asset_tag = \DB::table('assets') ->where('physical', '=', '1') - ->max('id'); + ->max('asset_tag'); + + $asset_tag_digits = number_format(preg_replace('/\D/', '', $temp_asset_tag)); + $asset_tag = number_format(preg_replace('/^0*/', '', $asset_tag_digits)); if ($settings->zerofill_count > 0) { return $settings->auto_increment_prefix.Asset::zerofill(($asset_tag + 1),$settings->zerofill_count);