diff --git a/addons/hr_expense/models/hr_expense.py b/addons/hr_expense/models/hr_expense.py
index 7407182375b..5ef8984c873 100644
--- a/addons/hr_expense/models/hr_expense.py
+++ b/addons/hr_expense/models/hr_expense.py
@@ -555,6 +555,7 @@ Or send your receipts at <a href="mailto:%(email)s?subject=Lunch%%20with%%20cust
                 if tax['tax_repartition_line_id']:
                     rep_ln = self.env['account.tax.repartition.line'].browse(tax['tax_repartition_line_id'])
                     base_amount = self.env['account.move']._get_base_amount_to_display(tax['base'], rep_ln)
+                    base_amount = expense.currency_id._convert(base_amount, company_currency, expense.company_id, account_date)
                 else:
                     base_amount = None
 
diff --git a/addons/hr_expense/tests/test_expenses.py b/addons/hr_expense/tests/test_expenses.py
index 77f8250271e..8a249df1efe 100644
--- a/addons/hr_expense/tests/test_expenses.py
+++ b/addons/hr_expense/tests/test_expenses.py
@@ -194,6 +194,75 @@ class TestExpenses(TestExpenseCommon):
             },
         ])
 
+    def test_account_entry_multi_currency(self):
+        """ Checking accounting move entries and analytic entries when submitting expense. With
+            multi-currency. And taxes. """
+
+        # Clean-up the rates
+        self.cr.execute("UPDATE res_company SET currency_id = %s WHERE id = %s", [self.env.ref('base.USD').id, self.env.company.id])
+        self.env['res.currency.rate'].search([]).unlink()
+        self.env['res.currency.rate'].create({
+            'currency_id': self.env.ref('base.EUR').id,
+            'company_id': self.env.company.id,
+            'rate': 2.0,
+            'name': '2010-01-01',
+        })
+
+        expense = self.env['hr.expense.sheet'].create({
+            'name': 'Expense for Dick Tracy',
+            'employee_id': self.expense_employee.id,
+        })
+        tax = self.env['account.tax'].create({
+            'name': 'Expense 10%',
+            'amount': 10,
+            'amount_type': 'percent',
+            'type_tax_use': 'purchase',
+            'price_include': True,
+        })
+        self.env['hr.expense'].create({
+            'name': 'Choucroute Saucisse',
+            'employee_id': self.expense_employee.id,
+            'product_id': self.product_a.id,
+            'unit_amount': 700.00,
+            'tax_ids': [(6, 0, tax.ids)],
+            'sheet_id': expense.id,
+            'analytic_account_id': self.analytic_account_1.id,
+            'currency_id': self.env.ref('base.EUR').id,
+        })
+
+        # State should default to draft
+        self.assertEqual(expense.state, 'draft', 'Expense should be created in Draft state')
+        # Submitted to Manager
+        expense.action_submit_sheet()
+        self.assertEqual(expense.state, 'submit', 'Expense is not in Reported state')
+        # Approve
+        expense.approve_expense_sheets()
+        self.assertEqual(expense.state, 'approve', 'Expense is not in Approved state')
+        # Create Expense Entries
+        expense.action_sheet_move_create()
+        self.assertEqual(expense.state, 'post', 'Expense is not in Waiting Payment state')
+        self.assertTrue(expense.account_move_id.id, 'Expense Journal Entry is not created')
+
+        # Should get this result [(0.0, 350.0, -700.0), (318.18, 0.0, 636.36), (31.82, 0.0, 63.64)]
+        for line in expense.account_move_id.line_ids:
+            if line.credit:
+                self.assertAlmostEqual(line.credit, 350.0)
+                self.assertAlmostEqual(line.amount_currency, -700.0)
+                self.assertEqual(len(line.analytic_line_ids), 0, "The credit move line should not have analytic lines")
+                self.assertFalse(line.product_id, "Product of credit move line should be false")
+            else:
+                if not line.tax_line_id == tax:
+                    self.assertAlmostEqual(line.debit, 318.18)
+                    self.assertAlmostEqual(line.amount_currency, 636.36)
+                    self.assertEqual(len(line.analytic_line_ids), 1, "The debit move line should have 1 analytic lines")
+                    self.assertEqual(line.product_id, self.product_a, "Product of debit move line should be the one from the expense")
+                else:
+                    self.assertEqual(line.tax_base_amount, 318.18)
+                    self.assertAlmostEqual(line.debit, 31.82)
+                    self.assertAlmostEqual(line.amount_currency, 63.64)
+                    self.assertEqual(len(line.analytic_line_ids), 0, "The tax move line should not have analytic lines")
+                    self.assertFalse(line.product_id, "Product of tax move line should be false")
+
     def test_expenses_with_tax_and_lockdate(self):
         ''' Test creating a journal entry for multiple expenses using taxes. A lock date is set in order to trigger
         the recomputation of the taxes base amount.