Fixes #2491 - show asset tag on dashboard

# Conflicts:
#	app/Http/Controllers/ConsumablesController.php
#	app/Http/Controllers/LicensesController.php
#	resources/views/hardware/view.blade.php

.env.example

@@ -30,7 +30,7 @@ MAIL_USERNAME=YOURUSERNAME
 MAIL_PASSWORD=YOURPASSWORD
 MAIL_ENCRYPTION=null
 MAIL_FROM_ADDR=you@example.com
-MAIL_FROM_NAME=Snipe-IT
+MAIL_FROM_NAME='Snipe-IT'
 
 
 # --------------------------------------------
@@ -74,4 +74,4 @@ AWS_BUCKET=null
 APP_LOG=single
 APP_LOCKED=false
 FILESYSTEM_DISK=local
-APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1
+APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1

app/Console/Commands/ObjectImportCommand.php

@@ -780,7 +780,7 @@ class ObjectImportCommand extends Command
         if (!empty($item["purchase_cost"])) {
             //TODO How to generalize this for not USD?
             $purchase_cost = substr($item["purchase_cost"], 0, 1) === '$' ? substr($item["purchase_cost"], 1) : $item["purchase_cost"];
-            $asset->purchase_cost = number_format($purchase_cost, 2);
+            $asset->purchase_cost = number_format($purchase_cost, 2, '.', '');
             $this->log("Asset cost parsed: " . $asset->purchase_cost);
         } else {
             $asset->purchase_cost = 0.00;

app/Console/Commands/Purge.php

@@ -62,15 +62,19 @@ class Purge extends Command
             $assetcount = $assets->count();
             $this->info($assets->count().' assets purged.');
             $asset_assoc = 0;
+            $asset_maintenances = 0;
 
             foreach ($assets as $asset) {
                 $this->info('- Asset "'.$asset->showAssetName().'" deleted.');
                 $asset_assoc += $asset->assetlog()->count();
                 $asset->assetlog()->forceDelete();
+                $asset_maintenances += $asset->assetmaintenances()->count();
+                $asset->assetmaintenances()->forceDelete();
                 $asset->forceDelete();
             }
 
             $this->info($asset_assoc.' corresponding log records purged.');
+            $this->info($asset_maintenances.' corresponding maintenance records purged.');
 
             $locations = Location::whereNotNull('deleted_at')->withTrashed()->get();
             $this->info($locations->count().' locations purged.');

app/Helpers/Helper.php

@@ -17,6 +17,8 @@ use App\Models\Component;
 use App\Models\Accessory;
 use App\Models\Consumable;
 use App\Models\Asset;
+use Crypt;
+use Illuminate\Contracts\Encryption\DecryptException;
 
 /*
  * To change this license header, choose License Headers in Project Properties.
@@ -43,6 +45,17 @@ class Helper
         return array_walk($emails_array, 'trim_value');
     }
 
+    public static function formatCurrencyOutput($cost)
+    {
+        // The importer has formatted number strings since v3, so the value might be a string, or an integer.
+        // If it's a number, format it as a string
+        if (is_numeric($cost)) {
+            return number_format($cost, 2, '.', '');
+        }
+        // It's already been parsed.
+        return $cost;
+    }
+
     // This doesn't do anything yet
     public static function trim_value(&$value)
     {
@@ -226,7 +239,7 @@ class Helper
     {
         $keys=array_keys(CustomField::$PredefinedFormats);
         $stuff=array_combine($keys, $keys);
-        return $stuff+["" => "Custom Format..."];
+        return $stuff+["" => trans('admin/custom_fields/general.custom_format')];
     }
 
     public static function barcodeDimensions($barcode_type = 'QRCODE')
@@ -465,6 +478,21 @@ class Helper
     }
 
 
+    public static function gracefulDecrypt(CustomField $field, $string) {
 
+        if ($field->isFieldDecryptable($string)) {
+
+            try {
+                Crypt::decrypt($string);
+                return Crypt::decrypt($string);
+
+            } catch (DecryptException $e) {
+                return 'Error Decrypting: '.$e->getMessage();
+            }
+
+        }
+        return $string;
+
+    }
 
 }

app/Http/Controllers/AccessoriesController.php

@@ -53,14 +53,12 @@ class AccessoriesController extends Controller
     public function getCreate(Request $request)
     {
         // Show the page
-        $category_list = Helper::categoryList('accessory');
-        $company_list = Helper::companyList();
-        $location_list = Helper::locationsList();
         return View::make('accessories/edit')
           ->with('accessory', new Accessory)
-          ->with('category_list', $category_list)
-          ->with('company_list', $company_list)
-          ->with('location_list', $location_list);
+          ->with('category_list', Helper::categoryList('accessory'))
+          ->with('company_list', Helper::companyList())
+          ->with('location_list', Helper::locationsList())
+          ->with('manufacturer_list', Helper::manufacturerList());
     }
 
 
@@ -77,12 +75,13 @@ class AccessoriesController extends Controller
         $accessory = new Accessory();
 
         // Update the accessory data
-        $accessory->name                  = e(Input::get('name'));
-        $accessory->category_id               = e(Input::get('category_id'));
-        $accessory->location_id               = e(Input::get('location_id'));
-        $accessory->min_amt               = e(Input::get('min_amt'));
+        $accessory->name                    = e(Input::get('name'));
+        $accessory->category_id             = e(Input::get('category_id'));
+        $accessory->location_id             = e(Input::get('location_id'));
+        $accessory->min_amt                 = e(Input::get('min_amt'));
         $accessory->company_id              = Company::getIdForCurrentUser(Input::get('company_id'));
         $accessory->order_number            = e(Input::get('order_number'));
+        $accessory->manufacturer_id         = e(Input::get('manufacturer_id'));
 
         if (e(Input::get('purchase_date')) == '') {
             $accessory->purchase_date       =  null;
@@ -96,8 +95,8 @@ class AccessoriesController extends Controller
             $accessory->purchase_cost       = e(Input::get('purchase_cost'));
         }
 
-        $accessory->qty                       = e(Input::get('qty'));
-        $accessory->user_id               = Auth::user()->id;
+        $accessory->qty                     = e(Input::get('qty'));
+        $accessory->user_id                 = Auth::user()->id;
 
         // Was the accessory created?
         if ($accessory->save()) {
@@ -126,14 +125,11 @@ class AccessoriesController extends Controller
             return redirect()->to('admin/accessories')->with('error', trans('general.insufficient_permissions'));
         }
 
-        $category_list = Helper::categoryList('accessory');
-        $company_list = Helper::companyList();
-        $location_list = Helper::locationsList();
-
         return View::make('accessories/edit', compact('accessory'))
-          ->with('category_list', $category_list)
-          ->with('company_list', $company_list)
-          ->with('location_list', $location_list);
+          ->with('category_list', Helper::categoryList('accessory'))
+          ->with('company_list', Helper::companyList())
+          ->with('location_list', Helper::locationsList())
+          ->with('manufacturer_list', Helper::manufacturerList());
     }
 
 
@@ -146,9 +142,9 @@ class AccessoriesController extends Controller
    */
     public function postEdit(Request $request, $accessoryId = null)
     {
-      // Check if the blog post exists
+      // Check if the accessory exists
         if (is_null($accessory = Accessory::find($accessoryId))) {
-            // Redirect to the blogs management page
+            // Redirect to the accessory index page
             return redirect()->to('admin/accessories')->with('error', trans('admin/accessories/message.does_not_exist'));
         } elseif (!Company::isCurrentUserHasAccess($accessory)) {
             return redirect()->to('admin/accessories')->with('error', trans('general.insufficient_permissions'));
@@ -160,11 +156,12 @@ class AccessoriesController extends Controller
         if (e(Input::get('location_id')) == '') {
             $accessory->location_id = null;
         } else {
-            $accessory->location_id     = e(Input::get('location_id'));
+            $accessory->location_id         = e(Input::get('location_id'));
         }
-        $accessory->min_amt             = e(Input::get('min_amt'));
+        $accessory->min_amt                 = e(Input::get('min_amt'));
         $accessory->category_id             = e(Input::get('category_id'));
         $accessory->company_id              = Company::getIdForCurrentUser(Input::get('company_id'));
+        $accessory->manufacturer_id         = e(Input::get('manufacturer_id'));
         $accessory->order_number            = e(Input::get('order_number'));
 
         if (e(Input::get('purchase_date')) == '') {
@@ -181,9 +178,9 @@ class AccessoriesController extends Controller
 
         $accessory->qty                     = e(Input::get('qty'));
 
-      // Was the accessory created?
+      // Was the accessory updated?
         if ($accessory->save()) {
-            // Redirect to the new accessory page
+            // Redirect to the updated accessory page
             return redirect()->to("admin/accessories")->with('success', trans('admin/accessories/message.update.success'));
         }
 
@@ -617,10 +614,12 @@ class AccessoriesController extends Controller
             'min_amt'  => e($accessory->min_amt),
             'location'      => ($accessory->location) ? e($accessory->location->name): '',
             'purchase_date' => e($accessory->purchase_date),
-            'purchase_cost' => number_format($accessory->purchase_cost, 2),
+            'purchase_cost' => Helper::formatCurrencyOutput($accessory->purchase_cost),
             'numRemaining'  => $accessory->numRemaining(),
             'actions'       => $actions,
-            'companyName'   => is_null($company) ? '' : e($company->name)
+            'companyName'   => is_null($company) ? '' : e($company->name),
+            'manufacturer'      => $accessory->manufacturer ? (string) link_to('/admin/settings/manufacturers/'.$accessory->manufacturer_id.'/view', $accessory->manufacturer->name) : ''
+
             );
         }
 

app/Http/Controllers/AssetsController.php

@@ -354,7 +354,7 @@ class AssetsController extends Controller
         }
 
         if ($request->has('purchase_cost')) {
-            $asset->purchase_cost = e(number_format($request->input('purchase_cost'), 2, '.', ''));
+            $asset->purchase_cost = e(Helper::formatCurrencyOutput($request->input('purchase_cost')));
         } else {
             $asset->purchase_cost =  null;
         }
@@ -436,14 +436,22 @@ class AssetsController extends Controller
         $model = AssetModel::find($request->get('model_id'));
         if ($model->fieldset) {
             foreach ($model->fieldset->fields as $field) {
-                $asset->{\App\Models\CustomField::name_to_db_name($field->name)} = e($request->input(\App\Models\CustomField::name_to_db_name($field->name)));
-    //                LOG::debug($field->name);
-    //                LOG::debug(\App\Models\CustomField::name_to_db_name($field->name));
-    //                LOG::debug($field->db_column_name());
+
+
+                if ($field->field_encrypted=='1') {
+                    if (Gate::allows('admin')) {
+                        $asset->{\App\Models\CustomField::name_to_db_name($field->name)} = \Crypt::encrypt(e($request->input(\App\Models\CustomField::name_to_db_name($field->name))));
+                    }
+
+                } else {
+                    $asset->{\App\Models\CustomField::name_to_db_name($field->name)} = e($request->input(\App\Models\CustomField::name_to_db_name($field->name)));
+                }
+
 
             }
         }
 
+
         if ($asset->save()) {
             // Redirect to the new asset page
             \Session::flash('success', trans('admin/hardware/message.update.success'));
@@ -1588,31 +1596,31 @@ class AssetsController extends Controller
     * @since [v2.0]
     * @return String JSON
     */
-    public function getDatatable($status = null)
+    public function getDatatable(Request $request, $status = null)
     {
 
 
         $assets = Company::scopeCompanyables(Asset::select('assets.*'))->with('model', 'assigneduser', 'assigneduser.userloc', 'assetstatus', 'defaultLoc', 'assetlog', 'model', 'model.category', 'model.manufacturer', 'model.fieldset', 'assetstatus', 'assetloc', 'company')
         ->Hardware();
 
-        if (Input::has('search')) {
-             $assets = $assets->TextSearch(e(Input::get('search')));
+        if ($request->has('search')) {
+             $assets = $assets->TextSearch(e($request->get('search')));
         }
 
-        if (Input::has('offset')) {
-             $offset = e(Input::get('offset'));
+        if ($request->has('offset')) {
+             $offset = e($request->get('offset'));
         } else {
              $offset = 0;
         }
 
-        if (Input::has('limit')) {
-             $limit = e(Input::get('limit'));
+        if ($request->has('limit')) {
+             $limit = e($request->get('limit'));
         } else {
              $limit = 50;
         }
 
-        if (Input::has('order_number')) {
-            $assets->where('order_number', '=', e(Input::get('order_number')));
+        if ($request->has('order_number')) {
+            $assets->where('order_number', '=', e($request->get('order_number')));
         }
 
         switch ($status) {
@@ -1640,6 +1648,12 @@ class AssetsController extends Controller
 
         }
 
+        if ($request->has('status_id')) {
+            $assets->where('status_id','=', e($request->get('status_id')));
+        }
+
+
+
         $allowed_columns = [
         'id',
         'name',
@@ -1669,8 +1683,8 @@ class AssetsController extends Controller
             $allowed_columns[]=$field->db_column_name();
         }
 
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'asset_tag';
+        $order = $request->get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array($request->get('sort'), $allowed_columns) ? $request->get('sort') : 'asset_tag';
 
         switch ($sort) {
             case 'model':
@@ -1709,24 +1723,26 @@ class AssetsController extends Controller
         $rows = array();
         foreach ($assets as $asset) {
             $inout = '';
-            $actions = '';
+            $actions = '<div style="white-space: nowrap;">';
             if ($asset->deleted_at=='') {
                 if (Gate::allows('assets.create')) {
-                    $actions = '<div style=" white-space: nowrap;"><a href="' . route('clone/hardware',
-                            $asset->id) . '" class="btn btn-info btn-sm" title="Clone asset" data-toggle="tooltip"><i class="fa fa-clone"></i>';
+                    $actions .= '<a href="' . route('clone/hardware',
+                            $asset->id) . '" class="btn btn-info btn-sm" title="Clone asset" data-toggle="tooltip"><i class="fa fa-clone"></i></a> ';
                 }
                 if (Gate::allows('assets.edit')) {
-                    $actions .= '</a> <a href="' . route('update/hardware',
+                    $actions .= '<a href="' . route('update/hardware',
                             $asset->id) . '" class="btn btn-warning btn-sm" title="Edit asset" data-toggle="tooltip"><i class="fa fa-pencil icon-white"></i></a> ';
                 }
                 if (Gate::allows('assets.delete')) {
                     $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/hardware',
-                            $asset->id) . '" data-content="' . trans('admin/hardware/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($asset->asset_tag) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
+                            $asset->id) . '" data-content="' . trans('admin/hardware/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($asset->asset_tag) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
                 }
             } elseif ($asset->model->deleted_at=='') {
-                $actions = '<a href="'.route('restore/hardware', $asset->id).'" title="Restore asset" data-toggle="tooltip" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
+                $actions .= '<a href="'.route('restore/hardware', $asset->id).'" title="Restore asset" data-toggle="tooltip" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
             }
 
+            $actions .= '</div>';
+
             if (($asset->availableForCheckout()))
             {
                 if (Gate::allows('assets.checkout')) {
@@ -1741,11 +1757,7 @@ class AssetsController extends Controller
                 }
             }
 
-            // Lots going on here.  Importer has parsed numbers before importing, so we need to check and see if it's a number before trying to parse.
-            $purchase_cost = $asset->purchase_cost ?: '';
-            if (is_numeric($purchase_cost)) {
-                $purchase_cost = number_format($purchase_cost, 2);
-            }
+            $purchase_cost = Helper::formatCurrencyOutput($asset->purchase_cost);
 
             $row = array(
             'checkbox'      =>'<div class="text-center"><input type="checkbox" name="edit_asset['.$asset->id.']" class="one_required"></div>',
@@ -1774,7 +1786,28 @@ class AssetsController extends Controller
             'companyName'   => is_null($asset->company) ? '' : e($asset->company->name)
             );
             foreach ($all_custom_fields as $field) {
-                $row[$field->db_column_name()]=$asset->{$field->db_column_name()};
+                $column_name = $field->db_column_name();
+
+                if ($field->isFieldDecryptable($asset->{$column_name})) {
+
+                    if (Gate::allows('admin')) {
+                        if (($field->format=='URL') && ($asset->{$column_name}!='')) {
+                            $row[$column_name] = '<a href="'.Helper::gracefulDecrypt($field, $asset->{$column_name}).'" target="_blank">'.Helper::gracefulDecrypt($field, $asset->{$column_name}).'</a>';
+                        } else {
+                            $row[$column_name] = Helper::gracefulDecrypt($field, $asset->{$column_name});
+                        }
+
+                    } else {
+                        $row[$field->db_column_name()] = strtoupper(trans('admin/custom_fields/general.encrypted'));
+                    }
+                } else {
+                    if (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) {
+                        $row[$field->db_column_name()] = '<a href="'.$asset->{$field->db_column_name()}.'" target="_blank">'.$asset->{$field->db_column_name()}.'</a>';
+                    } else {
+                        $row[$field->db_column_name()] = e($asset->{$field->db_column_name()});
+                    }
+                }
+
             }
             $rows[]=$row;
         }

app/Http/Controllers/ComponentsController.php

@@ -375,7 +375,7 @@ class ComponentsController extends Controller
                         'fields' => [
                             [
                                 'title' => 'Checked Out:',
-                                'value' => strtoupper($logaction->asset_type).' <'.config('app.url').'/admin/components/'.$component->id.'/view'.'|'.$component->name.'> checked out to <'.config('app.url').'/hardware/'.$asset->id.'/view|'.$asset->name.'> by <'.config('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
+                                'value' => strtoupper($logaction->asset_type).' <'.config('app.url').'/admin/components/'.$component->id.'/view'.'|'.$component->name.'> checked out to <'.config('app.url').'/hardware/'.$asset->id.'/view|'.$asset->showAssetName().'> by <'.config('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
                             ],
                             [
                                 'title' => 'Note:',
@@ -484,7 +484,7 @@ class ComponentsController extends Controller
                 'category'           => ($component->category) ? e($component->category->name) : 'Missing category',
                 'order_number'  => e($component->order_number),
                 'purchase_date'  => e($component->purchase_date),
-                'purchase_cost'  => ($component->purchase_cost!='') ? number_format($component->purchase_cost, 2): '' ,
+                'purchase_cost'  => Helper::formatCurrencyOutput($component->purchase_cost),
                 'numRemaining'  => $component->numRemaining(),
                 'actions'       => $actions,
                 'companyName'   => is_null($company) ? '' : e($company->name),

app/Http/Controllers/ConsumablesController.php

@@ -470,13 +470,13 @@ class ConsumablesController extends Controller
                 'location'   => ($consumable->location) ? e($consumable->location->name) : '',
                 'min_amt'           => e($consumable->min_amt),
                 'qty'           => e($consumable->qty),
-                'manufacturer'           => ($consumable->manufacturer) ? e($consumable->manufacturer->name) : '',
-                'model_no'           => e($consumable->model_no),
-                'item_no'           => e($consumable->item_no),
-                'category'           => ($consumable->category) ? e($consumable->category->name) : 'Missing category',
+                'manufacturer'  => ($consumable->manufacturer) ? (string) link_to('/admin/settings/manufacturers/'.$consumable->manufacturer_id.'/view', $consumable->manufacturer->name): '',
+                'model_no'      => e($consumable->model_no),
+                'item_no'       => e($consumable->item_no),
+                'category'      => ($consumable->category) ? (string) link_to('/admin/settings/categories/'.$consumable->category_id.'/view', $consumable->category->name) : 'Missing category',
                 'order_number'  => e($consumable->order_number),
                 'purchase_date'  => e($consumable->purchase_date),
-                'purchase_cost'  => ($consumable->purchase_cost!='') ? number_format($consumable->purchase_cost, 2): '' ,
+                'purchase_cost'  => Helper::formatCurrencyOutput($consumable->purchase_cost),
                 'numRemaining'  => $consumable->numRemaining(),
                 'actions'       => $actions,
                 'companyName'   => is_null($company) ? '' : e($company->name),

app/Http/Controllers/CustomFieldsController.php

@@ -10,6 +10,7 @@ use Redirect;
 use App\Models\AssetModel;
 use Lang;
 use Auth;
+use Illuminate\Http\Request;
 
 /**
  * This controller handles all actions related to Custom Asset Fields for
@@ -63,10 +64,15 @@ class CustomFieldsController extends Controller
     * @since [v1.8]
     * @return Redirect
     */
-    public function store()
+    public function store(Request $request)
     {
         //
-        $cfset=new CustomFieldset(["name" => Input::get("name"),"user_id" => Auth::user()->id]);
+        $cfset = new CustomFieldset(
+            [
+                "name" => e($request->get("name")),
+                "user_id" => Auth::user()->id]
+            );
+
         $validator=Validator::make(Input::all(), $cfset->rules);
         if ($validator->passes()) {
             $cfset->save();
@@ -122,24 +128,33 @@ class CustomFieldsController extends Controller
     * @since [v1.8]
     * @return Redirect
     */
-    public function storeField()
+    public function storeField(Request $request)
     {
-        $field=new CustomField(["name" => Input::get("name"),"element" => Input::get("element"),"user_id" => Auth::user()->id]);
+        $field = new CustomField([
+            "name" => e($request->get("name")),
+            "element" => e($request->get("element")),
+            "field_values" => e($request->get("field_values")),
+            "field_encrypted" => e($request->get("field_encrypted", 0)),
+            "user_id" => Auth::user()->id
+        ]);
+
 
 
         if (!in_array(Input::get('format'), array_keys(CustomField::$PredefinedFormats))) {
-            $field->format=Input::get("custom_format");
+            $field->format = e($request->get("custom_format"));
         } else {
-            $field->format=Input::get('format');
+            $field->format = e($request->get("format"));
         }
 
+
+
         $validator=Validator::make(Input::all(), $field->rules);
         if ($validator->passes()) {
-            $results=$field->save();
-            //return "postCreateField: $results";
+            $results = $field->save();
             if ($results) {
                 return redirect()->route("admin.custom_fields.index")->with("success", trans('admin/custom_fields/message.field.create.success'));
             } else {
+                dd($field);
                 return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.field.create.error'));
             }
         } else {
@@ -175,9 +190,7 @@ class CustomFieldsController extends Controller
     */
     public function deleteField($field_id)
     {
-        $field=CustomField::find($field_id);
-
-
+        $field = CustomField::find($field_id);
 
         if ($field->fieldset->count()>0) {
             return redirect()->back()->withErrors(['message' => "Field is in-use"]);

app/Http/Controllers/DashboardController.php

@@ -32,7 +32,7 @@ class DashboardController extends Controller
 
             $recent_activity = Actionlog::orderBy('created_at', 'DESC')
                 ->with('accessorylog', 'consumablelog', 'licenselog', 'assetlog', 'adminlog', 'userlog', 'componentlog')
-                ->take(30)
+                ->take(20)
                 ->get();
 
 

app/Http/Controllers/LicensesController.php

@@ -61,18 +61,17 @@ class LicensesController extends Controller
     public function getCreate()
     {
 
-        $depreciation_list = Helper::depreciationList();
-        $supplier_list = Helper::suppliersList();
         $maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
-        $company_list = Helper::companyList();
 
         return View::make('licenses/edit')
             //->with('license_options',$license_options)
-            ->with('depreciation_list', $depreciation_list)
-            ->with('supplier_list', $supplier_list)
+            ->with('depreciation_list', Helper::depreciationList())
+            ->with('supplier_list', Helper::suppliersList())
             ->with('maintained_list', $maintained_list)
-            ->with('company_list', $company_list)
+            ->with('company_list', Helper::companyList())
+            ->with('manufacturer_list', Helper::manufacturerList())
             ->with('license', new License);
+
     }
 
 
@@ -125,6 +124,12 @@ class LicensesController extends Controller
             $license->purchase_order = e(Input::get('purchase_order'));
         }
 
+        if (empty(e(Input::get('manufacturer_id')))) {
+            $license->manufacturer_id = null;
+        } else {
+            $license->manufacturer_id = e(Input::get('manufacturer_id'));
+        }
+
         // Save the license data
         $license->name              = e(Input::get('name'));
         $license->serial            = e(Input::get('serial'));
@@ -206,17 +211,15 @@ class LicensesController extends Controller
 
         // Show the page
         $license_options = array('' => 'Top Level') + DB::table('assets')->where('id', '!=', $licenseId)->pluck('name', 'id');
-        $depreciation_list = array('0' => trans('admin/licenses/form.no_depreciation')) + Depreciation::pluck('name', 'id')->toArray();
-        $supplier_list = array('' => 'Select Supplier') + Supplier::orderBy('name', 'asc')->pluck('name', 'id')->toArray();
         $maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
-        $company_list = Helper::companyList();
 
         return View::make('licenses/edit', compact('license'))
             ->with('license_options', $license_options)
-            ->with('depreciation_list', $depreciation_list)
-            ->with('supplier_list', $supplier_list)
-            ->with('company_list', $company_list)
-            ->with('maintained_list', $maintained_list);
+            ->with('depreciation_list', Helper::depreciationList())
+            ->with('supplier_list', Helper::suppliersList())
+            ->with('company_list', Helper::companyList())
+            ->with('maintained_list', $maintained_list)
+            ->with('manufacturer_list', Helper::manufacturerList());
     }
 
 
@@ -253,6 +256,13 @@ class LicensesController extends Controller
         $license->maintained        = e(Input::get('maintained'));
         $license->reassignable      = e(Input::get('reassignable'));
 
+        if (empty(e(Input::get('manufacturer_id')))) {
+            $license->manufacturer_id = null;
+        } else {
+            $license->manufacturer_id = e(Input::get('manufacturer_id'));
+        }
+
+
         if (e(Input::get('supplier_id')) == '') {
             $license->supplier_id = null;
         } else {
@@ -502,7 +512,7 @@ class LicensesController extends Controller
             }
 
 
-            if (($asset->assigned_to!='') && (($asset->assigned_to!=$assigned_to)) && ($assigned_to!='') ) {
+            if (($asset->assigned_to!='') && (($asset->assigned_to!=$assigned_to)) && ($assigned_to!='')) {
                 return redirect()->to('admin/licenses')->with('error', trans('admin/licenses/message.owner_doesnt_match_asset'));
             }
 
@@ -987,21 +997,22 @@ class LicensesController extends Controller
             $actions = '<span style="white-space: nowrap;">';
 
             if (Gate::allows('licenses.checkout')) {
-                $actions .= '<a href="' . route('freecheckout/license',
-                        $license->id) . '" class="btn btn-primary btn-sm' . (($license->remaincount() > 0) ? '' : ' disabled') . '" style="margin-right:5px;">' . trans('general.checkout') . '</a> ';
+                $actions .= '<a href="' . route('freecheckout/license', $license->id)
+                . '" class="btn btn-primary btn-sm' . (($license->remaincount() > 0) ? '' : ' disabled') . '" style="margin-right:5px;">' . trans('general.checkout') . '</a> ';
             }
 
             if (Gate::allows('licenses.create')) {
-                $actions .= '<a href="' . route('clone/license',
-                        $license->id) . '" class="btn btn-info btn-sm" style="margin-right:5px;" title="Clone asset"><i class="fa fa-files-o"></i></a>';
+                $actions .= '<a href="' . route('clone/license', $license->id)
+                . '" class="btn btn-info btn-sm" style="margin-right:5px;" title="Clone asset"><i class="fa fa-files-o"></i></a>';
             }
             if (Gate::allows('licenses.edit')) {
-                $actions .= '<a href="' . route('update/license',
-                        $license->id) . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
+                $actions .= '<a href="' . route('update/license', $license->id)
+                . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
             }
             if (Gate::allows('licenses.delete')) {
-                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/license',
-                        $license->id) . '" data-content="' . trans('admin/licenses/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($license->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'
+                 . route('delete/license', $license->id)
+                 . '" data-content="' . trans('admin/licenses/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($license->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
             }
             $actions .='</span>';
 
@@ -1012,15 +1023,16 @@ class LicensesController extends Controller
                 'totalSeats'        => $license->totalSeatsByLicenseID(),
                 'remaining'         => $license->remaincount(),
                 'license_name'      => e($license->license_name),
-                'license_email'      => e($license->license_email),
+                'license_email'     => e($license->license_email),
                 'purchase_date'     => ($license->purchase_date) ? $license->purchase_date : '',
                 'expiration_date'     => ($license->expiration_date) ? $license->expiration_date : '',
-                'purchase_cost'     => ($license->purchase_cost) ? number_format($license->purchase_cost, 2) : '',
+                'purchase_cost'     => Helper::formatCurrencyOutput($license->purchase_cost),
                 'purchase_order'     => ($license->purchase_order) ? e($license->purchase_order) : '',
                 'order_number'     => ($license->order_number) ? e($license->order_number) : '',
                 'notes'     => ($license->notes) ? e($license->notes) : '',
                 'actions'           => $actions,
-                'companyName'       => is_null($license->company) ? '' : e($license->company->name)
+                'companyName'       => is_null($license->company) ? '' : e($license->company->name),
+                'manufacturer'      => $license->manufacturer ? (string) link_to('/admin/settings/manufacturers/'.$license->manufacturer_id.'/view', $license->manufacturer->name) : ''
             );
         }
 

app/Http/Controllers/ManufacturersController.php

@@ -5,7 +5,7 @@ use App\Models\Company;
 use App\Models\Manufacturer;
 use App\Models\Setting;
 use Auth;
-use Illuminate\Support\Facades\Gate;
+use Gate;
 use Input;
 use Lang;
 use Redirect;
@@ -255,10 +255,27 @@ class ManufacturersController extends Controller
     * @since [v1.0]
     * @return String JSON
     */
-    public function getDataView($manufacturerId)
+    public function getDataView($manufacturerId, $itemtype = null)
     {
-
         $manufacturer = Manufacturer::with('assets.company')->find($manufacturerId);
+
+        switch ($itemtype) {
+            case "assets":
+                return $this->getDataAssetsView($manufacturer);
+            case "licenses":
+                return $this->getDataLicensesView($manufacturer);
+            case "accessories":
+                return $this->getDataAccessoriesView($manufacturer);
+            case "consumables":
+                return $this->getDataConsumablesView($manufacturer);
+        }
+
+        throw new Exception("We shouldn't be here");
+
+    }
+
+    protected function getDataAssetsView(Manufacturer $manufacturer)
+    {
         $manufacturer_assets = $manufacturer->assets;
 
         if (Input::has('search')) {
@@ -304,25 +321,203 @@ class ManufacturersController extends Controller
                 }
             }
 
-            $row = array(
-            'id' => $asset->id,
-            'name' => (string)link_to('/hardware/'.$asset->id.'/view', e($asset->showAssetName())),
-            'model' => e($asset->model->name),
-            'asset_tag' => e($asset->asset_tag),
-            'serial' => e($asset->serial),
-            'assigned_to' => ($asset->assigneduser) ? (string)link_to('/admin/users/'.$asset->assigneduser->id.'/view', e($asset->assigneduser->fullName())): '',
-            'actions' => $actions,
-            'companyName' => e(Company::getName($asset)),
-            );
+            $rows[] = array(
+                'id' => $asset->id,
+                'name' => (string)link_to('/hardware/'.$asset->id.'/view', e($asset->showAssetName())),
+                'model' => e($asset->model->name),
+                'asset_tag' => e($asset->asset_tag),
+                'serial' => e($asset->serial),
+                'assigned_to' => ($asset->assigneduser) ? (string)link_to('/admin/users/'.$asset->assigneduser->id.'/view', e($asset->assigneduser->fullName())): '',
+                'actions' => $actions,
+                'companyName' => e(Company::getName($asset)),
+                );
 
-            if (isset($inout)) {
-                $row['change'] = $inout;
+                if (isset($inout)) {
+                    $row['change'] = $inout;
+                }
             }
-
-            $rows[] = $row;
-        }
-
+            
         $data = array('total' => $count, 'rows' => $rows);
         return $data;
     }
+
+    protected function getDataLicensesView(Manufacturer $manufacturer)
+    {
+        $licenses = $manufacturer->licenses;
+
+        if (Input::has('search')) {
+            $licenses = $licenses->TextSearch(Input::get('search'));
+        }
+
+        $licenseCount = $licenses->count();
+
+        $rows = array();
+
+        foreach ($licenses as $license) {
+            $actions = '<span style="white-space: nowrap;">';
+
+            if (Gate::allows('licenses.checkout')) {
+                $actions .= '<a href="' . route('freecheckout/license', $license->id)
+                . '" class="btn btn-primary btn-sm' . (($license->remaincount() > 0) ? '' : ' disabled') . '" style="margin-right:5px;">' . trans('general.checkout') . '</a> ';
+            }
+
+            if (Gate::allows('licenses.create')) {
+                $actions .= '<a href="' . route('clone/license', $license->id)
+                . '" class="btn btn-info btn-sm" style="margin-right:5px;" title="Clone asset"><i class="fa fa-files-o"></i></a>';
+            }
+            if (Gate::allows('licenses.edit')) {
+                $actions .= '<a href="' . route('update/license', $license->id)
+                . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
+            }
+            if (Gate::allows('licenses.delete')) {
+                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'
+                 . route('delete/license', $license->id)
+                 . '" data-content="' . trans('admin/licenses/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($license->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+            }
+            $actions .='</span>';
+
+            $rows[] = array(
+                'id'                => $license->id,
+                'name'              => (string) link_to('/admin/licenses/'.$license->id.'/view', $license->name),
+                'serial'            => (string) link_to('/admin/licenses/'.$license->id.'/view', mb_strimwidth($license->serial, 0, 50, "...")),
+                'totalSeats'        => $license->totalSeatsByLicenseID(),
+                'remaining'         => $license->remaincount(),
+                'license_name'      => e($license->license_name),
+                'license_email'     => e($license->license_email),
+                'purchase_date'     => ($license->purchase_date) ? $license->purchase_date : '',
+                'expiration_date'   => ($license->expiration_date) ? $license->expiration_date : '',
+                'purchase_cost'     => ($license->purchase_cost) ? number_format($license->purchase_cost, 2) : '',
+                'purchase_order'    => ($license->purchase_order) ? e($license->purchase_order) : '',
+                'order_number'      => ($license->order_number) ? e($license->order_number) : '',
+                'notes'             => ($license->notes) ? e($license->notes) : '',
+                'actions'           => $actions,
+                'companyName'       => is_null($license->company) ? '' : e($license->company->name),
+                'manufacturer'      => $license->manufacturer ? (string) link_to('/admin/settings/manufacturers/'.$license->manufacturer_id.'/view', $license->manufacturer->name) : ''
+            );
+        }
+
+        $data = array('total' => $licenseCount, 'rows' => $rows);
+
+        return $data;
+    }
+
+    public function getDataAccessoriesView(Manufacturer $manufacturer)
+    {
+        $accessories = $manufacturer->accessories;
+
+        if (Input::has('search')) {
+            $accessories = $accessories->TextSearch(e(Input::get('search')));
+        }
+
+        if (Input::has('limit')) {
+            $limit = e(Input::get('limit'));
+        } else {
+            $limit = 50;
+        }
+
+        $accessCount = $accessories->count();
+
+        $rows = array();
+
+        foreach ($accessories as $accessory) {
+
+            $actions = '<nobr>';
+            if (Gate::allows('accessories.checkout')) {
+                $actions .= '<a href="' . route('checkout/accessory',
+                        $accessory->id) . '" style="margin-right:5px;" class="btn btn-info btn-sm" ' . (($accessory->numRemaining() > 0) ? '' : ' disabled') . '>' . trans('general.checkout') . '</a>';
+            }
+            if (Gate::allows('accessories.edit')) {
+                $actions .= '<a href="' . route('update/accessory',
+                        $accessory->id) . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
+            }
+            if (Gate::allows('accessories.delete')) {
+                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/accessory',
+                        $accessory->id) . '" data-content="' . trans('admin/accessories/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($accessory->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+            }
+            $actions .= '</nobr>';
+            $company = $accessory->company;
+
+            $rows[] = array(
+            'name'          => '<a href="'.url('admin/accessories/'.$accessory->id).'/view">'. $accessory->name.'</a>',
+            'category'      => ($accessory->category) ? (string)link_to('admin/settings/categories/'.$accessory->category->id.'/view', $accessory->category->name) : '',
+            'qty'           => e($accessory->qty),
+            'order_number'  => e($accessory->order_number),
+            'min_amt'  => e($accessory->min_amt),
+            'location'      => ($accessory->location) ? e($accessory->location->name): '',
+            'purchase_date' => e($accessory->purchase_date),
+            'purchase_cost' => number_format($accessory->purchase_cost, 2),
+            'numRemaining'  => $accessory->numRemaining(),
+            'actions'       => $actions,
+            'companyName'   => is_null($company) ? '' : e($company->name),
+            'manufacturer'      => $accessory->manufacturer ? (string) link_to('/admin/settings/manufacturers/'.$accessory->manufacturer_id.'/view', $accessory->manufacturer->name) : ''
+
+            );
+        }
+
+        $data = array('total'=>$accessCount, 'rows'=>$rows);
+
+        return $data;
+    }
+
+    public function getDataConsumablesView($manufacturer)
+    {
+        $consumables = $manufacturer->consumables;
+
+        if (Input::has('search')) {
+            $consumables = $consumables->TextSearch(e(Input::get('search')));
+        }
+
+        if (Input::has('limit')) {
+            $limit = e(Input::get('limit'));
+        } else {
+            $limit = 50;
+        }
+
+        $consumCount = $consumables->count();
+
+        $rows = array();
+
+        foreach ($consumables as $consumable) {
+            $actions = '<nobr>';
+            if (Gate::allows('consumables.checkout')) {
+                $actions .= '<a href="' . route('checkout/consumable',
+                        $consumable->id) . '" style="margin-right:5px;" class="btn btn-info btn-sm" ' . (($consumable->numRemaining() > 0) ? '' : ' disabled') . '>' . trans('general.checkout') . '</a>';
+            }
+
+            if (Gate::allows('consumables.edit')) {
+                $actions .= '<a href="' . route('update/consumable',
+                        $consumable->id) . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
+            }
+            if (Gate::allows('consumables.delete')) {
+                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/consumable',
+                        $consumable->id) . '" data-content="' . trans('admin/consumables/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($consumable->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+            }
+
+            $actions .='</nobr>';
+
+            $company = $consumable->company;
+
+            $rows[] = array(
+                'id'            => $consumable->id,
+                'name'          => (string)link_to('admin/consumables/'.$consumable->id.'/view', e($consumable->name)),
+                'location'      => ($consumable->location) ? e($consumable->location->name) : '',
+                'min_amt'       => e($consumable->min_amt),
+                'qty'           => e($consumable->qty),
+                'manufacturer'  => ($consumable->manufacturer) ? (string) link_to('/admin/settings/manufacturers/'.$consumable->manufacturer_id.'/view', $consumable->manufacturer->name): '',
+                'model_no'      => e($consumable->model_no),
+                'item_no'       => e($consumable->item_no),
+                'category'      => ($consumable->category) ? (string) link_to('/admin/settings/categories/'.$consumable->category_id.'/view', $consumable->category->name) : 'Missing category',
+                'order_number'  => e($consumable->order_number),
+                'purchase_date' => e($consumable->purchase_date),
+                'purchase_cost' => ($consumable->purchase_cost!='') ? number_format($consumable->purchase_cost, 2): '' ,
+                'numRemaining'  => $consumable->numRemaining(),
+                'actions'       => $actions,
+                'companyName'   => is_null($company) ? '' : e($company->name),
+            );
+        }
+
+        $data = array('total' => $consumCount, 'rows' => $rows);
+
+        return $data;
+    }
 }

app/Http/Controllers/ReportsController.php

@@ -1,25 +1,26 @@
 <?php
 namespace App\Http\Controllers;
 
+use App\Helpers\Helper;
 use App\Models\Accessory;
 use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetMaintenance;
-use Carbon\Carbon;
+use App\Models\AssetModel;
 use App\Models\Company;
+use App\Models\CustomField;
+use App\Models\License;
+use App\Models\Location;
+use App\Models\Setting;
+use App\Models\User;
+use Carbon\Carbon;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\View;
 use Input;
 use League\Csv\Reader;
-use App\Models\License;
-use App\Models\Location;
-use App\Models\AssetModel;
-use App\Models\CustomField;
 use Redirect;
-use App\Models\Setting;
-use App\Models\User;
 
 /**
  * This controller handles all actions related to Reports for
@@ -166,7 +167,7 @@ class ReportsController extends Controller
                 $row[] = '';
             }
             $row[] = $asset->purchase_date;
-            $row[] = '"' . number_format($asset->purchase_cost, 2) . '"';
+            $row[] = '"' . Helper::parsePurchasedCost($asset->purchase_cost) . '"';
             if ($asset->order_number) {
                 $row[] = e($asset->order_number);
             } else {
@@ -308,9 +309,9 @@ class ReportsController extends Controller
             }
 
             $row[] = $asset->purchase_date;
-            $row[] = $currency . number_format($asset->purchase_cost, 2);
-            $row[] = $currency . number_format($asset->getDepreciatedValue(), 2);
-            $row[] = $currency . number_format(( $asset->purchase_cost - $asset->getDepreciatedValue() ), 2);
+            $row[] = $currency . Helper::formatCurrencyOutput($asset->purchase_cost);
+            $row[] = $currency . Helper::formatCurrencyOutput($asset->getDepreciatedValue());
+            $row[] = $currency . Helper::formatCurrencyOutput(( $asset->purchase_cost - $asset->getDepreciatedValue() ));
             $csv->insertOne($row);
         }
 
@@ -392,7 +393,7 @@ class ReportsController extends Controller
             $row[] = $license->remaincount();
             $row[] = $license->expiration_date;
             $row[] = $license->purchase_date;
-            $row[] = '"' . number_format($license->purchase_cost, 2) . '"';
+            $row[] = '"' . Helper::formatCurrencyOutput($license->purchase_cost) . '"';
 
             $rows[] = implode($row, ',');
         }
@@ -416,7 +417,7 @@ class ReportsController extends Controller
     public function getCustomReport()
     {
         $customfields = CustomField::get();
-        return View::make('reports/custom')->with('customfields',$customfields);
+        return View::make('reports/custom')->with('customfields', $customfields);
     }
 
     /**
@@ -528,7 +529,7 @@ class ReportsController extends Controller
                 $row[] = e($asset->purchase_date);
             }
             if (e(Input::get('purchase_cost')) == '1' && ( e(Input::get('depreciation')) != '1' )) {
-                $row[] = '"' . number_format($asset->purchase_cost, 2) . '"';
+                $row[] = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
             }
             if (e(Input::get('order')) == '1') {
                 if ($asset->order_number) {
@@ -605,9 +606,9 @@ class ReportsController extends Controller
             }
             if (e(Input::get('depreciation')) == '1') {
                 $depreciation = $asset->getDepreciatedValue();
-                $row[]        = '"' . number_format($asset->purchase_cost, 2) . '"';
-                $row[]        = '"' . number_format($depreciation, 2) . '"';
-                $row[]        = '"' . number_format($asset->purchase_cost - $depreciation, 2) . '"';
+                $row[]        = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
+                $row[]        = '"' . Helper::formatCurrencyOutput($depreciation) . '"';
+                $row[]        = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
             }
 
             foreach ($customfields as $customfield) {
@@ -698,7 +699,7 @@ class ReportsController extends Controller
                 $improvementTime = intval($assetMaintenance->asset_maintenance_time);
             }
             $row[]  = $improvementTime;
-            $row[]  = trans('general.currency') . number_format($assetMaintenance->cost, 2);
+            $row[]  = trans('general.currency') . Helper::formatCurrencyOutput($assetMaintenance->cost);
             $rows[] = implode($row, ',');
         }
 

app/Http/Controllers/StatuslabelsController.php

@@ -120,6 +120,7 @@ class StatuslabelsController extends Controller
         $statuslabel->pending          =  $statustype['pending'];
         $statuslabel->archived          =  $statustype['archived'];
         $statuslabel->color          =  e(Input::get('color'));
+        $statuslabel->show_in_nav          =  e(Input::get('show_in_nav'),0);
 
 
         // Was the asset created?
@@ -208,6 +209,7 @@ class StatuslabelsController extends Controller
         $statuslabel->pending          =  $statustype['pending'];
         $statuslabel->archived          =  $statustype['archived'];
         $statuslabel->color          =  e(Input::get('color'));
+        $statuslabel->show_in_nav          =  e(Input::get('show_in_nav'),0);
 
 
         // Was the asset created?
@@ -258,7 +260,7 @@ class StatuslabelsController extends Controller
 
     public function getDatatable()
     {
-        $statuslabels = Statuslabel::select(array('id','name','deployable','pending','archived','color'))
+        $statuslabels = Statuslabel::select(array('id','name','deployable','pending','archived','color','show_in_nav'))
         ->whereNull('deleted_at');
 
         if (Input::has('search')) {
@@ -314,6 +316,7 @@ class StatuslabelsController extends Controller
                 'type'          => e($label_type),
                 'name'          => e($statuslabel->name),
                 'color'          => $color,
+                'show_in_nav' => ($statuslabel->show_in_nav=='1') ? trans('general.yes') : trans('general.no'),
                 'actions'       => $actions
             );
         }

app/Http/routes.php

@@ -78,7 +78,7 @@ Route::group([ 'prefix' => 'api', 'middleware' => 'auth' ], function () {
     /*---Manufacturers API---*/
     Route::group(array('prefix'=>'manufacturers'), function () {
         Route::get('list', array('as'=>'api.manufacturers.list', 'uses'=>'ManufacturersController@getDatatable'));
-        Route::get('{manufacturerID}/view', array('as'=>'api.manufacturers.view', 'uses'=>'ManufacturersController@getDataView'));
+        Route::get('{manufacturerID}/view/{itemtype}', array('as'=>'api.manufacturers.view', 'uses'=>'ManufacturersController@getDataView'));
     });
 
     /*---Suppliers API---*/

app/Models/Accessory.php

@@ -82,6 +82,11 @@ class Accessory extends Model
         return $this->belongsToMany('\App\Models\User', 'accessories_users', 'accessory_id', 'assigned_to')->count();
     }
 
+    public function manufacturer()
+    {
+        return $this->belongsTo('\App\Models\Manufacturer', 'manufacturer_id');
+    }
+
     public function checkin_email()
     {
         return $this->category->checkin_email;

app/Models/CustomField.php

@@ -11,14 +11,14 @@ class CustomField extends Model
 
     */
     public static $PredefinedFormats=[
-    "ANY" => "",
-    "ALPHA" => "alpha",
-    "EMAIL" => "email",
-    "DATE" => "date",
-    "URL" => "url",
-    "NUMERIC" => "numeric",
-    "MAC" => "regex:/^[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}$/",
-    "IP" => "ip"
+        "ANY" => "",
+        "ALPHA" => "alpha",
+        "EMAIL" => "email",
+        "DATE" => "date",
+        "URL" => "url",
+        "NUMERIC" => "numeric",
+        "MAC" => "regex:/^[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}$/",
+        "IP" => "ip",
     ];
 
     public $rules=[
@@ -109,4 +109,43 @@ class CustomField extends Model
             $this->attributes['format']=$value;
         }
     }
+
+    /**
+     * Format a value string as an array for select boxes and checkboxes.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.4]
+     * @return Array
+     */
+    public function formatFieldValuesAsArray() {
+        $arr = preg_split("/\\r\\n|\\r|\\n/", $this->field_values);
+
+        $result[''] = 'Select '.strtolower($this->format);
+
+        for ($x = 0; $x < count($arr); $x++) {
+            $arr_parts = explode('|', $arr[$x]);
+            if ($arr_parts[0]!='') {
+                if (key_exists('1',$arr_parts)) {
+                    $result[$arr_parts[0]] = $arr_parts[1];
+                } else {
+                    $result[$arr_parts[0]] = $arr_parts[0];
+                }
+            }
+
+        }
+
+
+        return $result;
+    }
+
+    public function isFieldDecryptable($string) {
+        if (($this->field_encrypted=='1') && ($string!='')) {
+            return true;
+        }
+        return false;
+    }
+
+
+
+
 }

app/Models/CustomFieldset.php

@@ -2,6 +2,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Gate;
 
 class CustomFieldset extends Model
 {
@@ -30,16 +31,21 @@ class CustomFieldset extends Model
     {
         $rules=[];
         foreach ($this->fields as $field) {
-            $rule=[];
-            if ($field->pivot->required) {
-                $rule[]="required";
+            $rule = [];
+
+            if (($field->field_encrypted!='1') ||
+                  (($field->field_encrypted =='1')  && (Gate::allows('admin')) ))
+                  {
+
+                if ($field->pivot->required) {
+                    $rule[]="required";
+                }
             }
+
             array_push($rule, $field->attributes['format']);
             $rules[$field->db_column_name()]=$rule;
         }
         return $rules;
     }
 
-  //requiredness goes *here*
-  //sequence goes here?
 }

app/Models/Ldap.php

@@ -247,8 +247,12 @@ class Ldap extends Model
 
         // Perform the search
         do {
+
             // Paginate (non-critical, if not supported by server)
-            ldap_control_paged_result($ldapconn, $page_size, false, $cookie);
+            if (!$ldap_paging = @ldap_control_paged_result($ldapconn, $page_size, false, $cookie)) {
+                throw new Exception('Problem with your LDAP connection. Try checking the Use TLS setting in Admin > Settings. ');
+            }
+
 
             $search_results = ldap_search($ldapconn, $base_dn, '('.$filter.')');
 

app/Models/License.php

@@ -36,6 +36,11 @@ class License extends Depreciable
         return $this->belongsTo('\App\Models\Company', 'company_id');
     }
 
+    public function manufacturer()
+    {
+        return $this->belongsTo('\App\Models\Manufacturer', 'manufacturer_id');
+    }
+
     /**
      * Get the assigned user
      */

app/Models/Manufacturer.php

@@ -46,6 +46,21 @@ class Manufacturer extends Model
         return $this->hasManyThrough('\App\Models\Asset', '\App\Models\AssetModel', 'manufacturer_id', 'model_id');
     }
 
+    public function licenses()
+    {
+        return $this->hasMany('\App\Models\License', 'manufacturer_id');
+    }
+
+    public function accessories()
+    {
+        return $this->hasMany('\App\Models\Accessory', 'manufacturer_id');
+    }
+
+    public function consumables()
+    {
+        return $this->hasMany('\App\Models\Consumable', 'manufacturer_id');
+    }
+
     /**
     * Query builder scope to search on text
     *

config/version.php

@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v3.3.0',
-  'hash_version' => 'v3.3.0-3-g7ef4f23',
+  'app_version' => 'v3.4.0-alpha',
+  'hash_version' => 'v3.4.0-alpha-49-g122f0b9',
 );

database/migrations/2016_08_09_002225_add_manufacturer_to_licenses.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddManufacturerToLicenses extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('licenses', function (Blueprint $table) {
+            //
+            $table->integer('manufacturer_id')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('licenses', function (Blueprint $table) {
+            //
+        });
+    }
+}

database/migrations/2016_08_12_121613_add_manufacturer_to_accessories_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddManufacturerToAccessoriesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('accessories', function (Blueprint $table) {
+            //
+            $table->integer('manufacturer_id')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('accessories', function (Blueprint $table) {
+            //
+            $table->dropColumn('manufacturer_id');
+        });
+    }
+}

database/migrations/2016_08_23_143353_add_new_fields_to_custom_fields.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddNewFieldsToCustomFields extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('custom_fields', function (Blueprint $table) {
+            //
+            $table->string('field_values')->nullable()->default(null);
+            $table->boolean('field_encrypted')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('custom_fields', function (Blueprint $table) {
+            //
+            $table->dropColumn('field_values', 'field_encrypted');
+        });
+    }
+}

database/migrations/2016_08_23_145619_add_show_in_nav_to_status_labels.php

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

docker/001-default-ssl.conf

@@ -50,7 +50,7 @@
 		#   when the CA certificates are directly appended to the server
 		#   certificate for convinience.
 		#SSLCertificateChainFile /etc/apache2/ssl.crt/server-ca.crt
-		SSLCertificateChainFile /var/lib/snipeit/ssl/snipeit-ssl.crt
+		SSLCertificateChainFile /etc/ssl/private/snipeit-ssl.crt
 
 		#   Certificate Authority (CA):
 		#   Set the CA certificate verification path where to find CA

docker/docker.env

@@ -18,6 +18,7 @@ DB_DATABASE=${MYSQL_DATABASE}
 DB_USERNAME=${MYSQL_USER}
 DB_PASSWORD=${MYSQL_PASSWORD}
 DB_PREFIX=null
+DB_DUMP_PATH='/usr/bin'
 
 
 # --------------------------------------------

resources/lang/ar/admin/custom_fields/general.php

@@ -5,11 +5,16 @@ return array(
     'field'		                => 'حقل',
     'about_fieldsets_title'		=> 'حول مجموعة الحقول',
     'about_fieldsets_text'		=> 'مجموعات-الحقول تسمح لك بإنشاء مجموعات من الحقول اللتي يمكن إعادة إستخدامها مع أنواع موديل محدد.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
     'fieldset'      	        => 'مجموعة-حقول',
     'qty_fields'      	      => 'الحقول الكمية',
     'fieldsets'      	        => 'مجموعات-الحقول',
     'fieldset_name'           => 'إسم مجموعة-الحقل',
     'field_name'              => 'إسم الحقل',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
     'field_element'           => 'عنصر النموذج',
     'field_element_short'     => 'عنصر',
     'field_format'            => 'صيغة',

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

@@ -37,9 +37,9 @@ return array(
     ),
 
     'import' => array(
-        'error'         => 'Some Items did not import Correctly.',
-        'errorDetail'   => 'The Following Items were not imported because of errors.',
-        'success'       => "Your File has been imported",
+        'error'         => 'Some items did not import correctly.',
+        'errorDetail'   => 'The following Items were not imported because of errors.',
+        'success'       => "Your file has been imported",
     ),
 
 
@@ -52,7 +52,8 @@ return array(
     'checkout' => array(
         'error'   		=> 'Asset was not checked out, please try again',
         'success' 		=> 'Asset checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'not_available' => 'That asset is not available for checkout!'
     ),
 
     'checkin' => array(

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

@@ -51,6 +51,8 @@ return array(
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',

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

@@ -4,11 +4,13 @@ return array(
     'about'      	=> 'About Status Labels',
     'archived'      	=> 'Archived',
     'create'      	=> 'Create Status Label',
+    'color'      	=> 'Chart Color',
     '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',
+    'show_in_nav'   => 'Show in side nav',
     'title'      	=> 'Status Labels',
     'undeployable'  => 'Undeployable',
     'update'      	=> 'Update Status Label',

resources/lang/ar/general.php

@@ -76,6 +76,7 @@
     'image_delete'         	=> 'حذف الصورة',
     'image_upload'         	=> 'رفع صورة',
     'import'         	    => 'Import',
+    'import-history'        => 'Import History',
     'asset_maintenance'        => 'Asset Maintenance',
     'asset_maintenance_report' => 'Asset Maintenance Report',
     'asset_maintenances'       => 'Asset Maintenances',

resources/lang/bg/admin/custom_fields/general.php

@@ -5,11 +5,16 @@ return array(
     'field'		                => 'Поле',
     'about_fieldsets_title'		=> 'About Fieldsets',
     'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
     'fieldset'      	        => 'Fieldset',
     'qty_fields'      	      => 'Qty Fields',
     'fieldsets'      	        => 'Fieldsets',
     'fieldset_name'           => 'Fieldset Name',
     'field_name'              => 'Field Name',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
     'field_element'           => 'Form Element',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',

resources/lang/bg/admin/hardware/message.php

@@ -36,9 +36,9 @@ return array(
     ),
 
     'import' => array(
-        'error'         => 'Some Items did not import Correctly.',
-        'errorDetail'   => 'The Following Items were not imported because of errors.',
-        'success'       => "Your File has been imported",
+        'error'         => 'Some items did not import correctly.',
+        'errorDetail'   => 'The following Items were not imported because of errors.',
+        'success'       => "Your file has been imported",
     ),
 
 
@@ -51,7 +51,8 @@ return array(
     'checkout' => array(
         'error'   		=> 'Активът не беше изписан. Моля опитайте отново.',
         'success' 		=> 'Активът изписан успешно.',
-        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
+        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.',
+        'not_available' => 'That asset is not available for checkout!'
     ),
 
     'checkin' => array(

resources/lang/bg/admin/settings/general.php

@@ -51,6 +51,8 @@ return array(
     'ldap_pword'                => 'LDAP парола на потребител за връзка',
     'ldap_basedn'               => 'Базов DN',
     'ldap_filter'               => 'LDAP филтър',
+    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Поле за потребителско име',
     'ldap_lname_field'          => 'Фамилия',
     'ldap_fname_field'          => 'LDAP собствено име',

resources/lang/bg/admin/statuslabels/table.php

@@ -4,11 +4,13 @@ return array(
     'about'      	=> 'Относно статус етикетите',
     'archived'      	=> 'Архивирани',
     'create'      	=> 'Създаване на статус етикет',
+    'color'      	=> 'Chart Color',
     'deployable'      	=> 'Може да бъде предоставен',
     'info'      	=> 'Статусите се използват за описване на различните състояния на Вашите активи. Например, това са Предаден за ремонт, Изгубен/откраднат и др. Можете да създавате нови статуси за активите, които могат да бъдат предоставяни, очакващи набавяне и архивирани.',
     'name'      	=> 'Статус',
     'pending'      	=> 'Изчакване',
     'status_type'   => 'Тип на статуса',
+    'show_in_nav'   => 'Show in side nav',
     'title'      	=> 'Заглавия на статуси',
     'undeployable'  => 'Не може да бъде предоставян',
     'update'      	=> 'Обновяване на статус',

resources/lang/bg/general.php

@@ -76,6 +76,7 @@
     'image_delete'         	=> 'Изтриване на изображението',
     'image_upload'         	=> 'Качване на изображение',
     'import'         	    => 'Зареждане',
+    'import-history'        => 'Import History',
     'asset_maintenance'        => 'Поддръжка на активи',
     'asset_maintenance_report' => 'Справка за поддръжка на активи',
     'asset_maintenances'       => 'Поддръжки на активи',

resources/lang/cs/admin/custom_fields/general.php

@@ -5,11 +5,16 @@ return array(
     'field'		                => 'Pole',
     'about_fieldsets_title'		=> 'O sadách polí',
     'about_fieldsets_text'		=> 'Sady polí Vám umožňují vytvořit si vlastní hodnoty, které chcete evidovat u modelů majetku.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
     'fieldset'      	        => 'Sada',
     'qty_fields'      	      => 'Počet',
     'fieldsets'      	        => 'Sady',
     'fieldset_name'           => 'Název sady',
     'field_name'              => 'Název pole',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
     'field_element'           => 'Typ pole',
     'field_element_short'     => 'Typ',
     'field_format'            => 'Formát',

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

@@ -37,9 +37,9 @@ return array(
     ),
 
     'import' => array(
-        'error'         => 'Některé položky se nepodařilo správně nahrát.',
-        'errorDetail'   => 'Pro chyby se nepodařilo nahrát následující položky.',
-        'success'       => "Váš soubor byl v pořádku nahrán",
+        'error'         => 'Some items did not import correctly.',
+        'errorDetail'   => 'The following Items were not imported because of errors.',
+        'success'       => "Your file has been imported",
     ),
 
 
@@ -52,7 +52,8 @@ return array(
     'checkout' => array(
         'error'   		=> 'Majetek nebyl předán, zkuste to prosím znovu',
         'success' 		=> 'Majetek byl v pořádku předán.',
-        'user_does_not_exist' => 'Tento uživatel je neplatný. Zkuste to prosím znovu.'
+        'user_does_not_exist' => 'Tento uživatel je neplatný. Zkuste to prosím znovu.',
+        'not_available' => 'That asset is not available for checkout!'
     ),
 
     'checkin' => array(

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

@@ -51,6 +51,8 @@ return array(
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',

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

@@ -4,11 +4,13 @@ return array(
     'about'      	=> 'O označení stavu',
     'archived'      	=> 'Archivováno',
     'create'      	=> 'Vytvořit označení stavu',
+    'color'      	=> 'Chart Color',
     'deployable'      	=> 'Připraveno k nasazení',
     'info'      	=> 'Označení stavu se používá k popisu různých stavů majetku. Můžou být v opravě, ztracení atd. Lze vytvořit nové stavy pro další možné stavy.',
     'name'      	=> 'Název stavu',
     'pending'      	=> 'Probíhající',
     'status_type'   => 'Typ stavu',
+    'show_in_nav'   => 'Show in side nav',
     'title'      	=> 'Označení stavu',
     'undeployable'  => 'Nemožné připravit',
     'update'      	=> 'Upravit označení stavu',

resources/lang/cs/general.php

@@ -76,6 +76,7 @@
     'image_delete'         	=> 'Smazat obrázek',
     'image_upload'         	=> 'Nahrát obrázek',
     'import'         	    => 'Import',
+    'import-history'        => 'Import History',
     'asset_maintenance'        => 'Údržba zařízení',
     'asset_maintenance_report' => 'Zpráva o údržbě zařízení',
     'asset_maintenances'       => 'Záznamy o údržbě zařízení',

resources/lang/da/admin/accessories/general.php

@@ -6,11 +6,11 @@ return array(
     'accessory_category' 				=> 'Tilbehør Kategori',
     'accessory_name'  					=> 'Tilbehør Navn',
     'cost'					=> 'Indkøbspris',
-    'checkout'  							=> 'Checkout Accessory',
-    'checkin'  							=> 'Checkin Accessory',
+    'checkout'  							=> 'Tjek tilbehør ud',
+    'checkin'  							=> 'Tjek tilbehør ind',
     'create'  							=> 'Opret tilbehør',
     'date'					=> 'Købsdato',
-    'edit'  							=> 'Edit Accessory',
+    'edit'  							=> 'Rediger tilbehør',
     'eula_text'							=> 'Slutbrugerlicenskategori',
     'eula_text_help'					=> 'Dette felt tillader dig at tilpasse din slutbrugerlicens til specifikke typer af tilbehør. Hvis du kun har en slutbrugerlicens for alle dine tilbehør, kan du afkrydse boksen nedenfor for at bruge den primære standardlicens.',
     'require_acceptance'				=> 'Kræver brugere at bekræfte accept af tilbehør i denne kategori.',

resources/lang/da/admin/accessories/message.php

@@ -2,23 +2,23 @@
 
 return array(
 
-    'does_not_exist' => 'The accessory does not exist.',
+    'does_not_exist' => 'Tilbehøret findes ikke.',
     'assoc_users'	 => 'Dette tilbehør har pt. :count emner tjekket ud til brugere. Tjek tilbehør ind og prøv igen.',
 
     'create' => array(
-        'error'   => 'The accessory was not created, please try again.',
-        'success' => 'The accessory was successfully created.'
+        'error'   => 'Tilbehøret blev ikke oprettet, prøv venligst igen.',
+        'success' => 'Tilbehøret blev oprettet.'
     ),
 
     'update' => array(
-        'error'   => 'The accessory was not updated, please try again',
-        'success' => 'The accessory was updated successfully.'
+        'error'   => 'Tilbehøret blev ikke opdateret, prøv venligst igen',
+        'success' => 'Tilbehøret blev opdateret med success.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
-        'error'   => 'There was an issue deleting the accessory. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'confirm'   => 'Er du sikker på du vil slette dette tilbehør?',
+        'error'   => 'Der opstod et problem under sletning af tilbehøret. Prøv venligst igen.',
+        'success' => 'Tilbehøret blev slettet med success.'
     ),
 
      'checkout' => array(

resources/lang/da/admin/asset_maintenances/message.php

@@ -1,17 +1,17 @@
 <?php
 
     return [
-        'not_found'                    => 'Asset Maintenance you were looking for was not found!',
+        'not_found'                    => 'Aktivets vedligeholdelse blev ikke fundet!',
         'delete'                       => [
-            'confirm' => 'Are you sure you wish to delete this asset maintenance?',
-            'error'   => 'There was an issue deleting the asset maintenance. Please try again.',
-            'success' => 'The asset maintenance was deleted successfully.'
+            'confirm' => 'Er du sikker på du vil slette dette aktivs vedligeholdelse?',
+            'error'   => 'Der opstod et problem under sletning af aktivets vedligeholdelse. Prøv venligst igen.',
+            'success' => 'Aktivets vedligeholdelse blev slettet med succes.'
         ],
         'create'                       => [
-            'error'   => 'Asset Maintenance was not created, please try again.',
-            'success' => 'Asset Maintenance created successfully.'
+            'error'   => 'Aktivets vedligeholdelse blev ikke oprettet, prøv venligst igen.',
+            'success' => 'Aktivets vedligeholdelse blev oprettet med succes.'
         ],
-        'asset_maintenance_incomplete' => 'Not Completed Yet',
-        'warranty'                     => 'Warranty',
-        'not_warranty'                 => 'Not Warranty',
+        'asset_maintenance_incomplete' => 'Ikke afsluttet endnu',
+        'warranty'                     => 'Garanti',
+        'not_warranty'                 => 'Ingen garanti',
     ];

resources/lang/da/admin/categories/general.php

@@ -5,7 +5,7 @@ return array(
     'about_categories'  				=> 'Aktiver kategorier hjælper dig med at organisere dine aktiver. Eksempler på kategorier kunne være "Stationære coputere", "Bærbare", "Mobiltelefoner", "Tabletter" osv., men du kan bruge aktiver kategorier på en hvilken som helst måde som giver mening for dig.',
     'asset_categories' 					=> 'Aktiver Kategorier',
     'category_name'  					=> 'Kategorinavn',
-    'checkin_email'                     => 'Send email to user on checkin.',
+    'checkin_email'                     => 'Send email til bruger ved tjek ind.',
     'clone'                             => 'Klon Kategori',
     'create'  							=> 'Opret kategori',
     'edit'                              => 'Rediger Kategori',

resources/lang/da/admin/categories/message.php

@@ -3,8 +3,8 @@
 return array(
 
     'does_not_exist' => 'Kategorien eksisterer ikke.',
-    'assoc_models'	 => '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. ',
-    'assoc_items'	 => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type  to no longer reference this category and try again. ',
+    'assoc_models'	 => 'Denne kategori er i øjeblikket associeret med mindst en model og kan ikke slettes. Opdater venligst dine modeller, så de ikke længere refererer til denne kategori og prøv igen. ',
+    'assoc_items'	 => 'Denne kategori er i øjeblikket associeret med mindst en :asset_type og kan ikke slettes. Opdater venligst din :asset_type, så de ikke længere refererer til denne kategori og prøv igen. ',
 
     'create' => array(
         'error'   => 'Kategorien blev ikke oprettet, prøv igen.',

resources/lang/da/admin/custom_fields/general.php

@@ -5,11 +5,16 @@ return array(
     'field'		                => 'Field',
     'about_fieldsets_title'		=> 'About Fieldsets',
     'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
     'fieldset'      	        => 'Fieldset',
     'qty_fields'      	      => 'Qty Fields',
     'fieldsets'      	        => 'Fieldsets',
     'fieldset_name'           => 'Fieldset Name',
     'field_name'              => 'Field Name',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
     'field_element'           => 'Form Element',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',

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

@@ -1,9 +1,9 @@
 <?php
 
 return array(
-	'bulk_delete'		=> 'Confrm Bulk Delete Assets',
-  'bulk_delete_help'	=> 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.',
-  'bulk_delete_warn'	=> 'You are about to delete :asset_count assets.',
+	'bulk_delete'		=> 'Bekræft massesletning af aktiver',
+  'bulk_delete_help'	=> 'Gennemgå aktiver for massesletning nedenfor. Disse aktiver kan gendannes når slettet, men de vil ikke længere være forbundet med eventuelle brugere, de i øjeblikket er tildelt.',
+  'bulk_delete_warn'	=> 'Du er i gang med at slette :asset_count aktiver.',
 	'bulk_update'		=> 'Masseopdater Aktiver',
 	'bulk_update_help'	=> 'Denne form tillader dig at opdatere flere aktiver på en gang. Udfyld kun de felter der skal ændres. Ikke udfyldte feltet forbilver uændret.',
 	'bulk_update_warn'	=> 'Du er i færd med at redigere egenskaber på :asset_count aktiver.',
@@ -19,10 +19,10 @@ return array(
     'default_location'	=> 'Standardplacering',
     'eol_date'			=> 'EOL Dato',
     'eol_rate'			=> 'EOL Rate',
-    'expected_checkin'  => 'Expected Checkin Date',
+    'expected_checkin'  => 'Forventet indtjekningsdato',
     'expires'			=> 'Udløber',
     'fully_depreciated'	=> 'Fuldt Afskrevet',
-    'help_checkout'		=> 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ',
+    'help_checkout'		=> 'Vælg "Klar til implementering" fra listen ovenfor, hvis du ønsker at tildele dette aktiv med det samme. ',
     'mac_address'		=> 'MAC-adresse',
     'manufacturer'		=> 'Producent',
     'model'				=> 'Model',

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

@@ -37,9 +37,9 @@ return array(
     ),
 
     'import' => array(
-        'error'         => 'Some Items did not import Correctly.',
-        'errorDetail'   => 'The Following Items were not imported because of errors.',
-        'success'       => "Your File has been imported",
+        'error'         => 'Some items did not import correctly.',
+        'errorDetail'   => 'The following Items were not imported because of errors.',
+        'success'       => "Your file has been imported",
     ),
 
 
@@ -52,7 +52,8 @@ return array(
     'checkout' => array(
         'error'   		=> 'Asset was not checked out, please try again',
         'success' 		=> 'Asset checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'not_available' => 'That asset is not available for checkout!'
     ),
 
     'checkin' => array(

resources/lang/da/admin/models/table.php

@@ -11,7 +11,7 @@ return array(
     'title'					=> 'Asset Models',
     'update'				=> 'Update Asset Model',
     'view'					=> 'View Asset Model',
-    'update'				=> 'Update Asset Model',
+    'update'				=> 'Update Model',
     'clone'				=> 'Clone Model',
     'edit'				=> 'Edit Model',
 );

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

@@ -51,6 +51,8 @@ return array(
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',

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

@@ -4,11 +4,13 @@ return array(
     'about'      	=> 'Om status labels',
     'archived'      	=> 'Archived',
     'create'      	=> 'Opret status label',
+    'color'      	=> 'Chart Color',
     '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',
+    'show_in_nav'   => 'Show in side nav',
     'title'      	=> 'Status labels',
     'undeployable'  => 'Undeployable',
     'update'      	=> 'Opdater status label',

resources/lang/da/button.php

@@ -5,7 +5,7 @@ return array(
     'actions' 	                => 'Handlinger',
     'add'    	                => 'Tilføj Ny',
     'cancel'                    => 'Annuller',
-    'checkin_and_delete'  	    => 'Checkin & Delete User',
+    'checkin_and_delete'  	    => 'Tjek ind og slet bruger',
     'delete'  	                => 'Slet',
     'edit'    	                => 'Rediger',
     'restore' 	                => 'Gendan',

resources/lang/da/general.php

@@ -2,11 +2,11 @@
 
     return [
     'accessories'			=> 'Tilbehør',
-    'activated'			=> 'Activated',
+    'activated'			=> 'Aktiveret',
     'accessory'				=> 'Tilbehør',
-    'accessory_report'			=> 'Accessory Report',
-    'action'                => 'Action',
-    'activity_report'		=> 'Activity Report',
+    'accessory_report'			=> 'Tilbehørsrapport',
+    'action'                => 'Handling',
+    'activity_report'		=> 'Aktivitetsrapport',
     'address'				=> 'Addresse',
     'admin'					=> 'Admin',
     'add_seats'     => 'Added seats',
@@ -22,21 +22,21 @@
     'avatar_delete'         => 'Slet avatar',
     'avatar_upload'         => 'Upload Avatar',
     'back'      			=> 'Tilbage',
-    'bad_data'      		=> 'Nothing found. Maybe bad data?',
-    'bulk_checkout'  		=> 'Bulk Checkout',
+    'bad_data'      		=> 'Intet fundet. Måske dårlig data?',
+    'bulk_checkout'  		=> 'Masseudtjekning',
     'cancel'  				=> 'Annuller',
-    'categories'			=> 'Categories',
-    'category'				=> 'Category',
+    'categories'			=> 'Kategorier',
+    'category'				=> 'Kategori',
     'changeemail'  			=> 'Skift email adresse',
     'changepassword'  		=> 'Skift adgangskode',
     'checkin'  				=> 'Tjek Ind',
-    'checkin_from'  		=> 'Checkin from',
+    'checkin_from'  		=> 'Tjek ind fra',
     'checkout'  			=> 'Tjek Ud',
     'city'  				=> 'By',
-    'companies'			=> 'Companies',
-    'company'				=> 'Company',
-    'component'			=> 'Component',
-    'components'			=> 'Components',
+    'companies'			=> 'Selskaber',
+    'company'				=> 'Selskab',
+    'component'			=> 'Komponent',
+    'components'			=> 'Komponenter',
     'consumable'			=> 'Consumable',
     'consumables'			=> 'Consumables',
     'country'  				=> 'Land',
@@ -57,73 +57,74 @@
     'depreciation'			=> 'Afskrivning',
     'editprofile'  			=> 'Ret Din Profil',
     'eol'					=> 'EOL',
-    'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Email Format',
-    'email_domain_help'		=> 'This is used to generate email addresses when importing',
-    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
-    'first'					=> 'First',
+    'email_domain'			=> 'Email domæne',
+    'email_format'			=> 'Email formattering',
+    'email_domain_help'		=> 'Dette bruges til at generere email-adresser ved importering',
+    'filastname_format'			=> 'Fornavnskarakter Efternavn (jsmith@example.com)',
+    'firstname_lastname_format'	=> 'Fornavn Efternavn (jane.smith@example.com)',
+    'first'					=> 'Første',
     'first_name'			=> 'Fornavn',
-    'first_name_format'		=> 'First Name (jane@example.com)',
+    'first_name_format'		=> 'Fornavn (jane@example.com)',
     'file_name'				=> 'Fil',
     'file_uploads'			=> 'Filoverførsel',
     'generate'				=> 'Skab',
     'groups'				=> 'Grupper',
     'gravatar_email'        => 'Gravatar email addresse',
-    'history'  			    => 'History',
+    'history'  			    => 'Historik',
     'history_for'  			=> 'Historie for',
     'id'  					=> 'ID',
     'image_delete'         	=> 'Slet billede',
     'image_upload'         	=> 'Upload billede',
-    'import'         	    => 'Import',
-    'asset_maintenance'        => 'Asset Maintenance',
-    'asset_maintenance_report' => 'Asset Maintenance Report',
-    'asset_maintenances'       => 'Asset Maintenances',
-    'item'  				=> 'Item',
-    'insufficient_permissions' => 'Insufficient permissions!',
-    'language'				=> 'Language',
-    'last'					=> 'Last',
+    'import'         	    => 'Importér',
+    'import-history'        => 'Import History',
+    'asset_maintenance'        => 'Vedligeholdelse af aktiv',
+    'asset_maintenance_report' => 'Aktiv vedligeholdelsesrapport',
+    'asset_maintenances'       => 'Vedligeholdelse af aktiv',
+    'item'  				=> 'Emne',
+    'insufficient_permissions' => 'Ingen rettigheder!',
+    'language'				=> 'Sprog',
+    'last'					=> 'Sidste',
     'last_name'             => 'Efternavn',
     'license'				=> 'Licens',
     'license_report'        => 'Licensrapport',
     'licenses_available'	=> 'Tilgængelige licenser',
     'licenses'				=> 'Licenser',
     'list_all'				=> 'Vis alle',
-    'loading'				=> 'Loading',
+    'loading'				=> 'Indlæser',
     'lock_passwords'        => 'This field cannot be edited in this installation.',
     'feature_disabled'      => 'This feature has been disabled for this installation.',
     'location'              => 'Lokation',
     'locations'				=> 'Lokationer',
     'logout'				=> 'Log ud',
-    'lookup_by_tag'     => 'Lookup by Asset Tag',
+    'lookup_by_tag'     => 'Søg på aktivkode',
     'manufacturer'			=> 'Producent',
     'manufacturers'			=> 'Producenter',
-    'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
-    'min_amt'				=> 'Min. QTY',
+    'markdown'				=> 'Dette felt tillader <a href="https://help.github.com/articles/github-flavored-markdown/">Github koder</a>.',
+    'min_amt'				=> 'Min. antal',
     'min_amt_help'	=> 'Minimum number of items that should be available before an alert gets triggered.',
     'model_no'				=> 'Modelnummer',
     'months'				=> 'måneder',
     'moreinfo'				=> 'Mere Info',
     'name'					=> 'Navn',
-    'next'					=> 'Next',
-    'new'					=> 'new!',
+    'next'					=> 'Næste',
+    'new'					=> 'ny!',
     'no_depreciation'		=> 'Ingen Afskrivning',
     'no_results'			=> 'Ingen Resultater.',
     'no'  					=> 'Nej',
     'notes'  				=> 'Noter',
-    'page_menu'				=> 'Showing _MENU_ items',
-    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
+    'page_menu'				=> 'Viser _MENU_ emner',
+    'pagination_info'		=> 'Viser _START_ til _END_ af _TOTAL_ emner',
     'pending'				=> 'Afventer',
     'people'				=> 'Personer',
     'per_page'				=> 'Resultater Per Side',
-    'previous'				=> 'Previous',
-    'processing'			=> 'Processing',
+    'previous'				=> 'Forrige',
+    'processing'			=> 'Behandler',
     'profile'				=> 'Din profil',
-    'qty'		            => 'QTY',
-    'quantity'		        => 'Quantity',
+    'qty'		            => 'STK',
+    'quantity'		        => 'Antal',
     'ready_to_deploy'		=> 'Klar til Implementering',
-    'recent_activity'		=> 'Recent Activity',
-    'remove_company'        => 'Remove Company Association',
+    'recent_activity'		=> 'Seneste aktivitet',
+    'remove_company'        => 'Fjern association med selskab',
     'reports'				=> 'Rapporter',
     'requested'				=> 'Requested',
     'save'  				=> 'Gem',

resources/lang/da/passwords.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'sent'	        => 'Your password link has been sent!',
-    'user'			=> 'That user does not exist or does not have an email address associated',
+    'sent'	        => 'Dit adgangskode link er blevet sendt!',
+    'user'			=> 'Brugeren findes ikke eller har ikke nogen email-adresse tilknyttet',
 ];
 

resources/lang/da/reminders.php

@@ -17,7 +17,7 @@ return array(
 
     "user"     => "Brugernavn eller email adresse er forkert",
 
-    "token"    => "This password reset token is invalid.",
+    "token"    => "Denne adgangskode nulstillingstoken er ugyldig.",
 
     "sent" => "Hvis en tilsvarende email adresse blev fundet, er der afsendt en påmindelse om adgangskode!",
 

resources/lang/da/table.php

@@ -5,6 +5,6 @@ return array(
     'actions'	 	=> 'Handlinger',
     'action' 		=> 'Handling',
     'by'      		=> 'Af',
-    'item' 			=> 'Item',
+    'item' 			=> 'Emne',
 
 );

resources/lang/da/validation.php

@@ -32,11 +32,11 @@ return array(
     "digits"           => ":attribute skal være :digits cifre.",
     "digits_between"   => ":attribute skal være imellem :min og :max cifre.",
     "email"            => ":attribute formatet er ugylidgt.",
-    "exists"           => "The selected :attribute is invalid.",
-    "email_array"      => "One or more email addresses is invalid.",
+    "exists"           => "Den valgte :attribute er ugyldig.",
+    "email_array"      => "En eller flere email-adresser er ugyldige.",
     "image"            => ":attribute skal være et billede.",
     "in"               => "Det valgte :attribute er ugyldigt.",
-    "integer"          => "The :attribute must be an integer.",
+    "integer"          => ":attribute skal være et heltal.",
     "ip"               => ":attribute skal være en gyldig IP adresse.",
     "max"              => array(
         "numeric" => ":attribute må ikke overstige :max.",
@@ -49,8 +49,8 @@ return array(
         "file"    => ":attribute skal mindst være :min kilobytes.",
         "string"  => ":attribute skal mindst være :min tegn.",
     ),
-    "not_in"           => "The selected :attribute is invalid.",
-    "numeric"          => "The :attribute must be a number.",
+    "not_in"           => "Den valgte :attribute er ugyldig.",
+    "numeric"          => ":attribute skal være et tal.",
     "regex"            => ":attribute formatet er ugyldigt.",
     "required"         => ":attribute feltet er krævet.",
     "required_if"      => ":attribute feltet er krævet når :other er :value.",
@@ -62,10 +62,10 @@ return array(
         "file"    => ":attribute skal være :size kilobytes.",
         "string"  => ":attribute skal være :size tegn.",
     ),
-    "unique"           => "The :attribute has already been taken.",
+    "unique"           => ":attribute er allerede taget.",
     "url"              => ":attribute formatet er ugyldigt.",
-    "statuslabel_type" => "You must select a valid status label type",
-    "unique_undeleted" => "The :attribute must be unique.",
+    "statuslabel_type" => "Du skal vælge en gyldig statusmærke type",
+    "unique_undeleted" => ":attribute skal være unik.",
 
 
     /*
@@ -80,7 +80,7 @@ return array(
     */
 
     'custom' => array(),
-    'alpha_space' => "The :attribute field contains a character that is not allowed.",
+    'alpha_space' => ":attribute feltet indeholder en karakter der ikke er tilladt.",
 
     /*
     |--------------------------------------------------------------------------

resources/lang/de/admin/custom_fields/general.php

@@ -5,11 +5,16 @@ return array(
     'field'		                => 'Feld',
     'about_fieldsets_title'		=> 'Über Feldsätze',
     'about_fieldsets_text'		=> 'Feldsätze erlauben es Gruppen aus benutzerdefinierten Feldern zu erstellen, welche regelmäßig für spezifische Modelltypen benutzt werden.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
     'fieldset'      	        => 'Feldsatz',
     'qty_fields'      	      => 'Anzahl Felder',
     'fieldsets'      	        => 'Feldsätze',
     'fieldset_name'           => 'Feldsatzname',
     'field_name'              => 'Feldname',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
     'field_element'           => 'Formularelement',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',

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

@@ -3,7 +3,7 @@
 return array(
 	'archived'  				=> 'Archiviert',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Checkout Assets to User',
+    'bulk_checkout'             => 'Assets an Benutzer herausgeben',
     'checkin'  					=> 'Asset zurücknehmen',
     'checkout'  				=> 'Asset an Benutzer herausgeben',
     'clone'  					=> 'Asset duplizieren',

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

@@ -37,9 +37,9 @@ return array(
     ),
 
     'import' => array(
-        'error'         => 'Einige Elemente wurden nicht korrekt importiert.',
-        'errorDetail'   => 'Die Folgenden Elemente wurden aufgrund von Fehlern nicht importiert.',
-        'success'       => "Ihre Datei wurde importiert",
+        'error'         => 'Some items did not import correctly.',
+        'errorDetail'   => 'The following Items were not imported because of errors.',
+        'success'       => "Your file has been imported",
     ),
 
 
@@ -52,7 +52,8 @@ return array(
     'checkout' => array(
         'error'   		=> 'Asset konnte nicht herausgegeben werden. Bitte versuchen Sie es erneut',
         'success' 		=> 'Asset wurde erfolgreich herausgegeben.',
-        'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.'
+        'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.',
+        'not_available' => 'That asset is not available for checkout!'
     ),
 
     'checkin' => array(

resources/lang/de/admin/models/table.php

@@ -11,7 +11,7 @@ return array(
     'title'					=> 'Asset Modelle',
     'update'				=> 'Asset Modell aktualisieren',
     'view'					=> 'Asset Modell ansehen',
-    'update'				=> 'Asset Modell aktualisieren',
+    'update'				=> 'Modell aktualisieren',
     'clone'				=> 'Modell duplizieren',
     'edit'				=> 'Modell bearbeiten',
 );

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

@@ -2,9 +2,9 @@
 
 return array(
     'ad'				        => 'Active Directory',
-    'ad_domain'				    => 'Active Directory domain',
-    'ad_domain_help'			=> 'This is sometimes the same as your email domain, but not always.',
-    'is_ad'				        => 'This is an Active Directory server',
+    'ad_domain'				    => 'Active Directory Domäne',
+    'ad_domain_help'			=> 'Meistens dieselbe wie die E-Mail Domäne.',
+    'is_ad'				        => 'Dies ist ein Active Directory Server',
 	'alert_email'				=> 'Alarme senden an',
 	'alerts_enabled'			=> 'Alarme aktiviert',
 	'alert_interval'			=> 'Ablauf Alarmschwelle (in Tagen)',
@@ -41,16 +41,18 @@ return array(
     'ldap_integration'          => 'LDAP Integration',
     'ldap_settings'             => 'LDAP Einstellungen',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'Sollte mit ldap:// (für unencrypted oder TLS) oder ldaps:// (für SSL) starten',
 	'ldap_server_cert'			=> 'LDAP SSL Zertifikatsüberprüfung',
 	'ldap_server_cert_ignore'	=> 'Erlaube ungültige SSL Zertifikate',
 	'ldap_server_cert_help'		=> 'Wählen Sie diese Option, wenn Sie selbstsignierte SSL Zertifikate verwenden und diese gegebenenfalls ungültigen Zertifikate akzeptieren möchten.',
-    'ldap_tls'                  => 'Use TLS',
-    'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
+    'ldap_tls'                  => 'TLS verwenden',
+    'ldap_tls_help'             => 'Sollte nur wenn STARTTLS am LDAP Server verwendet wird, aktiviert sein. ',
     'ldap_uname'                => 'LDAP Bind Nutzername',
     'ldap_pword'                => 'LDAP Bind Passwort',
     'ldap_basedn'               => 'Basis Bind DN',
     'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Benutzername',
     'ldap_lname_field'          => 'Familienname',
     'ldap_fname_field'          => 'LDAP Vorname',
@@ -108,5 +110,5 @@ return array(
     'bottom'        => 'Unten',
     'vertical'        => 'Vertikal',
     'horizontal'        => 'Horizontal',
-    'zerofill_count'        => 'Length of asset tags, including zerofill',
+    'zerofill_count'        => 'Länge der Asset Tags, inklusive zerofill',
 );

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

@@ -4,11 +4,13 @@ return array(
     'about'      	=> 'Info Statusbezeichnung',
     'archived'      	=> 'Archiviert',
     'create'      	=> 'Statusbezeichnung erstellen',
+    'color'      	=> 'Chart Color',
     'deployable'      	=> 'Einsetzbar',
     'info'      	=> 'Status Label werden eingesetzt um diverse Stati Ihrer Assets zu beschreiben. Diese können zB. in Reparatur sein, Gestohlen oder Verlohren worden sein. Sie können neue Status Labels für Einsetzbare, Unerledigte und Archivierte Assets erstellen.',
     'name'      	=> 'Statusname',
     'pending'      	=> 'Unerledigt',
     'status_type'   => 'Statustyp',
+    'show_in_nav'   => 'Show in side nav',
     'title'      	=> 'Statusbezeichnungen',
     'undeployable'  => 'nicht Einsetzbar',
     'update'      	=> 'Statusbezeichnung bearbeiten',

resources/lang/de/general.php

@@ -23,7 +23,7 @@
     'avatar_upload'         => 'Avatar hochladen',
     'back'      			=> 'Zurück',
     'bad_data'      		=> 'Nichts gefunden. Vielleicht defekte Daten?',
-    'bulk_checkout'  		=> 'Bulk Checkout',
+    'bulk_checkout'  		=> 'Massen-Checkout',
     'cancel'  				=> 'Abbrechen',
     'categories'			=> 'Kategorien',
     'category'				=> 'Kategorie',
@@ -76,6 +76,7 @@
     'image_delete'         	=> 'Bild löschen',
     'image_upload'         	=> 'Bild hinzufügen',
     'import'         	    => 'Import',
+    'import-history'        => 'Import History',
     'asset_maintenance'        => 'Asset Wartung',
     'asset_maintenance_report' => 'Asset Wartungsbericht',
     'asset_maintenances'       => 'Asset Wartungen',
@@ -106,7 +107,7 @@
     'moreinfo'				=> 'Mehr Informationen',
     'name'					=> 'Location Name',
     'next'					=> 'Nächstes',
-    'new'					=> 'new!',
+    'new'					=> 'Neu!',
     'no_depreciation'		=> 'Do Not Depreciate',
     'no_results'			=> 'Keine Treffer.',
     'no'  					=> 'Nein',
@@ -142,7 +143,7 @@
     'select_asset'    		=> 'Asset auswählen',
     'settings'				=> 'Einstellungen',
     'sign_in'				=> 'Einloggen',
-    'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
+    'some_features_disabled' => 'Einige Funktionen sind für den DEMO-Modus deaktiviert.',
     'site_name'				=> 'Seitenname',
     'state'  				=> 'Zustand',
     'status_labels'			=> 'Statusbezeichnungen',

resources/lang/de/validation.php

@@ -64,8 +64,8 @@ return array(
     ),
     "unique"           => ":attribute schon benutzt.",
     "url"              => ":attribute Format ist ungültig.",
-    "statuslabel_type" => "You must select a valid status label type",
-    "unique_undeleted" => "The :attribute must be unique.",
+    "statuslabel_type" => "Gültigen Status Beschriftungstyp auswählen!",
+    "unique_undeleted" => ":attribute muss eindeutig sein.",
 
 
     /*

resources/lang/el/admin/custom_fields/general.php

@@ -5,11 +5,16 @@ return array(
     'field'		                => 'Field',
     'about_fieldsets_title'		=> 'About Fieldsets',
     'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
     'fieldset'      	        => 'Fieldset',
     'qty_fields'      	      => 'Qty Fields',
     'fieldsets'      	        => 'Fieldsets',
     'fieldset_name'           => 'Fieldset Name',
     'field_name'              => 'Field Name',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
     'field_element'           => 'Form Element',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',

resources/lang/el/admin/hardware/message.php

@@ -37,9 +37,9 @@ return array(
     ),
 
     'import' => array(
-        'error'         => 'Some Items did not import Correctly.',
-        'errorDetail'   => 'The Following Items were not imported because of errors.',
-        'success'       => "Your File has been imported",
+        'error'         => 'Some items did not import correctly.',
+        'errorDetail'   => 'The following Items were not imported because of errors.',
+        'success'       => "Your file has been imported",
     ),
 
 
@@ -52,7 +52,8 @@ return array(
     'checkout' => array(
         'error'   		=> 'Asset was not checked out, please try again',
         'success' 		=> 'Asset checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'not_available' => 'That asset is not available for checkout!'
     ),
 
     'checkin' => array(

resources/lang/el/admin/models/table.php

@@ -11,7 +11,7 @@ return array(
     'title'					=> 'Asset Models',
     'update'				=> 'Update Asset Model',
     'view'					=> 'View Asset Model',
-    'update'				=> 'Update Asset Model',
+    'update'				=> 'Update Model',
     'clone'				=> 'Clone Model',
     'edit'				=> 'Edit Model',
 );

resources/lang/el/admin/settings/general.php

@@ -51,6 +51,8 @@ return array(
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',

resources/lang/el/admin/statuslabels/table.php

@@ -4,11 +4,13 @@ return array(
     'about'      	=> 'About Status Labels',
     'archived'      	=> 'Archived',
     'create'      	=> 'Create Status Label',
+    'color'      	=> 'Chart Color',
     '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',
+    'show_in_nav'   => 'Show in side nav',
     'title'      	=> 'Status Labels',
     'undeployable'  => 'Undeployable',
     'update'      	=> 'Update Status Label',

resources/lang/el/general.php

@@ -76,6 +76,7 @@
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
     'import'         	    => 'Import',
+    'import-history'        => 'Import History',
     'asset_maintenance'        => 'Asset Maintenance',
     'asset_maintenance_report' => 'Asset Maintenance Report',
     'asset_maintenances'       => 'Asset Maintenances',

resources/lang/en-GB/admin/custom_fields/general.php

@@ -5,11 +5,16 @@ return array(
     'field'		                => 'Field',
     'about_fieldsets_title'		=> 'About Fieldsets',
     'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
     'fieldset'      	        => 'Fieldset',
     'qty_fields'      	      => 'Qty Fields',
     'fieldsets'      	        => 'Fieldsets',
     'fieldset_name'           => 'Fieldset Name',
     'field_name'              => 'Field Name',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
     'field_element'           => 'Form Element',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',

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

@@ -52,7 +52,8 @@ return array(
     'checkout' => array(
         'error'   		=> 'Asset was not checked out, please try again',
         'success' 		=> 'Asset checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'not_available' => 'That asset is not available for checkout!'
     ),
 
     'checkin' => array(

resources/lang/en-GB/admin/models/table.php

@@ -11,7 +11,7 @@ return array(
     'title'					=> 'Asset Models',
     'update'				=> 'Update Asset Model',
     'view'					=> 'View Asset Model',
-    'update'				=> 'Update Asset Model',
+    'update'				=> 'Update Model',
     'clone'				=> 'Clone Model',
     'edit'				=> 'Edit Model',
 );

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

@@ -51,6 +51,8 @@ return array(
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',

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

@@ -4,11 +4,13 @@ return array(
     'about'      	=> 'About Status Labels',
     'archived'      	=> 'Archived',
     'create'      	=> 'Create Status Label',
+    'color'      	=> 'Chart Color',
     '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',
+    'show_in_nav'   => 'Show in side nav',
     'title'      	=> 'Status Labels',
     'undeployable'  => 'Undeployable',
     'update'      	=> 'Update Status Label',

resources/lang/en-GB/general.php

@@ -76,6 +76,7 @@
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
     'import'         	    => 'Import',
+    'import-history'        => 'Import History',
     'asset_maintenance'        => 'Asset Maintenance',
     'asset_maintenance_report' => 'Asset Maintenance Report',
     'asset_maintenances'       => 'Asset Maintenances',

resources/lang/en-ID/admin/custom_fields/general.php

@@ -5,11 +5,16 @@ return array(
     'field'		                => 'Field',
     'about_fieldsets_title'		=> 'About Fieldsets',
     'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
     'fieldset'      	        => 'Fieldset',
     'qty_fields'      	      => 'Qty Fields',
     'fieldsets'      	        => 'Fieldsets',
     'fieldset_name'           => 'Fieldset Name',
     'field_name'              => 'Field Name',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
     'field_element'           => 'Form Element',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',

resources/lang/en-ID/admin/hardware/message.php

@@ -37,9 +37,9 @@ return array(
     ),
 
     'import' => array(
-        'error'         => 'Some Items did not import Correctly.',
-        'errorDetail'   => 'The Following Items were not imported because of errors.',
-        'success'       => "Your File has been imported",
+        'error'         => 'Some items did not import correctly.',
+        'errorDetail'   => 'The following Items were not imported because of errors.',
+        'success'       => "Your file has been imported",
     ),
 
 
@@ -52,7 +52,8 @@ return array(
     'checkout' => array(
         'error'   		=> 'Asset was not checked out, please try again',
         'success' 		=> 'Asset checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'not_available' => 'That asset is not available for checkout!'
     ),
 
     'checkin' => array(

resources/lang/en-ID/admin/settings/general.php

@@ -51,6 +51,8 @@ return array(
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',

resources/lang/en-ID/admin/statuslabels/table.php

@@ -4,11 +4,13 @@ return array(
     'about'      	=> 'About Status Labels',
     'archived'      	=> 'Archived',
     'create'      	=> 'Create Status Label',
+    'color'      	=> 'Chart Color',
     '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',
+    'show_in_nav'   => 'Show in side nav',
     'title'      	=> 'Status Labels',
     'undeployable'  => 'Undeployable',
     'update'      	=> 'Update Status Label',

resources/lang/en-ID/general.php

@@ -76,6 +76,7 @@
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
     'import'         	    => 'Import',
+    'import-history'        => 'Import History',
     'asset_maintenance'        => 'Asset Maintenance',
     'asset_maintenance_report' => 'Asset Maintenance Report',
     'asset_maintenances'       => 'Asset Maintenances',

resources/lang/en/admin/custom_fields/general.php

@@ -5,11 +5,17 @@ return array(
     'field'		                => 'Field',
     'about_fieldsets_title'		=> 'About Fieldsets',
     'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database for each asset. The decrypted value of this field will only be viewable by admins.',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'encrypted'      	        => 'Encrypted',
     'fieldset'      	        => 'Fieldset',
     'qty_fields'      	      => 'Qty Fields',
     'fieldsets'      	        => 'Fieldsets',
     'fieldset_name'           => 'Fieldset Name',
     'field_name'              => 'Field Name',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored. Separate values and labels by pipes on each line (optional).',
     'field_element'           => 'Form Element',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
@@ -20,4 +26,5 @@ return array(
     'order'   		            => 'Order',
     'create_fieldset'         => 'New Fieldset',
     'create_field'            => 'New Custom Field',
+    'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
 );

resources/lang/en/admin/statuslabels/table.php

@@ -10,6 +10,7 @@ return array(
     'name'      	=> 'Status Name',
     'pending'      	=> 'Pending',
     'status_type'   => 'Status Type',
+    'show_in_nav'   => 'Show in side nav',
     'title'      	=> 'Status Labels',
     'undeployable'  => 'Undeployable',
     'update'      	=> 'Update Status Label',

resources/lang/es-CO/admin/custom_fields/general.php

@@ -5,11 +5,16 @@ return array(
     'field'		                => 'Field',
     'about_fieldsets_title'		=> 'About Fieldsets',
     'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
     'fieldset'      	        => 'Fieldset',
     'qty_fields'      	      => 'Qty Fields',
     'fieldsets'      	        => 'Fieldsets',
     'fieldset_name'           => 'Fieldset Name',
     'field_name'              => 'Field Name',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
     'field_element'           => 'Form Element',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',

resources/lang/es-CO/admin/hardware/message.php

@@ -37,9 +37,9 @@ return array(
     ),
 
     'import' => array(
-        'error'         => 'Some Items did not import Correctly.',
-        'errorDetail'   => 'The Following Items were not imported because of errors.',
-        'success'       => "Your File has been imported",
+        'error'         => 'Some items did not import correctly.',
+        'errorDetail'   => 'The following Items were not imported because of errors.',
+        'success'       => "Your file has been imported",
     ),
 
 
@@ -52,7 +52,8 @@ return array(
     'checkout' => array(
         'error'   		=> 'Asset was not checked out, please try again',
         'success' 		=> 'Asset checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'not_available' => 'That asset is not available for checkout!'
     ),
 
     'checkin' => array(

resources/lang/es-CO/admin/settings/general.php

@@ -51,6 +51,8 @@ return array(
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',

resources/lang/es-CO/admin/statuslabels/table.php

@@ -4,11 +4,13 @@ return array(
     'about'      	=> 'About Status Labels',
     'archived'      	=> 'Archived',
     'create'      	=> 'Create Status Label',
+    'color'      	=> 'Chart Color',
     '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',
+    'show_in_nav'   => 'Show in side nav',
     'title'      	=> 'Status Labels',
     'undeployable'  => 'Undeployable',
     'update'      	=> 'Update Status Label',

resources/lang/es-CO/general.php

@@ -76,6 +76,7 @@
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
     'import'         	    => 'Import',
+    'import-history'        => 'Import History',
     'asset_maintenance'        => 'Asset Maintenance',
     'asset_maintenance_report' => 'Asset Maintenance Report',
     'asset_maintenances'       => 'Asset Maintenances',

resources/lang/es-ES/admin/consumables/general.php

@@ -7,7 +7,7 @@ return array(
     'cost'				=> 'Precio de compra',
     'create'                             => 'Crear Consumible',
     'date'					=> 'Fecha de compra',
-    'item_no'               => 'Item No.',
+    'item_no'               => 'Artículo núm.',
     'order'					=> 'Orden de compra',
     'remaining' 			             => 'Restante',
     'total' 			                 => 'Total',

resources/lang/es-ES/admin/custom_fields/general.php

@@ -5,11 +5,16 @@ return array(
     'field'		                => 'Campo',
     'about_fieldsets_title'		=> 'Acerca de los campos personalizados',
     'about_fieldsets_text'		=> 'Los grupos de campos personalizados te permiten agrupar campos que se usan frecuentemente para determinados modelos de equipos.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
     'fieldset'      	        => 'Grupo de campos personalizados',
     'qty_fields'      	      => 'Campos de Cantidad',
     'fieldsets'      	        => 'Grupo de campos personalizados',
     'fieldset_name'           => 'Nombre del grupo',
     'field_name'              => 'Nombre del campo',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
     'field_element'           => 'Elemento de formulario',
     'field_element_short'     => 'Elemento',
     'field_format'            => 'Formato',

resources/lang/es-ES/admin/hardware/general.php

@@ -3,7 +3,7 @@
 return array(
 	'archived'  				=> 'Archivado',
     'asset'  					=> 'Equipo',
-    'bulk_checkout'             => 'Checkout Assets to User',
+    'bulk_checkout'             => 'Asignar activos a un usuario',
     'checkin'  					=> 'Quitar Equipo',
     'checkout'  				=> 'Asignar a un usuario',
     'clone'  					=> 'Clonar Equipo',

resources/lang/es-ES/admin/hardware/message.php

@@ -37,9 +37,9 @@ return array(
     ),
 
     'import' => array(
-        'error'         => 'Some Items did not import Correctly.',
-        'errorDetail'   => 'The Following Items were not imported because of errors.',
-        'success'       => "Your File has been imported",
+        'error'         => 'Some items did not import correctly.',
+        'errorDetail'   => 'The following Items were not imported because of errors.',
+        'success'       => "Your file has been imported",
     ),
 
 
@@ -52,14 +52,15 @@ return array(
     'checkout' => array(
         'error'   		=> 'Equipo no asignado, intentalo de nuevo',
         'success' 		=> 'Equipo asignado.',
-        'user_does_not_exist' => 'Este usuario no es correcto. Intentalo de nuevo.'
+        'user_does_not_exist' => 'Este usuario no es correcto. Intentalo de nuevo.',
+        'not_available' => 'That asset is not available for checkout!'
     ),
 
     'checkin' => array(
         'error'   		=> 'No se ha quitado el equipo. Intentalo de nuevo.',
         'success' 		=> 'Equipo quitado correctamente.',
         'user_does_not_exist' => 'Este usuario no es correcto. Intentalo de nuevo.',
-        'already_checked_in'  => 'That asset is already checked in.',
+        'already_checked_in'  => 'Ese activo ya se quito.',
 
     ),
 

resources/lang/es-ES/admin/licenses/form.php

@@ -9,7 +9,7 @@ return array(
     'date'              => 'Fecha Compra',
     'depreciation'      => 'Amortización',
     'expiration'        => 'Fecha de vencimiento',
-    'license_key'       => 'Product Key',
+    'license_key'       => 'Clave de producto',
     'maintained'        => 'Mantenido',
     'name'              => 'Aplicación',
     'no_depreciation'   => 'No Amortizar',

resources/lang/es-ES/admin/settings/general.php

@@ -1,13 +1,13 @@
 <?php
 
 return array(
-    'ad'				        => 'Active Directory',
-    'ad_domain'				    => 'Active Directory domain',
-    'ad_domain_help'			=> 'This is sometimes the same as your email domain, but not always.',
-    'is_ad'				        => 'This is an Active Directory server',
+    'ad'				        => 'Directorio Activo',
+    'ad_domain'				    => 'Dominio del Directorio Activo',
+    'ad_domain_help'			=> 'Esto es a veces el mismo que su correo electrónico de dominio, pero no siempre.',
+    'is_ad'				        => 'Este es un servidor de Directorio Activo',
 	'alert_email'				=> 'Enviar alertas a',
 	'alerts_enabled'			=> 'Alertas habilitadas',
-	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
+	'alert_interval'			=> 'Limite de alertas de expiración (en días)',
 	'alert_inv_threshold'		=> 'Umbral de alerta del inventario',
 	'asset_ids'					=> 'IDs de Recurso',
 	'auto_increment_assets'		=> 'Generar IDs de equipo autoincrementales',
@@ -26,10 +26,10 @@ return array(
     'display_asset_name'        => 'Mostrar Nombre Equipo',
     'display_checkout_date'     => 'Mostrar Fecha de Salida',
     'display_eol'               => 'Mostrar EOL',
-    'display_qr'                => 'Display Square Codes',
-	'display_alt_barcode'		=> 'Display 1D barcode',
-	'barcode_type'				=> '2D Barcode Type',
-	'alt_barcode_type'			=> '1D barcode type',
+    'display_qr'                => 'Mostrar Códigos QR',
+	'display_alt_barcode'		=> 'Mostrar códigos de barras en 1D',
+	'barcode_type'				=> 'Tipo de códigos de barras 2D',
+	'alt_barcode_type'			=> 'Tipo de códigos de barras 1D',
     'eula_settings'				=> 'Configuración EULA',
     'eula_markdown'				=> 'Este EULS permite <a href="https://help.github.com/articles/github-flavored-markdown/">makrdown estilo Github</a>.',
     'general_settings'			=> 'Configuración General',
@@ -41,16 +41,18 @@ return array(
     'ldap_integration'          => 'Integración LDAP',
     'ldap_settings'             => 'Ajustes LDAP',
     'ldap_server'               => 'Servidor LDAP',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'Esto debería empezar con ldap:// (sin codificar o TLS) o ldaps:// (para SSL)',
 	'ldap_server_cert'			=> 'Certificado de validación SSL LDAP',
 	'ldap_server_cert_ignore'	=> 'Permitir certificados SSL inválidos',
 	'ldap_server_cert_help'		=> 'Selecciona este campo si estás usando un certificado SSL auto firmado y quieres aceptar un certificado SSL inválido.',
-    'ldap_tls'                  => 'Use TLS',
-    'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
+    'ldap_tls'                  => 'Usar TLS',
+    'ldap_tls_help'             => 'Esto se debe seleccionar si se está ejecutando STARTTLS en el servidor LDAP. ',
     'ldap_uname'                => 'Enlazar usuario LDAP',
     'ldap_pword'                => 'Enlazar contraseña LDAP',
     'ldap_basedn'               => 'Enlazar base DN',
     'ldap_filter'               => 'Filtro LDAP',
+    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Campo de usuario',
     'ldap_lname_field'          => 'Apellido',
     'ldap_fname_field'          => 'Nombre LDAP',
@@ -89,24 +91,24 @@ return array(
     'labels_per_page'           => 'Etiquetas por pàgina',
     'label_dimensions'          => 'Dimensiones de las etiquetas (pulgadas)',
     'page_padding'             => 'Margenès de pàgina (pulgadas)',
-    'purge'                    => 'Purge Deleted Records',
+    'purge'                    => 'Purgar registros eliminados',
     'labels_display_bgutter'    => 'Label bottom gutter',
     'labels_display_sgutter'    => 'Label side gutter',
-    'labels_fontsize'           => 'Label font size',
-    'labels_pagewidth'          => 'Label sheet width',
-    'labels_pageheight'         => 'Label sheet height',
-    'label_gutters'        => 'Label spacing (inches)',
-    'page_dimensions'        => 'Page dimensions (inches)',
-    'label_fields'          => 'Label visible fields',
-    'inches'        => 'inches',
+    'labels_fontsize'           => 'Tamaño de fuente de la etiqueta',
+    'labels_pagewidth'          => 'Ancho de la hoja de etiqueta',
+    'labels_pageheight'         => 'Altura de la hoja de etiqueta',
+    'label_gutters'        => 'Espaciamiento de etiqueta (pulgadas)',
+    'page_dimensions'        => 'Dimensiones de la página (pulgadas)',
+    'label_fields'          => 'Campos visibles de la etiqueta',
+    'inches'        => 'pulgadas',
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
-    'left'        => 'left',
-    'right'        => 'right',
-    'top'        => 'top',
-    'bottom'        => 'bottom',
+    'left'        => 'izquierda',
+    'right'        => 'derecha',
+    'top'        => 'arriba',
+    'bottom'        => 'fondo',
     'vertical'        => 'vertical',
     'horizontal'        => 'horizontal',
-    'zerofill_count'        => 'Length of asset tags, including zerofill',
+    'zerofill_count'        => 'Longitud de etiquetas de activos, incluyendo relleno de ceros',
 );

resources/lang/es-ES/admin/settings/message.php

@@ -14,7 +14,7 @@ return array(
         'file_not_found'        => 'El archivo de respaldo no se ha encontrado en el servidor.',
     ),
     'purge' => array(
-        'error'     => 'An error has occurred while purging. ',
+        'error'     => 'Ha ocurrido un error mientras se realizaba el purgado. ',
         'validation_failed'     => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "Borrar" en el cuadro de confirmación.',
         'success'               => 'Registros eliminados correctamente purgados.'
     ),

resources/lang/es-ES/admin/statuslabels/message.php

@@ -2,24 +2,24 @@
 
 return array(
 
-    'does_not_exist' => 'Status Label does not exist.',
-    'assoc_assets'	 => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',
+    'does_not_exist' => 'Etiqueta de estado no existe.',
+    'assoc_assets'	 => 'Esta etiqueta de estado esta actualmente asociado con al menos un activo y no se puede eliminar. Por favor actualice sus activos para ya no hacer referencia a este estado y vuelva a intentarlo. ',
 
 
     'create' => array(
-        'error'   => 'Status Label was not created, please try again.',
-        'success' => 'Status Label created successfully.'
+        'error'   => 'Etiqueta de estado no fue creada, por favor, inténtelo de nuevo.',
+        'success' => 'Etiqueta de estado fue creada exitosamente.'
     ),
 
     'update' => array(
-        'error'   => 'Status Label was not updated, please try again',
-        'success' => 'Status Label updated successfully.'
+        'error'   => 'Etiqueta de estado no se ha actualizado, por favor, inténtelo de nuevo',
+        'success' => 'Etiqueta de estado fue actualizada exitosamente.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this Status Label?',
-        'error'   => 'There was an issue deleting the Status Label. Please try again.',
-        'success' => 'The Status Label was deleted successfully.'
+        'confirm'   => '¿Está seguro que desea eliminar esta etiqueta de estado?',
+        'error'   => 'Hubo un problema borrando la etiqueta de estado. Por favor, inténtelo de nuevo.',
+        'success' => 'La etiqueta de estado se ha eliminado exitosamente.'
     )
 
 );