From 5ab28409442e54cf061dbd0d48ab29f427bd6bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 15 Jun 2022 22:03:38 +0200 Subject: [PATCH] Join with a unique currency rate issue11255 review435291004 (grafted from c2f056739e4856f2530b491653dfe8e5a8cb0461) --HG-- branch : 6.0 --- stock_reporting_margin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stock_reporting_margin.py b/stock_reporting_margin.py index f080c7dc92..0e90b9140f 100644 --- a/stock_reporting_margin.py +++ b/stock_reporting_margin.py @@ -93,7 +93,7 @@ class Abstract(ModelSQL, ModelView): condition=(move.currency == currency_rate.currency) & (currency_rate.start_date <= move.effective_date) & ((currency_rate.end_date == Null) - | (currency_rate.end_date >= move.effective_date)) + | (currency_rate.end_date > move.effective_date)) ) .join(company, condition=move.company == company.id) @@ -103,7 +103,7 @@ class Abstract(ModelSQL, ModelView): condition=(company.currency == currency_rate_company.currency) & (currency_rate_company.start_date <= move.effective_date) & ((currency_rate_company.end_date == Null) - | (currency_rate_company.end_date >= move.effective_date)) + | (currency_rate_company.end_date > move.effective_date)) ) .join(from_location, condition=(move.from_location == from_location.id))