Merge branches 'develop' and 'develop' of github.com:hillelcoren/invoice-ninja into develop

This commit is contained in:
Hillel Coren 2016-03-27 21:10:10 +03:00
commit 8cabcb2640

View File

@ -95,7 +95,7 @@ class Expense extends EntityModel
{
$array = parent::toArray();
if(empty($this->visible) || in_array('converted_amount', $this->visible))$array['previewconverted_amount_url'] = $this->convertedAmount();
if(empty($this->visible) || in_array('converted_amount', $this->visible))$array['converted_amount'] = $this->convertedAmount();
return $array;
}