diff options
| -rw-r--r-- | addons/pos_sale/models/pos_order.py | 2 | ||||
| -rw-r--r-- | addons/sale/models/sale.py | 2 | ||||
| -rw-r--r-- | addons/sale_timesheet/tests/test_reporting.py | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/addons/pos_sale/models/pos_order.py b/addons/pos_sale/models/pos_order.py index 03d31171c26..afd3e8fb0ae 100644 --- a/addons/pos_sale/models/pos_order.py +++ b/addons/pos_sale/models/pos_order.py @@ -13,4 +13,4 @@ class PosOrder(models.Model): def _compute_currency_rate(self): for order in self: date_order = order.date_order or fields.Datetime.now() - order.currency_rate = order.pricelist_id.currency_id._get_rates(order.company_id, date_order).get(order.company_id.currency_id.id, 1.0) + order.currency_rate = self.env['res.currency']._get_conversion_rate(order.pricelist_id.currency_id, order.company_id.currency_id, order.company_id, date_order) diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py index cf470e3b631..4a33ad90511 100644 --- a/addons/sale/models/sale.py +++ b/addons/sale/models/sale.py @@ -187,7 +187,7 @@ class SaleOrder(models.Model): @api.depends('pricelist_id', 'date_order', 'company_id') def _compute_currency_rate(self): for order in self: - order.currency_rate = order.currency_id._get_rates(order.company_id, order.date_order).get(order.currency_id.id, 1.0) + order.currency_rate = self.env['res.currency']._get_conversion_rate(order.currency_id, order.company_id.currency_id, order.company_id, order.date_order) def _compute_access_url(self): super(SaleOrder, self)._compute_access_url() diff --git a/addons/sale_timesheet/tests/test_reporting.py b/addons/sale_timesheet/tests/test_reporting.py index ae784456e1a..78b3744474f 100644 --- a/addons/sale_timesheet/tests/test_reporting.py +++ b/addons/sale_timesheet/tests/test_reporting.py @@ -18,7 +18,6 @@ class TestReporting(TestCommonSaleTimesheetNoChart): # tweak demo data: force currency and remove confusing rates company_currency = cls.env.user.company_id.currency_id cls.env.ref('product.list0').currency_id = company_currency - cls.env['res.currency.rate'].search([('currency_id', '=', company_currency.id), ('company_id', '=', cls.env.user.company_id.id)]).unlink() # there a rate to convert USD into USD in demo data # expense product cls.product_expense = cls.env['product.product'].with_context(mail_notrack=True, mail_create_nolog=True).create({ |