From 5a687f280f213920b667bdc960a209388e7cb053 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 4 Nov 2015 00:15:35 -0800
Subject: [PATCH] One more currency tweak

---
 app/config/version.php                     | 4 ++--
 app/controllers/admin/AssetsController.php | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/config/version.php b/app/config/version.php
index ec9e68e369..66c402b63f 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v2.0-386',
-  'hash_version' => 'v2.0-386-g6e117ef',
+  'app_version' => 'v2.0-387',
+  'hash_version' => 'v2.0-387-g1ac41a7',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index 1dd64bffae..8301e8a8ed 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -585,11 +585,14 @@ class AssetsController extends AdminController
         } elseif ($asset->assetloc) {
             $use_currency = $asset->assetloc->currency;
         } else {
-          if ($settings->default_currency!='') {
-           $use_currency = Setting::first()->default_currency;
+          $default_currency = Setting::first()->default_currency;
+
+          if ($default_currency!='') {
+            $use_currency = $default_currency;
           } else {
             $use_currency = Lang::get('general.currency');
           }
+          
         }
 
         if (isset($asset->id)) {