DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 23:54:12 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source 
# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2018-01-25 11:07:18 -08:00
parent 0e980f7229 facf1d42f7
commit 0b788f64f7
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Models/Asset.php
View file

@ -231,7 +231,7 @@ class Asset extends Depreciable
*/ */
public function get_depreciation() public function get_depreciation()
{ {
if ($this->model) { if (($this->model) && ($this->model->depreciation)) {
return $this->model->depreciation; return $this->model->depreciation;
} }
} }

8
config/version.php
View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v4.1.11-pre', 'app_version' => 'v4.1.11-pre',
'full_app_version' => 'v4.1.11-pre - build 3288-g426bf38', 'full_app_version' => 'v4.1.11-pre - build 3299-g3acf5f7',
'build_version' => '3288', 'build_version' => '3299',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'g426bf38', 'hash_version' => 'g3acf5f7',
'full_hash' => 'v4.1.11-pre-36-g426bf38', 'full_hash' => 'v4.1.11-pre-47-g3acf5f7',
'branch' => 'master', 'branch' => 'master',
); );

2
resources/views/reports/depreciation.blade.php
View file

@ -74,7 +74,7 @@
@endif @endif
</td> </td>
<td> <td>
@if ($asset->checkedOutToUser()) @if (($asset->checkedOutToUser()) && ($asset->assigned))
{{ $asset->assigned->getFullNameAttribute() }} {{ $asset->assigned->getFullNameAttribute() }}
@else @else