Merge remote-tracking branch 'origin/develop'

Depreciation refactor

.gitignore

@@ -16,4 +16,5 @@ public/uploads/avatars/*
 /app/storage/logs/*
 /app/storage/debugbar/
 /bin/
-.idea
+.idea
+crowdin.yaml

.travis.yml

@@ -1,3 +1,7 @@
+addons:
+  hosts:
+    - AlisonMBP
+
 # see http://about.travis-ci.org/docs/user/languages/php/ for more hints
 language: php
 
@@ -15,14 +19,16 @@ env:
 before_script:
   - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS snipeit_laravel;" -utravis; fi
   - curl -s http://getcomposer.org/installer | php
-  - cp app/config/production/database.example.php app/config/database.php
-  - cp app/config/production/mail.example.php app/config/mail.php
-  - composer install --prefer-source --no-interaction --no-dev
-  - php artisan key:generate
-  - php artisan migrate:install
-  - php artisan migrate --package cartalyst/sentry
-  - php artisan migrate
-  - php artisan db:seed
+  - cp app/config/testing/app.example.php app/config/testing/app.php
+  - cp app/config/testing/database.example.php app/config/testing/database.php
+  - cp app/config/testing/mail.example.php app/config/testing/mail.php
+  - composer self-update
+  - composer install --prefer-source --no-interaction
+  - php artisan key:generate --env=testing
+  - php artisan migrate:install --env=testing --no-interaction -vvv
+  - php artisan migrate --package cartalyst/sentry --env=testing --no-interaction -vvv
+  - php artisan migrate --env=testing --no-interaction -vvv
+  - php artisan db:seed --env=testing --no-interaction -vvv
 
 # omitting "script:" will default to phpunit
 # use the $DB env variable to determine the phpunit.xml to use

CONTRIBUTING.md

@@ -6,12 +6,12 @@ Please submit all issues and pull requests to the [snipe/snipe-it](http://github
 
 If you don't have a feature in mind, but would like to contribute back to the project, check out the [open issues](https://github.com/snipe/snipe-it/issues?state=open) and see if there are any you can tackle.
 
-We use Waffle.io to help better communicate our roadmap with users. Our [project page there](http://waffle.io/snipe/snipe-it) will show you the backlog, what's ready to be worked on, what's in progress, and what's completed.
+-----
 
 [![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready&title=Ready)](http://waffle.io/snipe/snipe-it)
 
+The labels we use in GitHub Issues and Waffle.io indicate whether we've confirmed an issue as a bug, whether we're considering the issue as a potential feature, and whether it's ready for someone to work on it. We also provide labels such as "n00b", "intermediate" and "advanced" for the experience level we think it requires for contributors who want to help.
 
------
 
 ## Translations!
 

README.md

@@ -7,7 +7,7 @@
 
 This is a FOSS project for asset management in IT Operations. Knowing who has which laptop, when it was purchased in order to depreciate it correctly, handling software licenses, etc.
 
-It is built on [Laravel 4.1](http://laravel.com) and uses the [Sentry 2](https://github.com/cartalyst/sentry) package.
+It is built on [Laravel 4.2](http://laravel.com) and uses the [Sentry 2](https://github.com/cartalyst/sentry) package.
 
 This project is being actively developed and we're [releasing quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](http://snipeitapp.com/demo.php).)
 
@@ -16,7 +16,7 @@ __This is web-based software__. This means there there is no executable file (ak
 -----
 ### Documentation & Installation
 
-__Installation and configuration documentation for this project has been moved to http://docs.snipeitapp.com.__ This provides a more easily navigated, organized view of the documentation, and is based off of the [documentation branch](https://github.com/snipe/snipe-it/tree/documentation) in this repo. Contributions and bugfixes to the documentation are always welcome!
+__Installation and configuration documentation for this project has been moved to http://snipeitapp.com/documentation/.__
 
 We'll be adding a long-overdue user's manual soon as well.
 
@@ -65,3 +65,7 @@ Whenever you pull down a new version from master or develop, when you grab the [
 	php artisan migrate
 
 Forgetting to do this can mean your DB might end up out of sync with the new files you just pulled, or you may have some funky cached autoloader values. It's a good idea to get into the habit of running these every time you pull anything new down. If there are no database changes to migrate, it won't hurt anything to run migrations anyway.
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/snipe/snipe-it/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

app/config/app.php

@@ -27,6 +27,23 @@ return array(
 
     'locale' => 'en',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Autoloaded Service Providers
+    |--------------------------------------------------------------------------
+    |
+    | This setting may be used to control the default cipher used by the Laravel
+    | encryption facilities.
+    |
+    | Note: In Laravel 4.2, the default cipher is MCRYPT_RIJNDAEL_128 (AES),
+    | which is considered to be the most secure cipher. Changing the cipher
+    | back to MCRYPT_RIJNDAEL_256 is required to decrypt cookies/values that
+    | were encrypted in Laravel <= 4.1
+    |
+    */
+
+    'cipher' => MCRYPT_RIJNDAEL_256,
+
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers
@@ -99,46 +116,47 @@ return array(
 
     'aliases' => array(
 
-            'App'             => 'Illuminate\Support\Facades\App',
-            'Artisan'         => 'Illuminate\Support\Facades\Artisan',
-            'Auth'            => 'Illuminate\Support\Facades\Auth',
-            'Blade'           => 'Illuminate\Support\Facades\Blade',
-            'Cache'           => 'Illuminate\Support\Facades\Cache',
-            'ClassLoader'     => 'Illuminate\Support\ClassLoader',
-            'Config'          => 'Illuminate\Support\Facades\Config',
-            'Controller'      => 'Illuminate\Routing\Controller',
-            'Cookie'          => 'Illuminate\Support\Facades\Cookie',
-            'Crypt'           => 'Illuminate\Support\Facades\Crypt',
-            'DB'              => 'Illuminate\Support\Facades\DB',
-            'Datatable' => 'Chumper\Datatable\Facades\DatatableFacade',
-            'Eloquent'        => 'Illuminate\Database\Eloquent\Model',
-            'Event'           => 'Illuminate\Support\Facades\Event',
-            'File'            => 'Illuminate\Support\Facades\File',
-            'Form'            => 'Illuminate\Support\Facades\Form',
-            'Hash'            => 'Illuminate\Support\Facades\Hash',
-            'HTML'            => 'Illuminate\Support\Facades\HTML',
-			'Image'           => 'Intervention\Image\ImageManagerStatic',
-            'Input'           => 'Illuminate\Support\Facades\Input',
-            'Lang'            => 'Illuminate\Support\Facades\Lang',
-            'Log'             => 'Illuminate\Support\Facades\Log',
-            'Mail'            => 'Illuminate\Support\Facades\Mail',
-            'Paginator'       => 'Illuminate\Support\Facades\Paginator',
-            'Password'        => 'Illuminate\Support\Facades\Password',
-            'Queue'           => 'Illuminate\Support\Facades\Queue',
-            'Redirect'        => 'Illuminate\Support\Facades\Redirect',
-            'Redis'           => 'Illuminate\Support\Facades\Redis',
-            'Request'         => 'Illuminate\Support\Facades\Request',
-            'Response'        => 'Illuminate\Support\Facades\Response',
-            'Route'           => 'Illuminate\Support\Facades\Route',
-            'Schema'          => 'Illuminate\Support\Facades\Schema',
-            'Seeder'          => 'Illuminate\Database\Seeder',
-            'Sentry'          => 'Cartalyst\Sentry\Facades\Laravel\Sentry',
-            'Session'         => 'Illuminate\Support\Facades\Session',
-            'SSH'             => 'Illuminate\Support\Facades\SSH',
-            'Str'             => 'Illuminate\Support\Str',
-            'URL'             => 'Illuminate\Support\Facades\URL',
-            'Validator'       => 'Illuminate\Support\Facades\Validator',
-            'View'            => 'Illuminate\Support\Facades\View'
+            'App'             		=> 'Illuminate\Support\Facades\App',
+            'Artisan'         		=> 'Illuminate\Support\Facades\Artisan',
+            'Auth'            		=> 'Illuminate\Support\Facades\Auth',
+            'Blade'           		=> 'Illuminate\Support\Facades\Blade',
+            'Cache'           		=> 'Illuminate\Support\Facades\Cache',
+            'ClassLoader'     		=> 'Illuminate\Support\ClassLoader',
+            'Config'          		=> 'Illuminate\Support\Facades\Config',
+            'Controller'      		=> 'Illuminate\Routing\Controller',
+            'Cookie'          		=> 'Illuminate\Support\Facades\Cookie',
+            'Crypt'           		=> 'Illuminate\Support\Facades\Crypt',
+            'DB'              		=> 'Illuminate\Support\Facades\DB',
+            'Datatable' 			=> 'Chumper\Datatable\Facades\DatatableFacade',
+            'Eloquent'        		=> 'Illuminate\Database\Eloquent\Model',
+            'Event'           		=> 'Illuminate\Support\Facades\Event',
+            'File'            		=> 'Illuminate\Support\Facades\File',
+            'Form'            		=> 'Illuminate\Support\Facades\Form',
+            'Hash'            		=> 'Illuminate\Support\Facades\Hash',
+            'HTML'            		=> 'Illuminate\Support\Facades\HTML',
+			'Image'           		=> 'Intervention\Image\ImageManagerStatic',
+            'Input'           		=> 'Illuminate\Support\Facades\Input',
+            'Lang'            		=> 'Illuminate\Support\Facades\Lang',
+            'Log'             		=> 'Illuminate\Support\Facades\Log',
+            'Mail'            		=> 'Illuminate\Support\Facades\Mail',
+            'Paginator'       		=> 'Illuminate\Support\Facades\Paginator',
+            'Password'        		=> 'Illuminate\Support\Facades\Password',
+            'Queue'           		=> 'Illuminate\Support\Facades\Queue',
+            'Redirect'        		=> 'Illuminate\Support\Facades\Redirect',
+            'Redis'           		=> 'Illuminate\Support\Facades\Redis',
+            'Request'         		=> 'Illuminate\Support\Facades\Request',
+            'Response'        		=> 'Illuminate\Support\Facades\Response',
+            'Route'           		=> 'Illuminate\Support\Facades\Route',
+            'Schema'          		=> 'Illuminate\Support\Facades\Schema',
+            'Seeder'          		=> 'Illuminate\Database\Seeder',
+            'Sentry'          		=> 'Cartalyst\Sentry\Facades\Laravel\Sentry',
+            'Session'         		=> 'Illuminate\Support\Facades\Session',
+            'SoftDeletingTrait'     => 'Illuminate\Database\Eloquent\SoftDeletingTrait',
+            'SSH'             		=> 'Illuminate\Support\Facades\SSH',
+            'Str'             		=> 'Illuminate\Support\Str',
+            'URL'             		=> 'Illuminate\Support\Facades\URL',
+            'Validator'       		=> 'Illuminate\Support\Facades\Validator',
+            'View'            		=> 'Illuminate\Support\Facades\View'
 
     ),
 

app/config/local/app.example.php

@@ -37,7 +37,7 @@ return array(
     | to a random, 32 character string, otherwise these encrypted strings
     | will not be safe. Please do this before deploying an application!
     |
-    | Run a php artisan key:generate --env=staging to create a random one
+    | Run a php artisan key:generate to create a random one
     */
 
     'key' => 'Change_this_key_or_snipe_will_get_ya',

app/config/local/database.example.php

@@ -61,6 +61,7 @@ return array(
             'charset'   => 'utf8',
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
+            'strict'    => false,
         ),
 
         'pgsql' => array(

app/config/testing/database.example.php

@@ -26,7 +26,7 @@ return array(
     |
     */
 
-    'default' => 'sqlite',
+    'default' => 'mysql',
 
     /*
     |--------------------------------------------------------------------------
@@ -50,6 +50,18 @@ return array(
             'database' => ':memory:',
             'prefix'   => ''
         ),
+
+        'mysql' => array(
+            'driver'    => 'mysql',
+            'host'      => 'localhost',
+            'database'  => 'snipeit_laravel',
+            'username'  => 'travis',
+            'password'  => '',
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+        ),
+
     ),
 
     /*

app/config/testing/mail.example.php

@@ -119,6 +119,6 @@ return array(
     |
     */
 
-    'pretend' => false,
+    'pretend' => true,
 
 );

app/controllers/account/ViewAssetsController.php

@@ -7,6 +7,7 @@ use Sentry;
 use Validator;
 use Location;
 use View;
+use Asset;
 
 class ViewAssetsController extends AuthorizedController
 {
@@ -33,4 +34,27 @@ class ViewAssetsController extends AuthorizedController
 	}
 
 
+	public function getRequestableIndex() {
+
+		$assets = Asset::with('model','defaultLoc')->Hardware()->RequestableAssets()->get();
+        return View::make('frontend/account/requestable-assets', compact('user','assets'));
+    }
+
+
+    public function getRequestAsset($assetId = null) {
+
+    	// Check if the asset exists
+        if (is_null($asset = Asset::find($assetId))) {
+            // Redirect to the asset management page
+            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
+        } else {
+
+
+			 return View::make('frontend/account/view-asset', compact('asset'));
+        }
+
+
+    }
+
+
 }

app/controllers/admin/AssetsController.php

@@ -38,40 +38,27 @@ class AssetsController extends AdminController
     {
         // Grab all the assets
 
+		$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')->Hardware();
         // Filter results
         if (Input::get('Pending')) {
-        	$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
-        	->whereNull('status_id','and')
-        	->where('assigned_to','=','0')
-        	->where('physical', '=', 1)
-        	->get();
+        	$assets->Pending();
         } elseif (Input::get('RTD')) {
-        	$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
-        	->where('status_id', '=', 0)
-        	->where('assigned_to', '=', '0')
-        	->where('physical', '=', 1)
-        	->orderBy('asset_tag', 'ASC')
-        	->get();
+        	$assets->RTD();
         } elseif (Input::get('Undeployable')) {
-        	$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
-        	->where('status_id', '>', 1)
-        	->where('physical', '=', 1)
-        	->orderBy('asset_tag', 'ASC')
-        	->get();
+        	$assets->Undeployable();
+        } elseif (Input::get('Archived')) {
+        	$assets->Archived();
+        } elseif (Input::get('Requestable')) {
+        	$assets->RequestableAssets();
         } elseif (Input::get('Deployed')) {
-        	$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
-        	->where('status_id', '=', 0)
-        	->where('physical', '=', 1)
-        	->where('assigned_to','>','0')
-        	->orderBy('asset_tag', 'ASC')
-        	->get();
-        } else {
-        	$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc')
-        	->where('physical', '=', 1)
-        	->orderBy('asset_tag', 'ASC')
-        	->get();
+        	$assets->Deployed();
+        } elseif (Input::get('Deleted')) {
+        	$assets->withTrashed()->Deleted();
         }
 
+        $assets = $assets->orderBy('asset_tag', 'ASC')->get();
+
+
         // Paginate the users
         /**$assets = $assets->paginate(Setting::getSettings()->per_page)
             ->appends(array(
@@ -85,6 +72,8 @@ class AssetsController extends AdminController
         return View::make('backend/hardware/index', compact('assets'));
     }
 
+
+
     /**
      * Asset create.
      *
@@ -110,7 +99,7 @@ class AssetsController extends AdminController
 
 
         // Grab the dropdown list of status
-        $statuslabel_list = array('' => Lang::get('general.pending')) + array('0' => Lang::get('general.ready_to_deploy')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
+        $statuslabel_list = Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
 
         $view = View::make('backend/hardware/edit');
         $view->with('supplier_list',$supplier_list);
@@ -174,7 +163,7 @@ class AssetsController extends AdminController
             }
 
             if (e(Input::get('assigned_to')) == '') {
-                $asset->assigned_to =  0;
+                $asset->assigned_to =  NULL;
             } else {
                 $asset->assigned_to        = e(Input::get('assigned_to'));
             }
@@ -204,7 +193,7 @@ class AssetsController extends AdminController
             $asset->order_number            = e(Input::get('order_number'));
             $asset->notes            		= e(Input::get('notes'));
             $asset->asset_tag            	= e(Input::get('asset_tag'));
-
+            $asset->mac_address 			= e(Input::get('mac_address'));
             $asset->user_id          		= Sentry::getId();
             $asset->archived          			= '0';
             $asset->physical            		= '1';
@@ -212,6 +201,17 @@ class AssetsController extends AdminController
 
             // Was the asset created?
             if($asset->save()) {
+
+            	if (Input::get('assigned_to')!='') {
+					$logaction = new Actionlog();
+					$logaction->asset_id = $asset->id;
+					$logaction->checkedout_to = $asset->assigned_to;
+					$logaction->asset_type = 'hardware';
+					$logaction->user_id = Sentry::getUser()->id;
+					$logaction->note = e(Input::get('note'));
+					$log = $logaction->logaction('checkout');
+				}
+
                 // Redirect to the asset listing page
                 return Redirect::to("hardware")->with('success', Lang::get('admin/hardware/message.create.success'));
             }
@@ -244,7 +244,7 @@ class AssetsController extends AdminController
         $location_list = array('' => '') + Location::orderBy('name', 'asc')->lists('name', 'id');
 
         // Grab the dropdown list of status
-        $statuslabel_list = array('' => Lang::get('general.pending')) + array('0' => Lang::get('general.ready_to_deploy')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
+        $statuslabel_list = Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
 
         return View::make('backend/hardware/edit', compact('asset'))->with('model_list',$model_list)->with('supplier_list',$supplier_list)->with('location_list',$location_list)->with('statuslabel_list',$statuslabel_list);
     }
@@ -306,7 +306,7 @@ class AssetsController extends AdminController
                 $asset->supplier_id        = e(Input::get('supplier_id'));
             }
 
-             if (e(Input::get('requestable')) == '') {
+            if (e(Input::get('requestable')) == '') {
                 $asset->requestable =  0;
             } else {
                 $asset->requestable        = e(Input::get('requestable'));
@@ -322,10 +322,11 @@ class AssetsController extends AdminController
             $asset->name            		= e(Input::get('name'));
             $asset->serial            		= e(Input::get('serial'));
             $asset->model_id           		= e(Input::get('model_id'));
-            $asset->order_number                = e(Input::get('order_number'));
+            $asset->order_number            = e(Input::get('order_number'));
             $asset->asset_tag           	= e(Input::get('asset_tag'));
             $asset->notes            		= e(Input::get('notes'));
             $asset->physical            	= '1';
+            $asset->mac_address 			= e(Input::get('mac_address'));
 
             // Was the asset updated?
             if($asset->save()) {
@@ -363,6 +364,12 @@ class AssetsController extends AdminController
             return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.assoc_users'));
         } else {
             // Delete the asset
+
+            DB::table('assets')
+            ->where('id', $asset->id)
+            ->update(array('assigned_to' => NULL));
+
+
             $asset->delete();
 
             // Redirect to the asset management page
@@ -490,7 +497,7 @@ class AssetsController extends AdminController
         $logaction->checkedout_to = $asset->assigned_to;
 
         // Update the asset data to null, since it's being checked in
-        $asset->assigned_to            		= '0';
+        $asset->assigned_to            		= NULL;
 
         // Was the asset updated?
         if($asset->save()) {
@@ -519,7 +526,7 @@ class AssetsController extends AdminController
     **/
     public function getView($assetId = null)
     {
-        $asset = Asset::find($assetId);
+        $asset = Asset::withTrashed()->find($assetId);
 
         if (isset($asset->id)) {
 
@@ -538,7 +545,7 @@ class AssetsController extends AdminController
             $error = Lang::get('admin/hardware/message.does_not_exist', compact('id'));
 
             // Redirect to the user management page
-            return Redirect::route('assets')->with('error', $error);
+            return Redirect::route('hardware')->with('error', $error);
         }
 
     }
@@ -595,9 +602,9 @@ class AssetsController extends AdminController
         $model_list = array('' => '') + Model::lists('name', 'id');
 
         // Grab the dropdown list of status
-        $statuslabel_list = array('' => 'Pending') + array('0' => 'Ready to Deploy') + Statuslabel::lists('name', 'id');
+        $statuslabel_list = Statuslabel::lists('name', 'id');
 
-         $location_list = array('' => '') + Location::lists('name', 'id');
+        $location_list = array('' => '') + Location::lists('name', 'id');
 
         // get depreciation list
         $depreciation_list = array('' => '') + Depreciation::lists('name', 'id');
@@ -610,4 +617,252 @@ class AssetsController extends AdminController
         return View::make('backend/hardware/edit')->with('supplier_list',$supplier_list)->with('model_list',$model_list)->with('statuslabel_list',$statuslabel_list)->with('assigned_to',$assigned_to)->with('asset',$asset)->with('location_list',$location_list);
 
     }
+
+
+    public function getRestore($assetId = null)
+    {
+
+		// Get user information
+		$asset = Asset::withTrashed()->find($assetId);
+
+		 if (isset($asset->id)) {
+
+			// Restore the user
+			$asset->restore();
+
+			// Prepare the success message
+			$success = Lang::get('admin/hardware/message.restore.success');
+
+			// Redirect to the user management page
+			return Redirect::route('hardware')->with('success', $success);
+
+		 } else {
+			 return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.not_found'));
+		 }
+
+    }
+    
+    
+       /**
+    *  Upload the file to the server
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function postUpload($assetID = null)
+    {
+        $asset = Asset::find($assetID);
+
+		// the asset is valid
+		$destinationPath = app_path().'/private_uploads';
+
+        if (isset($asset->id)) {
+
+        	if (Input::hasFile('assetfile')) {
+
+				foreach(Input::file('assetfile') as $file) {
+
+				$rules = array(
+				   'assetfile' => 'required|mimes:png,gif,jpg,jpeg,doc,docx,pdf,txt|max:2000'
+				);
+				$validator = Validator::make(array('assetfile'=> $file), $rules);
+
+					if($validator->passes()){
+
+						$extension = $file->getClientOriginalExtension();
+						$filename = 'hardware-'.$asset->id.'-'.str_random(8);
+						$filename .= '-'.Str::slug($file->getClientOriginalName()).'.'.$extension;
+						$upload_success = $file->move($destinationPath, $filename);
+
+						//Log the deletion of seats to the log
+						$logaction = new Actionlog();
+						$logaction->asset_id = $asset->id;
+						$logaction->asset_type = 'hardware';
+						$logaction->user_id = Sentry::getUser()->id;
+						$logaction->note = e(Input::get('notes'));
+						$logaction->checkedout_to =  NULL;
+						$logaction->created_at =  date("Y-m-d h:i:s");
+						$logaction->filename =  $filename;
+						$log = $logaction->logaction('uploaded');
+					} else {
+						 return Redirect::back()->with('error', Lang::get('admin/hardware/message.upload.invalidfiles'));
+					}
+
+
+				}
+
+				if ($upload_success) {
+				  	return Redirect::back()->with('success', Lang::get('admin/hardware/message.upload.success'));
+				} else {
+				   return Redirect::back()->with('success', Lang::get('admin/hardware/message.upload.error'));
+				}
+
+			} else {
+				 return Redirect::back()->with('success', Lang::get('admin/hardware/message.upload.nofiles'));
+			}
+
+
+
+
+
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/hardware/message.does_not_exist', compact('id'));
+
+            // Redirect to the hardware management page
+            return Redirect::route('hardware')->with('error', $error);
+        }
+    }
+
+
+    /**
+    *  Delete the associated file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function getDeleteFile($assetID = null, $fileId = null)
+    {
+        $asset = Asset::find($assetID);
+        $destinationPath = app_path().'/private_uploads';
+
+		// the asset is valid
+        if (isset($asset->id)) {
+
+			$log = Actionlog::find($fileId);
+			$full_filename = $destinationPath.'/'.$log->filename;
+			if (file_exists($full_filename)) {
+				unlink($destinationPath.'/'.$log->filename);
+			}
+			$log->delete();
+			return Redirect::back()->with('success', Lang::get('admin/hardware/message.deletefile.success'));
+
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/hardware/message.does_not_exist', compact('id'));
+
+            // Redirect to the hardware management page
+            return Redirect::route('hardware')->with('error', $error);
+        }
+    }
+
+
+
+    /**
+    *  Display/download the uploaded file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function displayFile($assetID = null, $fileId = null)
+    {
+
+        $asset = Asset::find($assetID);
+
+		// the asset is valid
+        if (isset($asset->id)) {
+				$log = Actionlog::find($fileId);
+				$file = $log->get_src();
+				return Response::download($file);
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/hardware/message.does_not_exist', compact('id'));
+
+            // Redirect to the hardware management page
+            return Redirect::route('hardware')->with('error', $error);
+        }
+    }
+    
+    
+    
+    
+    /**
+    *  Display bulk edit screen
+    *
+    * @return View
+    **/
+    public function postBulkEdit($assets = null)
+    {
+
+		if (Input::has('edit_asset')) {
+			
+			$assets = Input::get('edit_asset');
+			
+			$supplier_list = array('' => '') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
+	        $statuslabel_list = array('' => '') + Statuslabel::lists('name', 'id');
+	        $location_list = array('' => '') + Location::lists('name', 'id');
+		}
+
+		return View::make('backend/hardware/bulk')->with('assets',$assets)->with('supplier_list',$supplier_list)->with('statuslabel_list',$statuslabel_list)->with('location_list',$location_list);
+			 
+    }
+    
+    
+     
+    /**
+    *  Save bulk edits
+    *
+    * @return View
+    **/
+    public function postBulkSave($assets = null)
+    {
+
+		if (Input::has('bulk_edit')) {
+			
+			$assets = Input::get('bulk_edit');
+			
+			if ( (Input::has('purchase_date')) ||  (Input::has('rtd_location_id')) ||  (Input::has('status_id')) )  {
+			
+				foreach ($assets as $key => $value) {
+					
+					$update_array = array();
+					
+					if (Input::has('purchase_date')) {				
+						$update_array['purchase_date'] =  e(Input::get('purchase_date'));
+					}
+					
+					if (Input::has('rtd_location_id')) {				
+						$update_array['rtd_location_id'] = e(Input::get('rtd_location_id'));
+					}
+					
+					if (Input::has('status_id')) {				
+						$update_array['status_id'] = e(Input::get('status_id'));
+					}
+								
+					
+					if (DB::table('assets')
+		            ->where('id', $key)
+		            ->update($update_array)) {		
+			            
+			            $logaction = new Actionlog();
+			            $logaction->asset_id = $key;
+			            $logaction->asset_type = 'hardware';
+			            $logaction->created_at =  date("Y-m-d h:i:s");
+			            
+			            if (Input::has('rtd_location_id')) {	
+			            	$logaction->location_id = e(Input::get('rtd_location_id'));
+			            }
+			            $logaction->user_id = Sentry::getUser()->id;
+			            $log = $logaction->logaction('update');
+	                        
+		            }
+			          					
+				} // endforeach
+				
+				return Redirect::to("hardware")->with('success', Lang::get('admin/hardware/message.update.success'));
+
+			// no values given, nothing to update	
+			} else {
+				return Redirect::to("hardware")->with('info',Lang::get('admin/hardware/message.update.nothing_updated'));
+				
+			}
+
+
+		} // endif
+
+		return Redirect::to("hardware");	
+				 
+    }
+
+
 }

app/controllers/admin/CategoriesController.php

@@ -52,12 +52,12 @@ class CategoriesController extends AdminController
 
         // create a new model instance
         $category = new Category();
-        
+
         $validator = Validator::make(Input::all(), $category->rules);
 
         if ($validator->fails())
         {
-            // The given data did not pass validation            
+            // The given data did not pass validation
             return Redirect::back()->withInput()->withErrors($validator->messages());
         }
         else{
@@ -71,7 +71,7 @@ class CategoriesController extends AdminController
                 // Redirect to the new category  page
                 return Redirect::to("admin/settings/categories")->with('success', Lang::get('admin/categories/message.create.success'));
             }
-        } 
+        }
 
         // Redirect to the category create page
         return Redirect::to('admin/settings/categories/create')->with('error', Lang::get('admin/categories/message.create.error'));
