tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix display of expense exchange rates

Browse source
This commit is contained in:
Hillel Coren 2016-07-27 13:54:00 +03:00
parent 05a92fea8d
commit d44213bce9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Models/Expense.php
View file

@ -142,7 +142,7 @@ class Expense extends EntityModel
*/
public function isExchanged()
{
return $this->invoice_currency_id != $this->expense_currency_id;
return $this->invoice_currency_id != $this->expense_currency_id || $this->exchange_rate != 1;
}
/**

2
resources/views/expenses/edit.blade.php
View file

@ -353,7 +353,7 @@
self.amount = ko.observable();
self.exchange_rate = ko.observable(1);
self.should_be_invoiced = ko.observable();
self.convert_currency = ko.observable(false);
self.convert_currency = ko.observable({{ ($expense && $expense->isExchanged()) ? 'true' : 'false' }});
self.apply_taxes = ko.observable({{ ($expense && ($expense->tax_name1 || $expense->tax_name2)) ? 'true' : 'false' }});
self.mapping = {