From 94e8b5f783c3b03c062c0d82d3d166d770ec8e6f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 17 Aug 2015 11:14:01 -0700
Subject: [PATCH] Fixed bug in expected checkin

---
 app/config/version.php                    | 2 +-
 app/views/backend/hardware/view.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/config/version.php b/app/config/version.php
index 94ed77063174..1acefc57cf00 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
   'app_version' => 'v2.0-pre',
-  'hash_version' => 'v2.0-pre-beta2-2-g7dd50ed',
+  'hash_version' => 'v2.0-pre-beta2-4-gaae7d45',
 );
\ No newline at end of file
diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php
index a6961bd32549..e48c8110d230 100755
--- a/app/views/backend/hardware/view.blade.php
+++ b/app/views/backend/hardware/view.blade.php
@@ -435,7 +435,7 @@
                         @endif
                     <ul>
 
-                    	 @if (($asset->assetstatus->deployable=='1') && ($asset->assigned_to > 0) && ($asset->deleted_at==''))
+                    	 @if (($asset->assetstatus->deployable=='1') && ($asset->assigned_to > 0) && ($asset->deleted_at=='') && ($asset->assetlog->first()))
                     	 	@if ($asset->assetlog->first()->expected_checkin)
                                 <li><br />@lang('admin/hardware/form.expected_checkin')
                                     : {{{ date('Y-m-d', strtotime($asset->assetlog->first()->expected_checkin)) }}}</li>