@@ -119,9 +119,9 @@ class CategoriesController extends AdminController
         // get the POST data
         $new = Input::all();
 
-        // attempt validation       
+        // attempt validation
         $validator = Validator::make(Input::all(), $category->validationRules($categoryId));
-       
+
 
         if ($validator->fails())
         {
@@ -139,7 +139,7 @@ class CategoriesController extends AdminController
                 // Redirect to the new category page
                 return Redirect::to("admin/settings/categories")->with('success', Lang::get('admin/categories/message.update.success'));
             }
-        } 
+        }
 
         // Redirect to the category management page
         return Redirect::to("admin/settings/categories/$categoryID/edit")->with('error', Lang::get('admin/categories/message.update.error'));
@@ -178,4 +178,30 @@ class CategoriesController extends AdminController
 
 
 
+    /**
+    *  Get the asset information to present to the category view page
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function getView($categoryID = null)
+    {
+        $category = Category::find($categoryID);
+
+        if (isset($category->id)) {
+                return View::make('backend/categories/view', compact('category'));
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/categories/message.does_not_exist', compact('id'));
+
+            // Redirect to the user management page
+            return Redirect::route('categories')->with('error', $error);
+        }
+
+
+    }
+
+
+
+
 }

app/controllers/admin/LicensesController.php

@@ -18,7 +18,7 @@ use Str;
 use Supplier;
 use Validator;
 use View;
-
+use Response;
 
 class LicensesController extends AdminController
 {
@@ -94,6 +94,18 @@ class LicensesController extends AdminController
                 $license->supplier_id = e(Input::get('supplier_id'));
             }
 
+            if ( e(Input::get('maintained')) == '') {
+                $license->maintained = 0;
+            } else {
+                $license->maintained = e(Input::get('maintained'));
+            }
+
+            if ( e(Input::get('purchase_order')) == '') {
+                $license->purchase_order = '';
+            } else {
+                $license->purchase_order = e(Input::get('purchase_order'));
+            }
+
             // Save the license data
             $license->name              = e(Input::get('name'));
             $license->serial            = e(Input::get('serial'));
@@ -104,10 +116,8 @@ class LicensesController extends AdminController
             $license->seats             = e(Input::get('seats'));
             $license->purchase_date     = e(Input::get('purchase_date'));
             $license->purchase_order    = e(Input::get('purchase_order'));
-            //$license->purchase_cost   = e(Input::get('purchase_cost'));
             $license->depreciation_id   = e(Input::get('depreciation_id'));
             $license->expiration_date   = e(Input::get('expiration_date'));
-            //$license->asset_id            = e(Input::get('asset_id'));
             $license->user_id           = Sentry::getId();
 
             if (($license->purchase_date == "") || ($license->purchase_date == "0000-00-00")) {
@@ -130,7 +140,7 @@ class LicensesController extends AdminController
                     $license_seat = new LicenseSeat();
                     $license_seat->license_id       = $insertedId;
                     $license_seat->user_id          = Sentry::getId();
-                    $license_seat->assigned_to      = 0;
+                    $license_seat->assigned_to      = NULL;
                     $license_seat->notes            = NULL;
                     $license_seat->save();
                 }
@@ -252,6 +262,18 @@ class LicensesController extends AdminController
                     //$license->purchase_cost = e(Input::get('purchase_cost'));
             }
 
+            if ( e(Input::get('maintained')) == '') {
+                $license->maintained = 0;
+            } else {
+                $license->maintained = e(Input::get('maintained'));
+            }
+
+            if ( e(Input::get('purchase_order')) == '') {
+                $license->purchase_order = '';
+            } else {
+                $license->purchase_order = e(Input::get('purchase_order'));
+            }
+
 
             //Are we changing the total number of seats?
             if( $license->seats != e(Input::get('seats'))) {
@@ -292,7 +314,7 @@ class LicensesController extends AdminController
                         $license_seat = new LicenseSeat();
                         $license_seat->license_id       = $license->id;
                         $license_seat->user_id          = Sentry::getId();
-                        $license_seat->assigned_to      = 0;
+                        $license_seat->assigned_to      = NULL;
                         $license_seat->notes            = NULL;
                         $license_seat->save();
                     }
@@ -346,11 +368,17 @@ class LicensesController extends AdminController
         } else {
 
             // Delete the license and the associated license seats
+            DB::table('license_seats')
+            ->where('id', $license->id)
+            ->update(array('assigned_to' => NULL,'asset_id' => NULL));
+
             $licenseseats = $license->licenseseats();
             $licenseseats->delete();
             $license->delete();
 
 
+
+
             // Redirect to the licenses management page
             return Redirect::to('admin/licenses')->with('success', Lang::get('admin/licenses/message.delete.success'));
         }
@@ -377,8 +405,9 @@ class LicensesController extends AdminController
         // Left join to get a list of assets and some other helpful info
         $asset = DB::table('assets')
             ->leftJoin('users', 'users.id', '=', 'assets.assigned_to')
-            ->select('assets.id', 'name', 'first_name', 'last_name','asset_tag',
-            DB::raw('concat (first_name," ",last_name) as full_name, assets.id as id'))
+            ->leftJoin('models', 'assets.model_id', '=', 'models.id')
+            ->select('assets.id', 'assets.name', 'first_name', 'last_name','asset_tag',
+            DB::raw('concat (first_name," ",last_name) as full_name, assets.id as id, models.name as modelname'))
             ->whereNull('assets.deleted_at')
             ->get();
 
@@ -389,9 +418,9 @@ class LicensesController extends AdminController
             for ($x=0; $x<count($asset_array); $x++) {
 
                 if ($asset_array[$x]['full_name']!='') {
-                    $full_name = ' ('.$asset_array[$x]['full_name'].')';
+                    $full_name = ' ('.$asset_array[$x]['full_name'].') '.$asset_array[$x]['modelname'];
                 } else {
-                    $full_name = ' (Unassigned)';
+                    $full_name = ' (Unassigned) '.$asset_array[$x]['modelname'];
                 }
                 $asset_element[$asset_array[$x]['id']] = $asset_array[$x]['asset_tag'].' - '.$asset_array[$x]['name'].$full_name;
 
@@ -549,7 +578,7 @@ class LicensesController extends AdminController
         $logaction->checkedout_to = $licenseseat->assigned_to;
 
         // Update the asset data
-        $licenseseat->assigned_to                   = '0';
+        $licenseseat->assigned_to                   = NULL;
         $licenseseat->asset_id                      = NULL;
 
         // Was the asset updated?
@@ -612,4 +641,135 @@ class LicensesController extends AdminController
         return View::make('backend/licenses/edit')->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('supplier_list',$supplier_list)->with('license',$license)->with('maintained_list',$maintained_list);
 
     }
+
+
+    /**
+    *  Upload the file to the server
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function postUpload($licenseId = null)
+    {
+        $license = License::find($licenseId);
+
+		// the license is valid
+		$destinationPath = app_path().'/private_uploads';
+
+        if (isset($license->id)) {
+
+        	if (Input::hasFile('licensefile')) {
+
+				foreach(Input::file('licensefile') as $file) {
+
+				$rules = array(
+				   'licensefile' => 'required|mimes:png,gif,jpg,jpeg,doc,docx,pdf,txt|max:2000'
+				);
+				$validator = Validator::make(array('licensefile'=> $file), $rules);
+
+					if($validator->passes()){
+
+						$extension = $file->getClientOriginalExtension();
+						$filename = 'license-'.$license->id.'-'.str_random(8);
+						$filename .= '-'.Str::slug($file->getClientOriginalName()).'.'.$extension;
+						$upload_success = $file->move($destinationPath, $filename);
+
+						//Log the deletion of seats to the log
+						$logaction = new Actionlog();
+						$logaction->asset_id = $license->id;
+						$logaction->asset_type = 'software';
+						$logaction->user_id = Sentry::getUser()->id;
+						$logaction->note = e(Input::get('notes'));
+						$logaction->checkedout_to =  NULL;
+						$logaction->created_at =  date("Y-m-d h:i:s");
+						$logaction->filename =  $filename;
+						$log = $logaction->logaction('uploaded');
+					} else {
+						 return Redirect::back()->with('error', Lang::get('admin/licenses/message.upload.invalidfiles'));
+					}
+
+
+				}
+
+				if ($upload_success) {
+				  	return Redirect::back()->with('success', Lang::get('admin/licenses/message.upload.success'));
+				} else {
+				   return Redirect::back()->with('success', Lang::get('admin/licenses/message.upload.error'));
+				}
+
+			} else {
+				 return Redirect::back()->with('success', Lang::get('admin/licenses/message.upload.nofiles'));
+			}
+
+
+
+
+
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/licenses/message.does_not_exist', compact('id'));
+
+            // Redirect to the licence management page
+            return Redirect::route('licenses')->with('error', $error);
+        }
+    }
+
+
+    /**
+    *  Delete the associated file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function getDeleteFile($licenseId = null, $fileId = null)
+    {
+        $license = License::find($licenseId);
+        $destinationPath = app_path().'/private_uploads';
+
+		// the license is valid
+        if (isset($license->id)) {
+
+			$log = Actionlog::find($fileId);
+			$full_filename = $destinationPath.'/'.$log->filename;
+			if (file_exists($full_filename)) {
+				unlink($destinationPath.'/'.$log->filename);
+			}
+			$log->delete();
+			return Redirect::back()->with('success', Lang::get('admin/licenses/message.deletefile.success'));
+
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/licenses/message.does_not_exist', compact('id'));
+
+            // Redirect to the licence management page
+            return Redirect::route('licenses')->with('error', $error);
+        }
+    }
+
+
+
+    /**
+    *  Display/download the uploaded file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function displayFile($licenseId = null, $fileId = null)
+    {
+
+        $license = License::find($licenseId);
+
+		// the license is valid
+        if (isset($license->id)) {
+				$log = Actionlog::find($fileId);
+				$file = $log->get_src();
+				return Response::download($file);
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/licenses/message.does_not_exist', compact('id'));
+
+            // Redirect to the licence management page
+            return Redirect::route('licenses')->with('error', $error);
+        }
+    }
 }

app/controllers/admin/ManufacturersController.php

@@ -113,7 +113,7 @@ class ManufacturersController extends AdminController
 
         if ($validator->fails())
         {
-            // The given data did not pass validation           
+            // The given data did not pass validation
             return Redirect::back()->withInput()->withErrors($validator->messages());
         }
         // attempt validation
@@ -126,7 +126,7 @@ class ManufacturersController extends AdminController
                 // Redirect to the new manufacturer page
                 return Redirect::to("admin/settings/manufacturers")->with('success', Lang::get('admin/manufacturers/message.update.success'));
             }
-        } 
+        }
 
         // Redirect to the manufacturer management page
         return Redirect::to("admin/settings/manufacturers/$manufacturerId/edit")->with('error', Lang::get('admin/manufacturers/message.update.error'));
@@ -169,5 +169,30 @@ class ManufacturersController extends AdminController
 
 
 
+    /**
+    *  Get the asset information to present to the category view page
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function getView($manufacturerID = null)
+    {
+        $manufacturer = Manufacturer::find($manufacturerID);
+
+        if (isset($manufacturer->id)) {
+                return View::make('backend/manufacturers/view', compact('manufacturer'));
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/manufacturers/message.does_not_exist', compact('id'));
+
+            // Redirect to the user management page
+            return Redirect::route('manufacturers')->with('error', $error);
+        }
+
+
+    }
+
+
+
 
 }

app/controllers/admin/ModelsController.php

@@ -67,13 +67,13 @@ class ModelsController extends AdminController
 
         // attempt validation
         if ($model->validate($new)) {
-             
+
             if ( e(Input::get('depreciation_id')) == '') {
                 $model->depreciation_id =  0;
             } else {
                 $model->depreciation_id = e(Input::get('depreciation_id'));
             }
-            
+
              if ( e(Input::get('eol')) == '') {
                 $model->eol =  0;
             } else {
@@ -83,11 +83,11 @@ class ModelsController extends AdminController
             // Save the model data
             $model->name            	= e(Input::get('name'));
             $model->modelno            	= e(Input::get('modelno'));
-            //$model->depreciation_id    	= e(Input::get('depreciation_id'));
             $model->manufacturer_id    	= e(Input::get('manufacturer_id'));
             $model->category_id    		= e(Input::get('category_id'));
             $model->user_id          	= Sentry::getId();
-            //$model->eol    				= e(Input::get('eol'));
+            $model->show_mac_address 	= e(Input::get('show_mac_address', '0'));
+
 
             if (Input::file('image')) {
                 $image = Input::file('image');
@@ -160,18 +160,18 @@ class ModelsController extends AdminController
 
         if ($validator->fails())
         {
-            // The given data did not pass validation           
+            // The given data did not pass validation
             return Redirect::back()->withInput()->withErrors($validator->messages());
         }
         // attempt validation
         else {
-            
+
             if ( e(Input::get('depreciation_id')) == '') {
                 $model->depreciation_id =  0;
             } else {
                 $model->depreciation_id = e(Input::get('depreciation_id'));
             }
-            
+
              if ( e(Input::get('eol')) == '') {
                 $model->eol =  0;
             } else {
@@ -180,9 +180,10 @@ class ModelsController extends AdminController
 
             // Update the model data
             $model->name            	= e(Input::get('name'));
-            $model->modelno            	= e(Input::get('modelno'));           
+            $model->modelno            	= e(Input::get('modelno'));
             $model->manufacturer_id    	= e(Input::get('manufacturer_id'));
             $model->category_id    		= e(Input::get('category_id'));
+            $model->show_mac_address 	= e(Input::get('show_mac_address', '0'));
 
             if (Input::file('image')) {
                 $image = Input::file('image');
@@ -198,13 +199,13 @@ class ModelsController extends AdminController
             if (Input::get('image_delete') == 1 && Input::file('image') == "") {
                 $model->image = NULL;
             }
-      
+
             // Was it created?
             if($model->save()) {
                 // Redirect to the new model  page
                 return Redirect::to("hardware/models")->with('success', Lang::get('admin/models/message.update.success'));
             }
-        } 
+        }
 
         // Redirect to the model create page
         return Redirect::to("hardware/models/$modelId/edit")->with('error', Lang::get('admin/models/message.update.error'));
@@ -261,7 +262,7 @@ class ModelsController extends AdminController
 
 
     }
-    
+
         public function getClone($modelId = null)
     {
         // Check if the model exists
@@ -269,10 +270,10 @@ class ModelsController extends AdminController
             // Redirect to the model management page
             return Redirect::to('assets/models')->with('error', Lang::get('admin/models/message.does_not_exist'));
         }
-        
+
         $model = clone $model_to_clone;
         $model->id = null;
-        
+
         // Show the page
         $depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::lists('name', 'id');
         $manufacturer_list = array('' => 'Select One') + Manufacturer::lists('name', 'id');
@@ -284,7 +285,7 @@ class ModelsController extends AdminController
         $view->with('model',$model);
         $view->with('clone_model',$model_to_clone);
         return $view;
-        
+
     }
 
 

app/controllers/admin/SettingsController.php

@@ -86,6 +86,7 @@ class SettingsController extends AdminController
             $setting->per_page = e(Input::get('per_page'));
             $setting->qr_code = e(Input::get('qr_code', '0'));
             $setting->display_eol = e(Input::get('display_eol', '0'));
+            $setting->load_remote = e(Input::get('load_remote', '0'));
             $setting->qr_text = e(Input::get('qr_text'));
             $setting->auto_increment_prefix = e(Input::get('auto_increment_prefix'));
             $setting->auto_increment_assets = e(Input::get('auto_increment_assets', '0'));

app/controllers/admin/StatuslabelsController.php

@@ -38,7 +38,12 @@ class StatuslabelsController extends AdminController
     public function getCreate()
     {
         // Show the page
-        return View::make('backend/statuslabels/edit')->with('statuslabel',new Statuslabel);
+		$statuslabel = new Statuslabel;
+		$use_statuslabel_type = $statuslabel->getStatuslabelType();
+
+    	$statuslabel_types = array('' => Lang::get('admin/hardware/form.select_statustype')) + array('undeployable' => Lang::get('admin/hardware/general.undeployable')) + array('pending' => Lang::get('admin/hardware/general.pending')) + array('archived' => Lang::get('admin/hardware/general.archived')) + array('deployable' => Lang::get('admin/hardware/general.deployable'));
+
+        return View::make('backend/statuslabels/edit', compact('statuslabel_types','statuslabel'))->with('use_statuslabel_type',$use_statuslabel_type);
     }
 
 
@@ -59,9 +64,15 @@ class StatuslabelsController extends AdminController
         // attempt validation
         if ($statuslabel->validate($new)) {
 
+        	$statustype = Statuslabel::getStatuslabelTypesForDB(Input::get('statuslabel_types'));
+
             // Save the Statuslabel data
             $statuslabel->name            	= e(Input::get('name'));
             $statuslabel->user_id          = Sentry::getId();
+            $statuslabel->notes          =  e(Input::get('notes'));
+            $statuslabel->deployable          =  $statustype['deployable'];
+            $statuslabel->pending          =  $statustype['pending'];
+            $statuslabel->archived          =  $statustype['archived'];
 
             // Was the asset created?
             if($statuslabel->save()) {
@@ -94,8 +105,11 @@ class StatuslabelsController extends AdminController
             return Redirect::to('admin/settings/statuslabels')->with('error', Lang::get('admin/statuslabels/message.does_not_exist'));
         }
 
+		$use_statuslabel_type = $statuslabel->getStatuslabelType();
 
-        return View::make('backend/statuslabels/edit', compact('statuslabel'));
+		$statuslabel_types = array('' => Lang::get('admin/hardware/form.select_statustype')) + array('undeployable' => Lang::get('admin/hardware/general.undeployable')) + array('pending' => Lang::get('admin/hardware/general.pending')) + array('archived' => Lang::get('admin/hardware/general.archived')) + array('deployable' => Lang::get('admin/hardware/general.deployable'));
+
+        return View::make('backend/statuslabels/edit', compact('statuslabel','statuslabel_types'))->with('use_statuslabel_type',$use_statuslabel_type);
     }
 
 
@@ -118,20 +132,27 @@ class StatuslabelsController extends AdminController
 
         if ($validator->fails())
         {
-            // The given data did not pass validation            
+            // The given data did not pass validation
             return Redirect::back()->withInput()->withErrors($validator->messages());
         }
         // attempt validation
         else {
             // Update the Statuslabel data
+            $statustype = Statuslabel::getStatuslabelTypesForDB(Input::get('statuslabel_types'));
+
             $statuslabel->name            	= e(Input::get('name'));
+            $statuslabel->notes          =  e(Input::get('notes'));
+            $statuslabel->deployable          =  $statustype['deployable'];
+            $statuslabel->pending          =  $statustype['pending'];
+            $statuslabel->archived          =  $statustype['archived'];
+
 
             // Was the asset created?
             if($statuslabel->save()) {
                 // Redirect to the saved Statuslabel page
                 return Redirect::to("admin/settings/statuslabels/")->with('success', Lang::get('admin/statuslabels/message.update.success'));
             }
-        } 
+        }
 
         // Redirect to the Statuslabel management page
         return Redirect::to("admin/settings/statuslabels/$statuslabelId/edit")->with('error', Lang::get('admin/statuslabels/message.update.error'));

app/controllers/admin/UsersController.php

@@ -458,7 +458,7 @@ class UsersController extends AdminController
     public function getView($userId = null)
     {
 
-        $user = Sentry::getUserProvider()->createModel()->withTrashed()->find($userId);
+        $user = Sentry::getUserProvider()->createModel()->find($userId);
 
             if (isset($user->id)) {
                 return View::make('backend/users/view', compact('user'));

app/database/migrations/2015_02_04_155757_increase_user_field_lengths.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class IncreaseUserFieldLengths extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'users MODIFY column jobtitle varchar(100) null');
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'users MODIFY column jobtitle varchar(50) null');
+	}
+
+}

app/database/migrations/2015_02_07_013537_add_soft_deleted_to_log.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddSoftDeletedToLog extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column asset_type varchar(100) null');
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column added_on timestamp default "0000-00-00 00:00:00"');
+		Schema::table('asset_logs', function ($table) {
+			$table->renameColumn('added_on', 'created_at');
+			$table->timestamp('updated_at');
+            $table->softDeletes();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('asset_logs', function ($table) {
+			$table->renameColumn('created_at', 'added_on');
+			$table->dropColumn('updated_at');
+			$table->dropSoftDeletes();
+		});
+	}
+
+}

app/database/migrations/2015_02_10_040958_fix_bad_assigned_to_ids.php

@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class FixBadAssignedToIds extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		DB::update('update ' . DB::getTablePrefix() . 'assets SET assigned_to=NULL where assigned_to=0');
+
+		Schema::table('status_labels', function ($table) {
+			$table->boolean('deployable')->default(0);
+			$table->boolean('pending')->default(0);
+			$table->boolean('archived')->default(0);
+			$table->text('notes')->nullable();
+		});
+
+		DB::statement('INSERT into ' . DB::getTablePrefix() . 'status_labels (user_id, name, deployable, pending, archived, notes) VALUES (1,"Pending",0,1,0,"These assets are not yet ready to be deployed, usually because of configuration or waiting on parts.")');
+		DB::statement('INSERT into ' . DB::getTablePrefix() . 'status_labels (user_id, name, deployable, pending, archived, notes) VALUES (1,"Ready to Deploy",1,0,0,"These assets are ready to deploy.")');
+		DB::statement('INSERT into ' . DB::getTablePrefix() . 'status_labels (user_id, name, deployable, pending, archived, notes) VALUES (1,"Archived",0,0,1,"These assets are no longer in circulation or viable.")');
+
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('status_labels', function ($table) {
+			$table->dropColumn('deployable');
+			$table->dropColumn('pending');
+			$table->dropColumn('archived');
+			$table->dropColumn('notes');
+
+		});
+	}
+
+}

app/database/migrations/2015_02_10_053310_migrate_data_to_new_statuses.php

@@ -0,0 +1,60 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MigrateDataToNewStatuses extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		// get newly added statuses from last migration
+		$statuses = DB::select('select * from ' . DB::getTablePrefix() . 'status_labels where name="Pending" OR name="Ready to Deploy"');
+
+
+		foreach ($statuses as $status) {
+			if ($status->name =="Pending") {
+				$pending_id = array($status->id);
+			} elseif ($status->name =="Ready to Deploy") {
+				$rtd_id = array($status->id);
+			}
+		}
+
+		// Pending
+		$pendings = DB::select('select * from ' . DB::getTablePrefix() . 'assets where status_id IS NULL AND physical=1 ');
+
+			foreach ($pendings as $pending) {
+				DB::update('update ' . DB::getTablePrefix() . 'assets set status_id = ? where status_id IS NULL AND physical=1',$pending_id);
+
+			}
+
+
+		// Ready to Deploy
+		$rtds = DB::select('select * from ' . DB::getTablePrefix() . 'assets where status_id = 0 AND physical=1 ');
+
+		foreach ($rtds as $rtd) {
+				//DB::update('update users set votes = 100 where name = ?', array('John'));
+				DB::update('update ' . DB::getTablePrefix() . 'assets set status_id = ? where status_id = 0 AND physical=1',$rtd_id);
+
+			}
+
+
+
+
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+
+}

app/database/migrations/2015_02_11_044104_migrate_make_license_assigned_null.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MigrateMakeLicenseAssignedNull extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		DB::update('update ' . DB::getTablePrefix() . 'license_seats SET assigned_to=NULL where assigned_to=0');
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+
+}

app/database/migrations/2015_02_11_104406_migrate_create_requests_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MigrateCreateRequestsTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::create('requests', function ($table) {
+            $table->increments('id');
+            $table->integer('asset_id');
+            $table->integer('user_id');
+            $table->text('request_code');
+            $table->timestamps();
+            $table->softDeletes();
+        });
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		 Schema::drop('requests');
+	}
+
+}

app/database/migrations/2015_02_12_001312_add_mac_address_to_asset.php

@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddMacAddressToAsset extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('assets', function ($table) {
+			$table->string('mac_address')->nullable()->default(NULL);
+		});
+
+		Schema::table('models', function ($table) {
+			$table->boolean('show_mac_address')->default(0);
+		});
+
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('assets', function ($table) {
+			$table->dropColumn('mac_address');
+		});
+
+		Schema::table('models', function ($table) {
+			$table->dropColumn('show_mac_address');
+		});
+	}
+
+}

app/database/migrations/2015_02_12_024100_change_license_notes_type.php

@@ -0,0 +1,27 @@
+<?php
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+class ChangeLicenseNotesType extends Migration {
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		$prefix = DB::getTablePrefix();
+		 DB::statement('ALTER TABLE '.$prefix.'licenses MODIFY COLUMN notes TEXT');
+	}
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		$prefix = DB::getTablePrefix();
+		 DB::statement('ALTER TABLE '.$prefix.'licenses MODIFY COLUMN notes VARCHAR(255)');
+	}
+}

app/database/migrations/2015_02_17_231020_add_localonly_to_settings.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddLocalonlyToSettings extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('settings', function ($table) {
+			$table->boolean('load_remote')->default(1);
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('settings', function ($table) {
+			$table->dropColumn('load_remote');
+		});
+
+	}
+
+}

app/database/seeds/ActionlogSeeder.php

@@ -10,53 +10,53 @@ class ActionlogSeeder extends Seeder
 
         $date = new DateTime;
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $assetlog[] = array(
             'user_id'      		=> '1',
             'action_type'      	=> 'checkout',
             'asset_id' 			=> '1',
             'checkedout_to' 	=> '2',
             'location_id'  		=> '3',
-            'added_on' 			=> $date->modify('-10 day'),
+            'created_at' 			=> $date->modify('-10 day'),
             'asset_type' 		=> 'hardware',
             'note'				=> NULL,
             'filename'			=> NULL,
         );
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $assetlog[] = array(
             'user_id'      		=> '1',
             'action_type'      	=> 'checkin from',
             'asset_id' 			=> '1',
             'checkedout_to' 	=> '2',
             'location_id'  		=> NULL,
-            'added_on' 			=> $date->modify('-10 day'),
+            'created_at' 			=> $date->modify('-10 day'),
             'asset_type' 		=> 'hardware',
             'note'				=> NULL,
             'filename'			=> NULL,
         );
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $assetlog[] = array(
             'user_id'      		=> '1',
             'action_type'      	=> 'checkout',
             'asset_id' 			=> '1',
             'checkedout_to' 	=> '1',
             'location_id'  		=> '3',
-            'added_on' 			=> $date->modify('-10 day'),
+            'created_at' 			=> $date->modify('-10 day'),
             'asset_type' 		=> 'software',
             'note'				=> NULL,
             'filename'			=> NULL,
         );
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $assetlog[] = array(
             'user_id'      		=> '1',
             'action_type'      	=> 'checkin from',
             'asset_id' 			=> '1',
             'checkedout_to' 	=> '2',
             'location_id'  		=> NULL,
-            'added_on' 			=> $date->modify('-10 day'),
+            'created_at' 			=> $date->modify('-10 day'),
             'asset_type' 		=> 'software',
             'note'				=> NULL,
             'filename'			=> NULL,

app/database/seeds/AssetsSeeder.php

@@ -10,7 +10,7 @@ class AssetsSeeder extends Seeder
 
         $date = new DateTime;
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $asset[] = array(
             'name'      	=> 'Shanen MBP',
             'asset_tag'     => 'NNY2878796',
@@ -22,10 +22,10 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 1,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 0,
-            'status_id'		=> NULL,
+            'status_id'		=> 1,
             'notes'			=> '',
             'deleted_at' 	=> NULL,
             'archived' 	=> '0',
@@ -45,10 +45,10 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 1,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 0,
-            'status_id'	=> NULL,
+            'status_id'	=> 1,
             'notes'			=> '',
             'deleted_at' 	=> NULL,
             'archived' 	=> '0',
@@ -57,7 +57,7 @@ class AssetsSeeder extends Seeder
         );
 
 
-        // RTD (status_id =0, assigned_to = 0)
+
         $asset[] = array(
             'name'      	=> 'Alison MBP',
             'asset_tag'     => 'NNY287958796',
@@ -69,10 +69,10 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 1,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 0,
-            'status_id'	=> 0,
+            'status_id'	=> 2,
             'notes'			=> '',
             'deleted_at' 	=> NULL,
             'archived' 	=> '0',
@@ -80,7 +80,7 @@ class AssetsSeeder extends Seeder
             'depreciate' 	=> '0',
         );
 
-        // RTD (status_id =0, assigned_to = 0)
+
         $asset[] = array(
             'name'      	=> 'Brady MBP',
             'asset_tag'     => 'NNY78795566',
@@ -92,10 +92,10 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 1,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 0,
-            'status_id'	=> 0,
+            'status_id'	=> 1,
             'notes'			=> '',
             'deleted_at' 	=> NULL,
             'archived' 	=> '0',
@@ -103,7 +103,7 @@ class AssetsSeeder extends Seeder
             'depreciate' 	=> '0',
         );
 
-        // RTD (status_id =0, assigned_to = 0)
+
         $asset[] = array(
             'name'      	=> 'Deborah MBP',
             'asset_tag'     => 'NNY65756756775',
@@ -115,10 +115,10 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 2,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 0,
-            'status_id'	=> 0,
+            'status_id'	=> 2,
             'notes'			=> '',
             'deleted_at' 	=> NULL,
             'archived' 	=> '0',
@@ -127,7 +127,7 @@ class AssetsSeeder extends Seeder
         );
 
 
-        // Deployed (status_id =0, assigned_to > 0)
+
         $asset[] = array(
             'name'      	=> 'Sara MBP',
             'asset_tag'     => 'NNY6897856775',
@@ -142,7 +142,7 @@ class AssetsSeeder extends Seeder
             'assigned_to' 	=> 2,
             'physical' 		=> 1,
             'archived' 		=> 0,
-            'status_id'	=> 0,
+            'status_id'	=> 1,
             'notes'			=> '',
             'deleted_at' 	=> NULL,
             'archived' 	=> '0',
@@ -150,7 +150,7 @@ class AssetsSeeder extends Seeder
             'depreciate' 	=> '0',
         );
 
-        // Deployed (status_id =0, assigned_to > 0)
+
         $asset[] = array(
             'name'      	=> 'Ben MBP',
             'asset_tag'     => 'NNY67567775',
@@ -165,7 +165,7 @@ class AssetsSeeder extends Seeder
             'assigned_to' 	=> 2,
             'physical' 		=> 1,
             'archived' 		=> 0,
-            'status_id'	=> 0,
+            'status_id'	=> 1,
             'notes'			=> '',
             'deleted_at' 	=> NULL,
             'archived' 	=> '0',
@@ -173,10 +173,10 @@ class AssetsSeeder extends Seeder
             'depreciate' 	=> '0',
         );
 
-        // Undeployable (status_id > 0, assigned_to = 0)
+
         $asset[] = array(
-            'name'      	=> 'Broke-Ass Laptop',
-            'asset_tag'     => 'NNY67567775',
+            'name'      	=> 'Broken Laptop',
+            'asset_tag'     => 'NNY6756756775',
             'model_id'      => 2,
             'serial'      	=> 'WS89080890',
             'purchase_date' => '2012-01-02',
@@ -185,7 +185,7 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 2,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 0,
             'status_id'	=> '3',
@@ -196,7 +196,7 @@ class AssetsSeeder extends Seeder
             'depreciate' 	=> '0',
         );
 
-        // Undeployable (status_id > 0, assigned_to = 0)
+
         $asset[] = array(
             'name'      	=> 'Maybe Broke-Ass Laptop',
             'asset_tag'     => 'NNY6755667775',
@@ -208,7 +208,7 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 1,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 0,
             'status_id'	=> '2',
@@ -219,7 +219,7 @@ class AssetsSeeder extends Seeder
             'depreciate' 	=> '0',
         );
 
-        // Undeployable (status_id > 0, assigned_to = 0)
+
         $asset[] = array(
             'name'      	=> 'Completely Facacta Laptop',
             'asset_tag'     => 'NNY6564567775',
@@ -231,7 +231,7 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 1,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 1,
             'status_id'	=> '4',
@@ -242,7 +242,7 @@ class AssetsSeeder extends Seeder
             'depreciate' 	=> '0',
         );
 
-        // Undeployable (status_id > 0, assigned_to = 0)
+
         $asset[] = array(
             'name'      	=> 'Drunken Shanenigans Laptop',
             'asset_tag'     => 'NNY6564567775',
@@ -254,7 +254,7 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 1,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 1,
             'status_id'	=> '3',
@@ -277,10 +277,10 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 2,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 0,
-            'status_id'	=> 0,
+            'status_id'	=> 1,
             'notes'			=> '',
             'deleted_at' 	=> NULL,
             'archived' 	=> '0',

app/database/seeds/LicenseSeatsSeeder.php

@@ -10,7 +10,7 @@ class LicenseSeatsSeeder extends Seeder
 
         $date = new DateTime;
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $license_seats[] = array(
             'license_id'      	=> '1',
             'assigned_to'      	=> '1',
@@ -46,7 +46,7 @@ class LicenseSeatsSeeder extends Seeder
 
         $license_seats[] = array(
             'license_id'      	=> '1',
-            'assigned_to'      	=> '0',
+            'assigned_to'      	=> NULL,
             'created_at' 		=> $date->modify('-10 day')->format('Y-m-d H:i:s'),
             'updated_at' 		=> $date->modify('-3 day')->format('Y-m-d H:i:s'),
             'deleted_at' 		=> NULL,
@@ -77,10 +77,10 @@ class LicenseSeatsSeeder extends Seeder
             'asset_id' 			=> NULL,
         );
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $license_seats[] = array(
             'license_id'      	=> '2',
-            'assigned_to'      	=> '0',
+            'assigned_to'      	=> NULL,
             'created_at' 		=> $date->modify('-10 day')->format('Y-m-d H:i:s'),
             'updated_at' 		=> $date->modify('-3 day')->format('Y-m-d H:i:s'),
             'deleted_at' 		=> NULL,

app/database/seeds/LicensesSeeder.php

@@ -10,12 +10,14 @@ class LicensesSeeder extends Seeder
 
         $date = new DateTime;
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $license[] = array(
             'name'      		=> 'Adobe Photoshop CS6',
             'serial'      		=> 'ZOMG-WtF-BBQ-SRSLY',
             'purchase_date' 	=> '2013-10-02',
             'purchase_cost' 	=> '2435.99',
+            'purchase_order' 	=> '1',
+            'maintained' 		=> '0',
             'order_number'  	=> '987698576946',
             'created_at' 		=> $date->modify('-10 day'),
             'updated_at' 		=> $date->modify('-3 day'),
@@ -29,12 +31,14 @@ class LicensesSeeder extends Seeder
             'depreciate' 		=> '0',
         );
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $license[] = array(
             'name'      		=> 'Git Tower',
             'serial'      		=> '98049890394-340485934',
             'purchase_date' 	=> '2013-10-02',
             'purchase_cost' 	=> '2435.99',
+            'purchase_order' 	=> '1',
+            'maintained' 	=> '1',
             'order_number'  	=> '987698576946',
             'created_at' 		=> $date->modify('-10 day'),
             'updated_at' 		=> $date->modify('-3 day'),

app/database/seeds/StatuslabelsSeeder.php

@@ -10,12 +10,53 @@ class StatuslabelsSeeder extends Seeder
 
         $date = new DateTime;
 
+		 $status[] = array(
+            'name'      => 'Ready to Deploy',
+            'created_at' => $date->modify('-10 day'),
+            'updated_at' => $date->modify('-3 day'),
+            'user_id' => 1,
+            'deleted_at' 		=> NULL,
+            'deployable'	=> 1,
+            'pending'	=> 0,
+            'archived' => 0,
+            'notes' => ''
+        );
+
+         $status[] = array(
+            'name'      => 'Pending',
+            'created_at' => $date->modify('-10 day'),
+            'updated_at' => $date->modify('-3 day'),
+            'user_id' => 1,
+            'deleted_at' 		=> NULL,
+            'deployable'	=> 0,
+            'pending'	=> 1,
+            'archived' => 0,
+            'notes' => ''
+        );
+
+        $status[] = array(
+            'name'      => 'Archived',
+            'created_at' => $date->modify('-10 day'),
+            'updated_at' => $date->modify('-3 day'),
+            'user_id' => 1,
+            'deleted_at' 		=> NULL,
+            'deployable'	=> 0,
+            'pending'	=> 0,
+            'archived' => 1,
+            'notes' => 'These assets are permanently undeployable'
+        );
+
+
         $status[] = array(
             'name'      => 'Out for Diagnostics',
             'created_at' => $date->modify('-10 day'),
             'updated_at' => $date->modify('-3 day'),
             'user_id' => 1,
             'deleted_at' 		=> NULL,
+            'deployable'	=> 0,
+            'pending'	=> 0,
+            'archived' => 0,
+            'notes' => ''
         );
 
 
@@ -25,6 +66,10 @@ class StatuslabelsSeeder extends Seeder
             'updated_at' => $date->modify('-3 day'),
             'user_id' => 1,
             'deleted_at' 		=> NULL,
+            'deployable'	=> 0,
+            'pending'	=> 0,
+            'archived' => 0,
+             'notes' => ''
         );
 
 
@@ -34,6 +79,10 @@ class StatuslabelsSeeder extends Seeder
             'updated_at' => $date->modify('-3 day'),
             'user_id' => 1,
             'deleted_at' 		=> NULL,
+            'deployable'	=> 0,
+            'pending'	=> 0,
+            'archived' => 1,
+             'notes' => ''
         );
 
         $status[] = array(
@@ -42,6 +91,10 @@ class StatuslabelsSeeder extends Seeder
             'updated_at' => $date->modify('-3 day'),
             'user_id' => 1,
             'deleted_at' 		=> NULL,
+            'deployable'	=> 0,
+            'pending'	=> 0,
+            'archived' => 1,
+            'notes' => '',
         );
 
 

app/filters.php

@@ -85,7 +85,7 @@ Route::filter('admin-auth', function () {
     // Check if the user has access to the admin pages
     if ( ! Sentry::getUser()->hasAccess('admin')) {
         // Show the insufficient permissions page
-        return Redirect::route('profile');
+        return Redirect::route('view-assets');
     }
 });
 

app/lang/ar/admin/hardware/form.php

@@ -15,6 +15,7 @@ return array(
     'expires'			=> 'Expires',
     'fully_depreciated'	=> 'Fully Depreciated',
     'help_checkout'		=> 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
+    'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Manufacturer',
     'model'				=> 'Model',
     'months'			=> 'months',
@@ -23,6 +24,7 @@ return array(
     'order'				=> 'Order Number',
     'qr'				=> 'QR Code',
     'requestable'		=> 'Users may request this asset',
+    'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Serial',
     'status'			=> 'Status',
     'supplier'			=> 'Supplier',

app/lang/ar/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
+	'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset to User',
     'clone'  					=> 'Clone Asset',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Edit Asset',
-    'pending'  					=> 'Pending Asset',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
     'view'  					=> 'View Asset',
 );

app/lang/ar/admin/hardware/message.php

@@ -2,7 +2,8 @@
 
 return array(
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
     'does_not_exist' 	=> 'Asset does not exist.',
     'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
 
@@ -16,6 +17,11 @@ return array(
         'success' 		=> 'Asset updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',

app/lang/ar/admin/licenses/message.php

@@ -14,6 +14,18 @@ return array(
         'success' => 'License created successfully.'
     ),
 
+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        '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.',
+    ),
+
     'update' => array(
         'error'   => 'License was not updated, please try again',
         'success' => 'License updated successfully.'

app/lang/ar/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/ar/admin/settings/general.php

@@ -1,6 +1,9 @@
 <?php
 
 return array(
+	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
+	'auto_increment_prefix'		=> 'Prefix (optional)',
+	'auti_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',

app/lang/ar/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Status Name',
-    'title'      	=> 'Status Labels',
-    'update'      	=> 'Update Status Label',
-    'create'      	=> 'Create Status Label',
     'about'      	=> 'About Status Labels',
-    'info'      	=> 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Create Status Label',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Status Name',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Status Labels',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Update Status Label',
 );

app/lang/ar/button.php

@@ -2,10 +2,13 @@
 
 return array(
 
-    'edit'    => 'تعديل',
-    'delete'  => 'حذف',
-    'restore' => 'إستعادة',
-    'actions' => 'الإجراءات',
-    'submit'  => 'إرسال',
+    'actions' 	=> 'الإجراءات',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'حذف',
+    'edit'    	=> 'تعديل',
+    'restore' 	=> 'إستعادة',
+    'submit'  	=> 'إرسال',
+    'upload'    => 'Upload',
 
 );

app/lang/ar/general.php

@@ -2,10 +2,12 @@
 
 return array(
 
+
     'address'				=> 'العنوان',
     'admin'					=> 'الإدارة',
     'all_assets'			=> 'كل الأصول',
     'all'       			=> 'الكل',
+    'archived'              => 'Archived',
     'asset_models'			=> 'نماذج الأصول',
     'asset'					=> 'الأصول',
     'asset_report'          => 'Asset Report',
@@ -39,6 +41,8 @@ return array(
     'editprofile'  			=> 'تعديل الملف الشخصي',
     'eol'					=> 'الحياة',
     'first_name'			=> 'الإسم الأول',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
     'generate'				=> 'Generate',
     'groups'				=> 'المجموعات',
     'gravatar_email'        => 'البريد الإلكتروني لخدمة Gravatar',

app/lang/cs/admin/categories/general.php

@@ -1,11 +1,11 @@
 <?php
 
 return array(
-    'about_asset_categories' 			=> 'About Asset Categories',
-    'about_categories'  				=> 'Asset categories help you organize your assets. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use asset categories any way that makes sense for you. ',
-    'asset_categories' 					=> 'Asset Categories',
-    'category_name'  					=> 'Category Name',
-    'create'  							=> 'Create Category',
-    'update'  							=> 'Update Category',
+    'about_asset_categories' 			=> 'O kategoriích majetku',
+    'about_categories'  				=> 'Kategorie pomáhají organizovat majetek. Takovou kategorii může být např. &quot;Desktopy&quot;, &quot;Notebooky&quot;, &quot;Mobilní telefony&quot;, &quot;Tablety&quot;, apod., kategorie můžete ale používat jakkoliv Vám to bude dávat smysl. ',
+    'asset_categories' 					=> 'Kategorie majetku',
+    'category_name'  					=> 'Jméno kategorie',
+    'create'  							=> 'Vytvořit kategorii',
+    'update'  							=> 'Upravit kategorii',
 
 );

app/lang/cs/admin/categories/message.php

@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'Category does not exist.',
+    'does_not_exist' => 'Kategorie neexistuje.',
     'assoc_users'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
 
     'create' => array(

app/lang/cs/admin/categories/table.php

@@ -3,7 +3,7 @@
 return array(
 
     'id'      => 'ID',
-    'parent'   => 'Parent',
-    'title'      => 'Asset Category Name',
+    'parent'   => 'Nadřazená složka',
+    'title'      => 'Jméno kategorie majetku',
 
 );

app/lang/cs/admin/depreciations/general.php

@@ -1,12 +1,12 @@
 <?php
 
 return array(
-    'about_asset_depreciations'  			=> 'About Asset Depreciations',
-    'about_depreciations'  					=> 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
-    'asset_depreciations'  					=> 'Asset Depreciations',
-    'create_depreciation'  					=> 'Create Depreciation',
-    'depreciation_name'  					=> 'Depreciation Name',
-    'number_of_months'  					=> 'Number of Months',
-    'update_depreciation'  					=> 'Update Depreciation',
+    'about_asset_depreciations'  			=> 'O amortizaci majetku',
+    'about_depreciations'  					=> 'Můžete nastavit amortizaci majetku pro jeho rovnoměrné odepisování.',
+    'asset_depreciations'  					=> 'Amortizace majetku',
+    'create_depreciation'  					=> 'Vytvořit amortizaci',
+    'depreciation_name'  					=> 'Jméno amortizace',
+    'number_of_months'  					=> 'Počet měsíců',
+    'update_depreciation'  					=> 'Upravit amortizaci',
 
 );

app/lang/cs/admin/depreciations/message.php

@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'Depreciation class does not exist.',
+    'does_not_exist' => 'Amortizační skupina neexistuje.',
     'assoc_users'	 => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ',
 
 

app/lang/cs/admin/depreciations/table.php

@@ -3,8 +3,8 @@
 return array(
 
     'id'      => 'ID',
-    'months'   => 'Months',
-    'term'   => 'Term',
-    'title'      => 'Name ',
+    'months'   => 'Měsíců',
+    'term'   => 'Podmínka',
+    'title'      => 'Název ',
 
 );

app/lang/cs/admin/groups/message.php

@@ -2,18 +2,18 @@
 
 return array(
 
-    'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
-    'group_name_required' => 'The name field is required',
+    'group_exists'        => 'Skupina již existuje!',
+    'group_not_found'     => 'Skupina [:id] neexistuje.',
+    'group_name_required' => 'Název je vyžadován',
 
     'success' => array(
-        'create' => 'Group was successfully created.',
-        'update' => 'Group was successfully updated.',
-        'delete' => 'Group was successfully deleted.',
+        'create' => 'Skupina byla úspěšně vytvořena.',
+        'update' => 'Skupina byla úspěšně upravena.',
+        'delete' => 'Skupina byla úspěšně odstraněna.',
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this group?',
+        'confirm'   => 'Určitě chcete odstranit tuto skupinu?',
         'create' => 'There was an issue creating the group. Please try again.',
         'update' => 'There was an issue updating the group. Please try again.',
         'delete' => 'There was an issue deleting the group. Please try again.',

app/lang/cs/admin/groups/table.php

@@ -2,8 +2,8 @@
 
 return array(
 
-    'id'         => 'Id',
-    'name'       => 'Name',
-    'users'      => '# of Users',
+    'id'         => 'ID',
+    'name'       => 'Název',
+    'users'      => '# z uživatelů',
 
 );

app/lang/cs/admin/groups/titles.php

@@ -2,12 +2,12 @@
 
 return array(
 
-    'group_management' 	 	=> 'Group Management',
-    'create_group' 	 		=> 'Create New Group',
-    'edit_group' 	 		=> 'Edit Group',
-    'group_name' 	 		=> 'Group Name',
-    'group_admin' 	 		=> 'Group Admin',
-    'allow' 	 			=> 'Allow',
-    'deny' 	 				=> 'Deny',
+    'group_management' 	 	=> 'Správa skupin',
+    'create_group' 	 		=> 'Vytvořit novou skupinu',
+    'edit_group' 	 		=> 'Upravit skupinu',
+    'group_name' 	 		=> 'Název skupiny',
+    'group_admin' 	 		=> 'Správce skupiny',
+    'allow' 	 			=> 'Povolit',
+    'deny' 	 				=> 'Zakázat',
 
 );

app/lang/cs/admin/hardware/form.php

@@ -2,33 +2,35 @@
 
 return array(
 
-    'checkedout_to'		=> 'Checked Out To',
-    'checkout_to'		=> 'Checkout to',
-    'cost'				=> 'Purchase Cost',
-    'create'			=> 'Create Asset',
-    'date'				=> 'Purchase Date',
-    'depreciates_on'	=> 'Depreciates On',
-    'depreciation'		=> 'Depreciation',
-    'default_location'	=> 'Default Location',
-    'eol_date'			=> 'EOL Date',
-    'eol_rate'			=> 'EOL Rate',
-    'expires'			=> 'Expires',
-    'fully_depreciated'	=> 'Fully Depreciated',
-    'help_checkout'		=> 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
-    'manufacturer'		=> 'Manufacturer',
+    'checkedout_to'		=> 'Vydané komu',
+    'checkout_to'		=> 'Vydat někomu',
+    'cost'				=> 'Pořizovací cena',
+    'create'			=> 'Vytvořit záznam majetku',
+    'date'				=> 'Datum pořízení',
+    'depreciates_on'	=> 'Odepisuje se',
+    'depreciation'		=> 'Amortizace',
+    'default_location'	=> 'Výchozí umístění',
+    'eol_date'			=> 'Konec životnosti',
+    'eol_rate'			=> 'Míra ukončení životnosti',
+    'expires'			=> 'Expiruje',
+    'fully_depreciated'	=> 'Plně odepsané',
+    'help_checkout'		=> 'Pokud si přejete přiřadit majetek okamžitě, měli by jste ze seznamu stavů zvolit "Připraveno k přiděleni", nebo se může něco pokazit. ',
+    'mac_address'		=> 'MAC Address',
+    'manufacturer'		=> 'Výrobce',
     'model'				=> 'Model',
-    'months'			=> 'months',
-    'name'				=> 'Asset Name',
-    'notes'				=> 'Notes',
-    'order'				=> 'Order Number',
-    'qr'				=> 'QR Code',
-    'requestable'		=> 'Users may request this asset',
-    'serial'			=> 'Serial',
-    'status'			=> 'Status',
-    'supplier'			=> 'Supplier',
-    'tag'				=> 'Asset Tag',
-    'update'			=> 'Asset Update',
-    'warranty'			=> 'Warranty',
-    'years'				=> 'years',
+    'months'			=> 'měsíce',
+    'name'				=> 'Název majetku',
+    'notes'				=> 'Poznámky',
+    'order'				=> 'Č. objednávky',
+    'qr'				=> 'QR kód',
+    'requestable'		=> 'Uživatelé můžou požádat o tento majetek',
+    'select_statustype'	=> 'Select Status Type',
+    'serial'			=> 'Sériové číslo',
+    'status'			=> 'Stav',
+    'supplier'			=> 'Dodavatel',
+    'tag'				=> 'Označení majetku',
+    'update'			=> 'Úprava majetku',
+    'warranty'			=> 'Záruka',
+    'years'				=> 'roky',
 )
 ;

app/lang/cs/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
-    'asset'  					=> 'Asset',
-    'checkin'  					=> 'Checkin Asset',
-    'checkout'  				=> 'Checkout Asset to User',
-    'clone'  					=> 'Clone Asset',
-    'edit'  					=> 'Edit Asset',
-    'pending'  					=> 'Pending Asset',
-    'view'  					=> 'View Asset',
+	'archived'  				=> 'Archived',
+    'asset'  					=> 'Majetek',
+    'checkin'  					=> 'Převzít majetek',
+    'checkout'  				=> 'Předat majetek uživateli',
+    'clone'  					=> 'Klonovat majetek',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
+    'edit'  					=> 'Upravit majetek',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
+    'view'  					=> 'Zobrazit majetek',
 );

app/lang/cs/admin/hardware/message.php

@@ -2,7 +2,8 @@
 
 return array(
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
     'does_not_exist' 	=> 'Asset does not exist.',
     'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
 
@@ -16,6 +17,11 @@ return array(
         'success' 		=> 'Asset updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',

app/lang/cs/admin/hardware/table.php

@@ -2,21 +2,21 @@
 
 return array(
 
-    'asset_tag'   	=> 'Asset Tag',
+    'asset_tag'   	=> 'Označení majetku',
     'asset_model'       => 'Model',
-    'book_value'  	=> 'Value',
-    'change' 		=> 'In/Out',
-    'checkout_date' => 'Checkout Date',
-    'checkoutto' 	=> 'Checked Out',
-    'diff' 			=> 'Diff',
-    'dl_csv' 		=> 'Download CSV',
-    'eol' 			=> 'EOL',
+    'book_value'  	=> 'Hodnota',
+    'change' 		=> 'Příjem/Výdej',
+    'checkout_date' => 'Datum vydání',
+    'checkoutto' 	=> 'Vydané',
+    'diff' 			=> 'Rozdíl',
+    'dl_csv' 		=> 'Stáhnout CSV',
+    'eol' 			=> 'Konec životnosti',
     'id'      		=> 'ID',
-    'location' 		=> 'Location',
-    'purchase_cost'	=> 'Cost',
-    'purchase_date'	=> 'Purchased',
-    'serial'   		=> 'Serial',
-    'status'   		=> 'Status',
-    'title'      	=> 'Asset ',
+    'location' 		=> 'Umístění',
+    'purchase_cost'	=> 'Cena',
+    'purchase_date'	=> 'Zakoupeno',
+    'serial'   		=> 'Sériové číslo',
+    'status'   		=> 'Stav',
+    'title'      	=> 'Majetek ',
 
 );

app/lang/cs/admin/licenses/message.php

@@ -14,6 +14,18 @@ return array(
         'success' => 'License created successfully.'
     ),
 
+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        '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.',
+    ),
+
     'update' => array(
         'error'   => 'License was not updated, please try again',
         'success' => 'License updated successfully.'

app/lang/cs/admin/locations/table.php

@@ -3,13 +3,13 @@
 return array(
 
     'id'      		=> 'ID',
-    'city'   		=> 'City',
-    'state'   		=> 'State',
-    'country'   	=> 'Country',
-    'create'		=> 'Create Location',
-    'update'		=> 'Update Location',
-    'name'			=> 'Location Name',
-    'address'		=> 'Address',
-    'zip'			=> 'Postal Code',
-    'locations'		=> 'Locations',
+    'city'   		=> 'Město',
+    'state'   		=> 'Stát',
+    'country'   	=> 'Země',
+    'create'		=> 'Vytvořit umístění',
+    'update'		=> 'Upravit umístění',
+    'name'			=> 'Název umístění',
+    'address'		=> 'Adresa',
+    'zip'			=> 'PSČ',
+    'locations'		=> 'Umístění',
 );

app/lang/cs/admin/manufacturers/table.php

@@ -2,10 +2,10 @@
 
 return array(
 
-    'asset_manufacturers'	=> 'Asset Manufacturers',
-    'create'				=> 'Create Manufacturer',
+    'asset_manufacturers'	=> 'Výrobci',
+    'create'				=> 'Vytvořit výrobce',
     'id'   					=> 'ID',
-    'name'      			=> 'Manufacturer Name',
-    'update'				=> 'Update Manufacturer',
+    'name'      			=> 'Název Výrobce',
+    'update'				=> 'Upravit Výrobce',
 
 );

app/lang/cs/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/cs/admin/settings/general.php

@@ -1,6 +1,9 @@
 <?php
 
 return array(
+	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
+	'auto_increment_prefix'		=> 'Prefix (optional)',
+	'auti_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',

app/lang/cs/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Status Name',
-    'title'      	=> 'Status Labels',
-    'update'      	=> 'Update Status Label',
-    'create'      	=> 'Create Status Label',
-    'about'      	=> 'About Status Labels',
-    'info'      	=> 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
+    'about'      	=> 'O označení stavu',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Vytvořit označení stavu',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Název stavu',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Označení stavu',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Upravit označení stavu',
 );

app/lang/cs/button.php

@@ -2,10 +2,13 @@
 
 return array(
 
-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Akce',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Smazat',
+    'edit'    	=> 'Upravit',
+    'restore' 	=> 'Obnovit',
+    'submit'  	=> 'Odeslat',
+    'upload'    => 'Upload',
 
 );

app/lang/cs/general.php

@@ -2,93 +2,97 @@
 
 return array(
 
-    'address'				=> 'Address',
+
+    'address'				=> 'Adresa',
     'admin'					=> 'Admin',
-    'all_assets'			=> 'All Assets',
-    'all'       			=> 'All',
-    'asset_models'			=> 'Asset Models',
-    'asset'					=> 'Asset',
-    'asset_report'          => 'Asset Report',
-    'asset_tag'				=> 'Asset Tag',
-    'assets_available'		=> 'assets available',
-    'assets'				=> 'Assets',
-    'avatar_delete'         => 'Delete Avatar',
-    'avatar_upload'         => 'Upload Avatar',
-    'back'      			=> 'Back',
-    'cancel'  				=> 'Cancel',
-    'categories'			=> 'Asset Categories',
-    'category'				=> 'Asset Category',
-    'changeemail'  			=> 'Change Email Address',
-    'changepassword'  		=> 'Change Password',
-    'checkin'  				=> 'Checkin',
-    'checkout'  			=> 'Checkout',
-    'city'  				=> 'City',
-    'country'  				=> 'Country',
-    'create'				=> 'Create New',
-    'created_asset'			=> 'created asset',
-    'created_at' 			=> 'Created at',
-    'currency'  			=> '$',
-    'current'  				=> 'Current',
-    'custom_report'         => 'Custom Asset Report',
-    'date'					=> 'Date',
-    'delete'  				=> 'Delete',
-    'deleted'  				=> 'Deleted',
-    'deployed'				=> 'Deployed',
-    'depreciation_report'	=> 'Depreciation Report',
-    'depreciation'			=> 'Depreciation',
-    'editprofile'  			=> 'Edit Your Profile',
-    'eol'					=> 'EOL',
-    'first_name'			=> 'First Name',
-    'generate'				=> 'Generate',
-    'groups'				=> 'Groups',
-    'gravatar_email'        => 'Gravatar Email Address',
-    'history_for'  			=> 'History for',
+    'all_assets'			=> 'Všechna zařízení',
+    'all'       			=> 'Vše',
+    'archived'              => 'Archived',
+    'asset_models'			=> 'Modely majetku',
+    'asset'					=> 'Zařízeni',
+    'asset_report'          => 'Report majetku',
+    'asset_tag'				=> 'Označení majetku',
+    'assets_available'		=> 'dostupných zařízení',
+    'assets'				=> 'Zařízení',
+    'avatar_delete'         => 'Smazat avatara',
+    'avatar_upload'         => 'Nahrát avatara',
+    'back'      			=> 'Zpět',
+    'cancel'  				=> 'Storno',
+    'categories'			=> 'Kategorie majetku',
+    'category'				=> 'Kategorie majetku',
+    'changeemail'  			=> 'Změnit e-mailovou adresu',
+    'changepassword'  		=> 'Změnit heslo',
+    'checkin'  				=> 'Příjem',
+    'checkout'  			=> 'Výdej',
+    'city'  				=> 'Město',
+    'country'  				=> 'Země',
+    'create'				=> 'Vytvořit nové',
+    'created_asset'			=> 'vytvořit majetek',
+    'created_at' 			=> 'Vytvořeno',
+    'currency'  			=> 'Kč',
+    'current'  				=> 'Aktuální',
+    'custom_report'         => 'Vlastní report majetku',
+    'date'					=> 'Datum',
+    'delete'  				=> 'Odstranit',
+    'deleted'  				=> 'Odstraněno',
+    'deployed'				=> 'Vydané',
+    'depreciation_report'	=> 'Report zastarání',
+    'depreciation'			=> 'Amortizace',
+    'editprofile'  			=> 'Upravit profil',
+    'eol'					=> 'Konec životnosti',
+    'first_name'			=> 'Jméno',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
+    'generate'				=> 'Vytvořit',
+    'groups'				=> 'Skupiny',
+    'gravatar_email'        => 'Emailová adresa Gravatar',
+    'history_for'  			=> 'Historie uživatele',
     'id'  					=> 'ID',
-    'image_delete'         => 'Delete Image',
-    'image_upload'         => 'Upload Image',
-    'last_name'				=> 'Last Name',
-    'license'				=> 'License',
-    'license_report'        => 'License Report',
-    'licenses_available'	=> 'licenses available',
-    'licenses'				=> 'Licenses',
-    'list_all'				=> 'List All',
-    'location'              => 'Location',
-    'locations'				=> 'Locations',
-    'logout'				=> 'Logout',
-    'manufacturer'			=> 'Manufacturer',
-    'manufacturers'			=> 'Manufacturers',
-    'model_no'				=> 'Model No.',
-    'months'				=> 'months',
-    'moreinfo'				=> 'More Info',
-    'name'					=> 'Name',
-    'no_depreciation'		=> 'No Depreciation',
-    'no_results'			=> 'No Results.',
-    'no'  					=> 'No',
-    'notes'  				=> 'Notes',
-    'pending'				=> 'Pending',
-    'people'				=> 'People',
-    'per_page'				=> 'Results Per Page',
-    'profile'				=> 'Your profile',
-    'ready_to_deploy'		=> 'Ready to Deploy',
-    'reports'				=> 'Reports',
-    'save'  				=> 'Save',
-    'settings'				=> 'Settings',
-    'sign_in'				=> 'Sign in',
-    'site_name'				=> 'Site Name',
-    'state'  				=> 'State',
-    'status_labels'			=> 'Status Labels',
-    'status'    			=> 'Status',
-    'suppliers'  			=> 'Suppliers',
-    'total_assets'			=> 'total assets',
-    'total_licenses'		=> 'total licenses',
-    'undeployable'			=> 'Un-deployable',
-    'unknown_admin'			=> 'Unknown Admin',
-    'user'					=> 'User',
-    'viewassets'  			=> 'View Assigned Assets',
-    'website'               => 'Website',
-    'welcome'				=> 'Welcome, :name',
-    'years'					=> 'years',
-    'yes' 					=> 'Yes',
-    'zip'  					=> 'Zip',
+    'image_delete'         => 'Smazat obrázek',
+    'image_upload'         => 'Nahrát obrázek',
+    'last_name'				=> 'Příjmení',
+    'license'				=> 'Licence',
+    'license_report'        => 'Report licencí',
+    'licenses_available'	=> 'dostupných licencí',
+    'licenses'				=> 'Licence',
+    'list_all'				=> 'Vypsat vše',
+    'location'              => 'Lokalita',
+    'locations'				=> 'Umístění',
+    'logout'				=> 'Odhlásit',
+    'manufacturer'			=> 'Výrobce',
+    'manufacturers'			=> 'Výrobci',
+    'model_no'				=> 'Modelové č.',
+    'months'				=> 'měsíce',
+    'moreinfo'				=> 'Další informace',
+    'name'					=> 'Název',
+    'no_depreciation'		=> 'Žádná amortizace',
+    'no_results'			=> 'Žádné výsledky.',
+    'no'  					=> 'Ne',
+    'notes'  				=> 'Poznámky',
+    'pending'				=> 'Čeká na vyřízení',
+    'people'				=> 'Lidé',
+    'per_page'				=> 'Výsledků na stránku',
+    'profile'				=> 'Váš profil',
+    'ready_to_deploy'		=> 'Připraveno k přidělení',
+    'reports'				=> 'Reporty',
+    'save'  				=> 'Uložit',
+    'settings'				=> 'Nastavení',
+    'sign_in'				=> 'Přihlásit se',
+    'site_name'				=> 'Název lokality',
+    'state'  				=> 'Stát',
+    'status_labels'			=> 'Označení stavu',
+    'status'    			=> 'Stav',
+    'suppliers'  			=> 'Dodavatelé',
+    'total_assets'			=> 'celkem zařízení',
+    'total_licenses'		=> 'celkem licencí',
+    'undeployable'			=> 'Ne-přiřaditelné',
+    'unknown_admin'			=> 'Neznámy správce',
+    'user'					=> 'Uživatel',
+    'viewassets'  			=> 'Zobrazit přiřazený majetek',
+    'website'               => 'Webová stránka',
+    'welcome'				=> 'Vítej, :name',
+    'years'					=> 'roky',
+    'yes' 					=> 'Ano',
+    'zip'  					=> 'PSČ',
 
 );

app/lang/cs/pagination.php

@@ -13,8 +13,8 @@ return array(
     |
     */
 
