Expenses

android/app/build.gradle.dev

@@ -50,5 +50,3 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation 'com.google.firebase:firebase-core:16.0.5'
 }
-
-apply plugin: 'com.google.gms.google-services'

lib/data/models/expense_model.dart

@@ -326,6 +326,8 @@ abstract class ExpenseEntity extends Object
     }
   }
 
+  double get convertedAmount => round(amount * exchangeRate, 2);
+
   double get convertedAmountWithTax => round(amountWithTax * exchangeRate, 2);
 
   bool get isInvoiced => invoiceId != null && invoiceId > 0;

lib/redux/expense/expense_selectors.dart

@@ -8,7 +8,7 @@ InvoiceItemEntity convertExpenseToInvoiceItem({ExpenseEntity expense}) {
     ..expenseId = expense.id
     ..notes = expense.publicNotes
     ..qty = 1
-    ..cost = expense.amount
+    ..cost = expense.convertedAmount
     ..taxName1 = expense.taxName1
     ..taxRate1 = expense.taxRate1
     ..taxName2 = expense.taxName2