-    'previous' => '« Previous',
+    'previous' => '« Předchozí',
 
-    'next'     => 'Next »',
+    'next'     => 'Další »',
 
 );

app/lang/cs/table.php

@@ -2,8 +2,8 @@
 
 return array(
 
-    'actions'	 	=> 'Actions',
-    'action' 		=> 'Action',
-    'by'      		=> 'By',
+    'actions'	 	=> 'Akce',
+    'action' 		=> 'Akce',
+    'by'      		=> 'Vytvořil',
 
 );

app/lang/cs/validation.php

@@ -13,20 +13,20 @@ return array(
     |
     */
 
-    "accepted"         => "The :attribute must be accepted.",
-    "active_url"       => "The :attribute is not a valid URL.",
-    "after"            => "The :attribute must be a date after :date.",
-    "alpha"            => "The :attribute may only contain letters.",
-    "alpha_dash"       => "The :attribute may only contain letters, numbers, and dashes.",
-    "alpha_num"        => "The :attribute may only contain letters and numbers.",
-    "before"           => "The :attribute must be a date before :date.",
+    "accepted"         => "Je potřeba potvrdit :attribute.",
+    "active_url"       => ":attribute není platnou URL.",
+    "after"            => ":attribute nemůže být dříve než :date.",
+    "alpha"            => ":attribute může obsahovat pouze písmena.",
+    "alpha_dash"       => ":attribute může obsahovat pouze písmena, čísla, a pomlčky.",
+    "alpha_num"        => ":attribute může obsahovat pouze písmena čísla.",
+    "before"           => ":attribute nemůže být později než :date.",
     "between"          => array(
-        "numeric" => "The :attribute must be between :min - :max.",
-        "file"    => "The :attribute must be between :min - :max kilobytes.",
-        "string"  => "The :attribute must be between :min - :max characters.",
+        "numeric" => ":attribute musí být mezi :min - :max.",
+        "file"    => ":attribute musí být mezi :min - :max kilobajtů.",
+        "string"  => ":attribute smí obsahovat pouze :min - :max znaků.",
     ),
-    "confirmed"        => "The :attribute confirmation does not match.",
-    "date"             => "The :attribute is not a valid date.",
+    "confirmed"        => "Potvrzení :attribute se neshoduje.",
+    "date"             => ":attribute není platným datem.",
     "date_format"      => "The :attribute does not match the format :format.",
     "different"        => "The :attribute and :other must be different.",
     "digits"           => "The :attribute must be :digits digits.",

app/lang/da/admin/hardware/form.php

@@ -15,6 +15,7 @@ return array(
     'expires'			=> 'Udløber',
     'fully_depreciated'	=> 'Fully Depreciated',
     'help_checkout'		=> 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
+    'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Producent',
     'model'				=> 'Model',
     'months'			=> 'måneder',
@@ -23,6 +24,7 @@ return array(
     'order'				=> 'Order Number',
     'qr'				=> 'QR kode',
     'requestable'		=> 'Users may request this asset',
+    'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Serienummer',
     'status'			=> 'Status',
     'supplier'			=> 'Leverandør',

app/lang/da/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
+	'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset to User',
     'clone'  					=> 'Clone Asset',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Edit Asset',
-    'pending'  					=> 'Pending Asset',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
     'view'  					=> 'View Asset',
 );

app/lang/da/admin/hardware/message.php

@@ -2,7 +2,8 @@
 
 return array(
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
     'does_not_exist' 	=> 'Asset does not exist.',
     'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
 
@@ -16,6 +17,11 @@ return array(
         'success' 		=> 'Asset updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',

app/lang/da/admin/licenses/message.php

@@ -14,6 +14,18 @@ return array(
         'success' => 'License created successfully.'
     ),
 
+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        '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.',
+    ),
+
     'update' => array(
         'error'   => 'License was not updated, please try again',
         'success' => 'License updated successfully.'

app/lang/da/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/da/admin/settings/general.php

@@ -1,6 +1,9 @@
 <?php
 
 return array(
+	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
+	'auto_increment_prefix'		=> 'Prefix (optional)',
+	'auti_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',

app/lang/da/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Status navn',
-    'title'      	=> 'Status labels',
-    'update'      	=> 'Opdater status label',
-    'create'      	=> 'Opret status label',
     'about'      	=> 'Om status labels',
-    'info'      	=> 'Status labels bruges til at beskrive de forskellige grunde til, hvorfor et aktiv <strong><em>ikke</em></strong> kan blive anvendt. Det kan være i stykker, sendt til diagnose, sendt til reparation, mistet eller stjålet, osv. Status labels gør det muligt for dit team at vise udviklingen.',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Opret status label',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Status navn',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Status labels',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Opdater status label',
 );

app/lang/da/button.php

@@ -2,10 +2,13 @@
 
 return array(
 
-    'edit'    => 'Rediger',
-    'delete'  => 'Slet',
-    'restore' => 'Gendan',
-    'actions' => 'Handlinger',
-    'submit'  => 'Send',
+    'actions' 	=> 'Handlinger',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Slet',
+    'edit'    	=> 'Rediger',
+    'restore' 	=> 'Gendan',
+    'submit'  	=> 'Send',
+    'upload'    => 'Upload',
 
 );

app/lang/da/general.php

@@ -2,10 +2,12 @@
 
 return array(
 
+
     'address'				=> 'Addresse',
     'admin'					=> 'Admin',
     'all_assets'			=> 'Alle aktiver',
     'all'       			=> 'Alle',
+    'archived'              => 'Archived',
     'asset_models'			=> 'Asset Models',
     'asset'					=> 'Asset',
     'asset_report'          => 'Asset Report',
@@ -39,6 +41,8 @@ return array(
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
     'first_name'			=> 'Fornavn',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
     'generate'				=> 'Generate',
     'groups'				=> 'Grupper',
     'gravatar_email'        => 'Gravatar email addresse',

app/lang/de/admin/hardware/form.php

@@ -15,6 +15,7 @@ return array(
     'expires'			=> 'Gültig bis',
     'fully_depreciated'	=> 'Komplett Abgeschrieben',
     'help_checkout'		=> 'Wenn du dieses Asset sofort zuweisen möchtest, solltest du "Ready to Deploy" im Statusfeld auswählen oder es könnten unerwartete Probleme auftreten. ',
+    'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Hersteller',
     'model'				=> 'Modell',
     'months'			=> 'Monate',
@@ -23,6 +24,7 @@ return array(
     'order'				=> 'Bestellnummer',
     'qr'				=> 'QR-Code',
     'requestable'		=> 'Benutzer dürfen dieses Asset anfordern',
+    'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Seriennummer',
     'status'			=> 'Status',
     'supplier'			=> 'Lieferant',

app/lang/de/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
+	'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
     'checkin'  					=> 'Asset zurücknehmen',
     'checkout'  				=> 'Asset an Benutzer herausgeben',
     'clone'  					=> 'Asset duplizieren',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Asset editieren',
-    'pending'  					=> 'Unerledigter Asset',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
     'view'  					=> 'Asset ansehen',
 );

app/lang/de/admin/hardware/message.php

@@ -2,7 +2,8 @@
 
 return array(
 
-    'undeployable' 		=> '<b>Warnung:</b> Dieses Asset wurde als nicht zur Herausgabe bereit markiert. Falls sich dieser Status geändert hat, aktualisieren Sie bitte den Asset Status.',
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
     'does_not_exist' 	=> 'Asset existiert nicht.',
     'assoc_users'	 	=> 'Dieses Asset ist im Moment an einen Benutzer herausgegeben und kann nicht entfernt werden. Bitte buchen sie das Asset wieder ein und versuchen Sie dann erneut es zu entfernen. ',
 
@@ -16,6 +17,11 @@ return array(
         'success' 		=> 'Asset wurde erfolgreich aktualisiert.'
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Sind Sie sicher, dass Sie dieses Asset entfernen möchten?',
         'error'   		=> 'Beim Entfernen dieses Assets ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.',

app/lang/de/admin/licenses/form.php

@@ -19,9 +19,9 @@ return array(
     'seats'             => 'Anzahl Aktivierungen',
     'serial'            => 'Seriennummer',
     'supplier'          => 'Lieferant',
-    'termination_date'  => 'Termination Date',
+    'termination_date'  => 'Ablaufdatum',
     'to_email'          => 'E-Mail des Lizenzerwerbers',
     'to_name'           => 'Name des Lizenzerwerbers',
     'update'            => 'Lizenz aktualisieren',
-    'checkout_help'     => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.'
+    'checkout_help'     => 'Du musst eine Lizenz an einen Gegenstand oder eine Person herausgeben. Du kannst beides auswählen, allerdings muss der Besitzer des Gegenstands mit der Person übereinstimmen an die du den Gegenstand herausgibst.'
 );

app/lang/de/admin/licenses/general.php

@@ -11,8 +11,8 @@ return array(
     'in_out'  					=> 'Zurücknehmen/Herausgeben',
     'info'  					=> 'Lizenzinfo',
     'license_seats'  			=> 'Lizenzaktivierungen',
-    'seat'  					=> 'Seat',
-    'seats'  					=> 'Seats',
+    'seat'  					=> 'Lizenz',
+    'seats'  					=> 'Verfügbare Lizenzen',
     'software_licenses'  		=> 'Software Lizenzen',
     'user'  					=> 'Nutzer',
     'view'  					=> 'Lizenz ansehen',

app/lang/de/admin/licenses/message.php

@@ -3,9 +3,9 @@
 return array(
 
     'does_not_exist' => 'Die Kategorie existiert nicht.',
-    'user_does_not_exist' => 'User does not exist.',
-    'asset_does_not_exist' 	=> 'The asset you are trying to associate with this license does not exist.',
-    'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.',
+    'user_does_not_exist' => 'Benutzer existiert nicht.',
+    'asset_does_not_exist' 	=> 'Der Gegenstand den du mit dieser Lizenz verknüpfen willst existiert nicht.',
+    'owner_doesnt_match_asset' => 'Der Gegenstand den du mit dieser Lizenz verknüpfen willst gehört jemand anderem als der im Dropdown-Feld ausgewählten Person.',
     'assoc_users'	 => 'Diese Kategorie ist derzeit mindestens einem Modell zugeordnet und kann nicht gelöscht werden. Bitte aktualisieren Sie Ihre Modelle, um nicht mehr auf diese Kategorie zu verweisen und versuchen Sie es erneut.',
 
 
@@ -14,6 +14,18 @@ return array(
         'success' => 'Die Kategorie wurde erfolgreich erstellt.'
     ),
 
+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        '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.',
+    ),
+
     'update' => array(
         'error'   => 'Die Kategorie wurde nicht aktualisiert, bitte versuchen Sie es erneut.',
         'success' => 'Die Kategorie wurde erfolgreich aktualisiert.'

app/lang/de/admin/licenses/table.php

@@ -5,8 +5,8 @@ return array(
     'assigned_to'   	=> 'Zugewiesen an',
     'checkout'   		=> 'Zurücknehmen/Herausgeben',
     'id'      			=> 'ID',
-    'license_email'   	=> 'License Email',
-    'license_name'   	=> 'Licensed To',
+    'license_email'   	=> 'Lizenziert für Email',
+    'license_name'   	=> 'Lizenziert für',
     'purchase_date'   	=> 'Kaufdatum',
     'purchased'   		=> 'Gekauft',
     'seats'   			=> 'Anzahl Aktivierungen',

app/lang/de/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/de/admin/models/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Modell existiert nicht.',
-    'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
+    'assoc_users'	 => 'Dieses Modell ist zur Zeit mit einem oder mehreren Assets verknüpft und kann nicht gelöscht werden. Bitte lösche die Assets und versuche dann erneut das Modell zu löschen. ',
 
 
     'create' => array(

app/lang/de/admin/settings/general.php

@@ -1,6 +1,9 @@
 <?php
 
 return array(
+	'auto_increment_assets'		=> 'Erzeugen von fortlaufenden Asset IDs',
+	'auto_increment_prefix'		=> 'Präfix (optional)',
+	'auti_incrementing_help'    => 'Aktiviere zuerst fortlaufende asset IDs um dies zu setzen',
     'display_asset_name'        => 'Zeige Assetname an',
     'display_checkout_date'     => 'Zeige Herausgabedatum',
     'display_eol'               => 'Zeige EOL in der Tabellenansicht',
@@ -10,8 +13,8 @@ return array(
     'per_page'                  => 'Ergebnisse pro Seite',
     'php'                       => 'PHP Version',
     'php_gd_info'               => 'Um QR-Codes anzeigen zu können muss php-gd installiert sein, siehe Installationshinweise.',
-    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
-    'qr_help'                   => 'Enable QR Codes first to set this',
+    'php_gd_warning'            => 'PHP Image Processing and GD Plugin ist NICHT installiert.',
+    'qr_help'                   => 'Schalte zuerst QR Codes an um dies zu setzen',
     'qr_text'                   => 'QR Code Text',
     'setting'                   => 'Einstellung',
     'settings'                  => 'Einstellungen',

app/lang/de/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Statusname',
-    'title'      	=> 'Statusbezeichnungen',
-    'update'      	=> 'Statusbezeichnung bearbeiten',
-    'create'      	=> 'Statusbezeichnung erstellen',
     'about'      	=> 'Info Statusbezeichnung',
-    'info'      	=> 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Statusbezeichnung erstellen',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Statusname',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Statusbezeichnungen',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Statusbezeichnung bearbeiten',
 );

app/lang/de/admin/suppliers/table.php

@@ -4,7 +4,7 @@ return array(
     'address'               => 'Lieferantenadressen',
     'assets'                => 'Assets',
     'city'                  => 'Stadt',
-    'contact'               => 'Contact Name',
+    'contact'               => 'Kontakt',
     'country'               => 'Land',
     'create'                => 'Lieferanten erstellen',
     'email'                 => 'Email',

app/lang/de/admin/users/message.php

@@ -16,8 +16,8 @@ return array(
         'delete'    => 'Benutzer wurde erfolgreich gelöscht.',
         'ban'       => 'Benutzer wurde erfolgreich ausgeschlossen.',
         'unban'     => 'Benutzer wurde erfolgreich wieder eingeschlossen.',
-        'suspend'   => 'User was successfully suspended.',
-        'unsuspend' => 'User was successfully unsuspended.',
+        'suspend'   => 'Der Benutzer wurde erfolgreich deaktiviert.',
+        'unsuspend' => 'Der Benutzer wurde erfolgreich reaktiviert.',
         'restored'  => 'Benutzer wurde erfolgreich wiederhergestellt.'
     ),
 
@@ -25,7 +25,7 @@ return array(
         'create' => 'Beim Erstellen des Benutzers ist ein Fehler aufgetreten. Bitte probieren Sie es noch einmal.',
         'update' => 'Beim Aktualisieren des Benutzers ist ein Fehler aufgetreten. Bitte probieren Sie es noch einmal.',
         'delete' => 'Beim Entfernen des Benutzers ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.',
-        'unsuspend' => 'There was an issue unsuspending the user. Please try again.'
+        'unsuspend' => 'Es gab ein Problem beim reaktivieren des Benutzers. Bitte versuche es erneut.'
     ),
 
 );

app/lang/de/admin/users/table.php

@@ -9,9 +9,9 @@ return array(
     'createuser' 			=> 'Benutzer erstellen',
     'deny'  				=> 'Ablehnen',
     'email'      			=> 'Email',
-    'employee_num'      	=> 'Employee No.',
+    'employee_num'      	=> 'Mitarbeiternr.',
     'first_name' 			=> 'Vorname',
-    'groupnotes'			=> 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned.',
+    'groupnotes'			=> 'Wähle eine Gruppe um sie dem Benutzer zuzuweisen, denke daran, dass ein Benutzer die Berechtigungen der zugewiesenen Gruppe übernimmt.',
     'id'         			=> 'Id',
     'inherit'  				=> 'Vererben',
     'job' 					=> 'Berufsbezeichnung',
@@ -26,7 +26,7 @@ return array(
     'title' 				=> 'Titel',
     'updateuser' 			=> 'Benutzer aktualisieren',
     'username' 				=> 'Benutzernamen',
-    'username_note' 		=> '(This is used for Active Directory binding only, not for login.)',
+    'username_note' 		=> '(Dies wird für den Bind an das Active Directory benutzt, nicht für die Anmeldung.)',
     'cloneuser'                         => 'Benutzer kopieren',
     'viewusers' 			=> 'Benutzer anzeigen',
 );

app/lang/de/button.php

@@ -2,10 +2,13 @@
 
 return array(
 
-    'edit'    => 'Bearbeiten',
-    'delete'  => 'Löschen',
-    'restore' => 'Wiederherstellen',
-    'actions' => 'Aktionen',
-    'submit'  => 'Abschicken',
+    'actions' 	=> 'Aktionen',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Löschen',
+    'edit'    	=> 'Bearbeiten',
+    'restore' 	=> 'Wiederherstellen',
+    'submit'  	=> 'Abschicken',
+    'upload'    => 'Upload',
 
 );

app/lang/de/general.php

@@ -2,89 +2,93 @@
 
 return array(
 
+
     'address'				=> 'Supplier Address',
     'admin'					=> 'Administrator',
-    'all_assets'			=> 'All Assets',
+    'all_assets'			=> 'Alle Assets',
     'all'       			=> 'Alle',
-    'asset_models'			=> 'Asset Models',
+    'archived'              => 'Archived',
+    'asset_models'			=> 'Asset Modelle',
     'asset'					=> 'Asset',
-    'asset_report'          => 'Asset Report',
+    'asset_report'          => 'Asset Bericht',
     'asset_tag'				=> 'Asset Tag',
-    'assets_available'		=> 'assets available',
+    'assets_available'		=> 'verfügbare Assets',
     'assets'				=> 'Assets',
     'avatar_delete'         => 'Avatar löschen',
     'avatar_upload'         => 'Avatar hochladen',
     'back'      			=> 'Zurück',
     'cancel'  				=> 'Abbrechen',
-    'categories'			=> 'Asset Categories',
-    'category'				=> 'Asset Category',
-    'changeemail'  			=> 'Change Email Address',
+    'categories'			=> 'Asset Kategorien',
+    'category'				=> 'Asset Kategorie',
+    'changeemail'  			=> 'E-Mail Adresse ändern',
     'changepassword'  		=> 'Passwort ändern',
     'checkin'  				=> 'Checkin Asset',
     'checkout'  			=> 'Checkout Asset to User',
     'city'  				=> 'Stadt',
     'country'  				=> 'Land',
     'create'				=> 'Create Location',
-    'created_asset'			=> 'created asset',
+    'created_asset'			=> 'Asset angelegt',
     'created_at' 			=> 'Erstellt am',
-    'currency'  			=> '$',
-    'current'  				=> 'Current',
-    'custom_report'         => 'Custom Asset Report',
+    'currency'  			=> '€',
+    'current'  				=> 'Aktuell',
+    'custom_report'         => 'Spezieller Asset Report',
     'date'					=> 'Purchase Date',
     'delete'  				=> 'Löschen',
     'deleted'  				=> 'Gelöscht',
-    'deployed'				=> 'Deployed',
-    'depreciation_report'	=> 'Depreciation Report',
-    'depreciation'			=> 'Depreciation',
+    'deployed'				=> 'Herausgegeben',
+    'depreciation_report'	=> 'Abschreibunsgreport',
+    'depreciation'			=> 'Abschreibung',
     'editprofile'  			=> 'Profil bearbeiten',
     'eol'					=> 'EOL',
     'first_name'			=> 'Vorname',
-    'generate'				=> 'Generate',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
+    'generate'				=> 'Generieren',
     'groups'				=> 'Gruppen',
-    'gravatar_email'        => 'Gravatar Email Address',
+    'gravatar_email'        => 'Gravatar E-Mail Adresse',
     'history_for'  			=> 'Verlauf für',
     'id'  					=> 'Id',
     'image_delete'         => 'Bild löschen',
     'image_upload'         => 'Bild hinzufügen',
     'last_name'				=> 'Familienname',
     'license'				=> 'Lizenz',
-    'license_report'        => 'License Report',
+    'license_report'        => 'Lizenz Report',
     'licenses_available'	=> 'Verfügbare Lizenzen',
     'licenses'				=> 'Lizenzen',
     'list_all'				=> 'Alle auflisten',
-    'location'              => 'Location',
-    'locations'				=> 'Locations',
+    'location'              => 'Standort',
+    'locations'				=> 'Standorte',
     'logout'				=> 'Abmelden',
     'manufacturer'			=> 'Hersteller',
     'manufacturers'			=> 'Hersteller',
-    'model_no'				=> 'Model No.',
+    'model_no'				=> 'Modellnr.',
     'months'				=> 'Monate',
-    'moreinfo'				=> 'More Info',
+    'moreinfo'				=> 'Mehr Informationen',
     'name'					=> 'Location Name',
     'no_depreciation'		=> 'Do Not Depreciate',
     'no_results'			=> 'Keine Treffer.',
     'no'  					=> 'Nein',
     'notes'  				=> 'Notizen',
     'pending'				=> 'Pending Asset',
-    'people'				=> 'People',
+    'people'				=> 'Personen',
     'per_page'				=> 'Ergebnisse pro Seite',
     'profile'				=> 'Ihr Profil',
-    'ready_to_deploy'		=> 'Ready to Deploy',
-    'reports'				=> 'Reports',
+    'ready_to_deploy'		=> 'Fertig zum herausgeben',
+    'reports'				=> 'Berichte',
     'save'  				=> 'Speichern',
     'settings'				=> 'Einstellungen',
     'sign_in'				=> 'Einloggen',
-    'site_name'				=> 'Site Name',
-    'state'  				=> 'State',
-    'status_labels'			=> 'Status Labels',
+    'site_name'				=> 'Seitenname',
+    'state'  				=> 'Zustand',
+    'status_labels'			=> 'Statusbezeichnungen',
     'status'    			=> 'Status',
-    'suppliers'  			=> 'Suppliers',
-    'total_assets'			=> 'total assets',
-    'total_licenses'		=> 'total licenses',
-    'undeployable'			=> 'Un-deployable',
+    'suppliers'  			=> 'Lieferanten',
+    'total_assets'			=> 'Gesamte Assets',
+    'total_licenses'		=> 'Lizenzen insgesamt',
+    'undeployable'			=> 'Nicht herausgebbar',
     'unknown_admin'			=> 'Unbekannter Administrator',
     'user'					=> 'Nutzer',
-    'viewassets'  			=> 'View Assigned Assets',
+    'viewassets'  			=> 'Zugeordnete Assets anzeigen',
     'website'               => 'Webseite',
     'welcome'				=> 'Wilkommen, :name',
     'years'					=> 'Jahre',

app/lang/de/reminders.php

@@ -17,7 +17,7 @@ return array(
 
     "user"     => "Benutzername oder Email-Adresse sind falsch",
 
-    "token"    => "This password reset token is invalid.",
+    "token"    => "Das Token um das Passwort zurückzusetzen ist ungültig.",
 
     "sent" => "Wenn eine passende Email-Adresse gefunden wurde, wurde eine Passworterinnerung verschickt!",
 

app/lang/de/validation.php

@@ -13,56 +13,56 @@ return array(
     |
     */
 
-    "accepted"         => "The :attribute must be accepted.",
-    "active_url"       => "The :attribute is not a valid URL.",
-    "after"            => "The :attribute must be a date after :date.",
-    "alpha"            => "The :attribute may only contain letters.",
-    "alpha_dash"       => "The :attribute may only contain letters, numbers, and dashes.",
-    "alpha_num"        => "The :attribute may only contain letters and numbers.",
-    "before"           => "The :attribute must be a date before :date.",
+    "accepted"         => ":attribute muss akzeptiert werden.",
+    "active_url"       => ":attribute ist keine gültige URL.",
+    "after"            => ":attribute muss ein Datum nach dem :date sein.",
+    "alpha"            => ":attribute darf nur aus Buchstaben bestehen.",
+    "alpha_dash"       => ":attribute darf nur aus Buchstaben, Zahlen und Gedankenstrichen bestehen.",
+    "alpha_num"        => ":attribute darf nur aus Buchstaben und Zahlen bestehen.",
+    "before"           => ":attribute muss ein Datum vor dem :date sein.",
     "between"          => array(
-        "numeric" => "The :attribute must be between :min - :max.",
-        "file"    => "The :attribute must be between :min - :max kilobytes.",
-        "string"  => "The :attribute must be between :min - :max characters.",
+        "numeric" => ":attribute muss zwischen :min und :max liegen.",
+        "file"    => ":attribute darf nur zwischen :min und :max kilobytes groß sein.",
+        "string"  => ":attribute muss mindestens :min und maximal :max Zeichen enthalten.",
     ),
-    "confirmed"        => "The :attribute confirmation does not match.",
-    "date"             => "The :attribute is not a valid date.",
-    "date_format"      => "The :attribute does not match the format :format.",
-    "different"        => "The :attribute and :other must be different.",
-    "digits"           => "The :attribute must be :digits digits.",
-    "digits_between"   => "The :attribute must be between :min and :max digits.",
-    "email"            => "The :attribute format is invalid.",
-    "exists"           => "The selected :attribute is invalid.",
-    "image"            => "The :attribute must be an image.",
-    "in"               => "The selected :attribute is invalid.",
-    "integer"          => "The :attribute must be an integer.",
-    "ip"               => "The :attribute must be a valid IP address.",
+    "confirmed"        => ":attribute Bestätigung stimmt nicht überein.",
+    "date"             => ":attribute ist kein gültiges Datum.",
+    "date_format"      => ":attribute passt nicht zur :format Formatierung.",
+    "different"        => ":attribute und :other müssen sich unterscheiden.",
+    "digits"           => ":attribute muss :digits Stellen haben.",
+    "digits_between"   => ":attribute soll mindestens :min und darf maximal :max Stellen haben.",
+    "email"            => "Das Format von :attribute ist ungültig.",
+    "exists"           => "Das ausgewählte :attribute ist ungültig.",
+    "image"            => ":attribute muss ein Bild sein.",
+    "in"               => "Auswahl :attribute ist ungültig.",
+    "integer"          => ":attribute muss eine ganze Zahl sein.",
+    "ip"               => ":attribute muss eine gültige IP Adresse sein.",
     "max"              => array(
-        "numeric" => "The :attribute may not be greater than :max.",
-        "file"    => "The :attribute may not be greater than :max kilobytes.",
-        "string"  => "The :attribute may not be greater than :max characters.",
+        "numeric" => ":attribute darf nicht größer als :max sein.",
+        "file"    => ":attribute darf nicht größer als :max Kilobyte sein.",
+        "string"  => ":attribute darf nicht mehr als :max Zeichen sein.",
     ),
-    "mimes"            => "The :attribute must be a file of type: :values.",
+    "mimes"            => ":attribute muss eine Datei des Typs :values sein.",
     "min"              => array(
-        "numeric" => "The :attribute must be at least :min.",
-        "file"    => "The :attribute must be at least :min kilobytes.",
-        "string"  => "The :attribute must be at least :min characters.",
+        "numeric" => ":attribute muss kleiner als :min sein.",
+        "file"    => ":attribute muss mindestens :min Kilobyte groß sein.",
+        "string"  => ":attribute benötigt mindestens :min Zeichen.",
     ),
-    "not_in"           => "The selected :attribute is invalid.",
-    "numeric"          => "The :attribute must be a number.",
-    "regex"            => "The :attribute format is invalid.",
-    "required"         => "The :attribute field is required.",
-    "required_if"      => "The :attribute field is required when :other is :value.",
-    "required_with"    => "The :attribute field is required when :values is present.",
-    "required_without" => "The :attribute field is required when :values is not present.",
-    "same"             => "The :attribute and :other must match.",
+    "not_in"           => "Auswahl :attribute ist ungültig.",
+    "numeric"          => ":attribute muss eine Zahl sein.",
+    "regex"            => ":attribute Format ungültig.",
+    "required"         => ":attribute Feld muss ausgefüllt sein.",
+    "required_if"      => ":attribute wird benötigt wenn :other :value entspricht.",
+    "required_with"    => ":attribute wird benötigt wenn :value ausgewählt ist.",
+    "required_without" => ":attribute wird benötigt wenn :value nicht ausgewählt ist.",
+    "same"             => ":attribute und :other müssen übereinstimmen.",
     "size"             => array(
-        "numeric" => "The :attribute must be :size.",
-        "file"    => "The :attribute must be :size kilobytes.",
-        "string"  => "The :attribute must be :size characters.",
+        "numeric" => ":attribute muss :size groß sein.",
+        "file"    => ":attribute muss :size Kilobyte groß sein.",
+        "string"  => ":attribute muss :size Zeichen haben.",
     ),
-    "unique"           => "The :attribute has already been taken.",
-    "url"              => "The :attribute format is invalid.",
+    "unique"           => ":attribute schon benutzt.",
+    "url"              => ":attribute Format ist ungültig.",
 
 
     /*
@@ -77,7 +77,7 @@ return array(
     */
 
     'custom' => array(),
-    'alpha_space' => "The :attribute field may only contain letters, commas, spaces and dashes.",
+    'alpha_space' => ":attribute Feld darf nur Buchstaben, Kommas, Leerzeichen und Gedankenstriche enthalten.",
 
     /*
     |--------------------------------------------------------------------------

app/lang/en-GB/admin/hardware/form.php

@@ -15,6 +15,7 @@ return array(
     'expires'			=> 'Expires',
     'fully_depreciated'	=> 'Fully Depreciated',
     'help_checkout'		=> 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
+    'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Manufacturer',
     'model'				=> 'Model',
     'months'			=> 'months',
@@ -23,6 +24,7 @@ return array(
     'order'				=> 'Order Number',
     'qr'				=> 'QR Code',
     'requestable'		=> 'Users may request this asset',
+    'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Serial',
     'status'			=> 'Status',
     'supplier'			=> 'Supplier',

app/lang/en-GB/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
+	'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset to User',
     'clone'  					=> 'Clone Asset',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Edit Asset',
-    'pending'  					=> 'Pending Asset',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
     'view'  					=> 'View Asset',
 );

app/lang/en-GB/admin/hardware/message.php

@@ -17,6 +17,11 @@ return array(
         'success' 		=> 'Asset updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',

app/lang/en-GB/admin/licenses/message.php

@@ -14,6 +14,18 @@ return array(
         'success' => 'License created successfully.'
     ),
 
+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        '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.',
+    ),
+
     'update' => array(
         'error'   => 'License was not updated, please try again',
         'success' => 'License updated successfully.'

app/lang/en-GB/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/en-GB/admin/settings/general.php

@@ -1,6 +1,9 @@
 <?php
 
 return array(
+	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
+	'auto_increment_prefix'		=> 'Prefix (optional)',
+	'auti_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',

app/lang/en-GB/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Status Name',
-    'title'      	=> 'Status Labels',
-    'update'      	=> 'Update Status Label',
-    'create'      	=> 'Create Status Label',
     'about'      	=> 'About Status Labels',
-    'info'      	=> 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Create Status Label',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Status Name',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Status Labels',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Update Status Label',
 );