From 0ddfe04d0e3f42720a8b6a5c2fb716c85915f66b Mon Sep 17 00:00:00 2001
From: clallemand <=>
Date: Wed, 15 Jan 2025 15:19:02 +0100
Subject: [PATCH 1/2] supprime condition inutile

---
 openfisca_france/model/prestations/aides_logement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openfisca_france/model/prestations/aides_logement.py b/openfisca_france/model/prestations/aides_logement.py
index 30b49f94c6..c28da8ff8a 100644
--- a/openfisca_france/model/prestations/aides_logement.py
+++ b/openfisca_france/model/prestations/aides_logement.py
@@ -30,7 +30,7 @@ def formula(famille, period):
         als = famille('als', period)
         alf = famille('alf', period)
 
-        return max_(max_(apl, als), alf)
+        return apl + als + alf
 
 
 class apl(Variable):

From d36f996c41432970e7112d2b9c888c9ea140743c Mon Sep 17 00:00:00 2001
From: clallemand <=>
Date: Wed, 15 Jan 2025 15:40:35 +0100
Subject: [PATCH 2/2] bump

---
 CHANGELOG.md   | 8 ++++++++
 pyproject.toml | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39ade888ed..ce2f8b3039 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+### 169.15.7 [2418](https://github.com/openfisca/openfisca-france/pull/2418)
+
+* Amélioration technique.
+* Périodes concernées : toutes.
+* Zones impactées : `openfisca_france/model/prestations/aides_logement.py`.
+* Détails :
+  - Supprime une condition de non cumul des aides au logement qui est redondante par rapport aux conditions dans les variables en amont
+
 ### 169.14.6 [2416](https://github.com/openfisca/openfisca-france/pull/2416)
 
 * Changement mineur.
diff --git a/pyproject.toml b/pyproject.toml
index 54a9a729b7..f35739a2d0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "OpenFisca-France"
-version = "169.14.6"
+version = "169.14.7"
 description = "OpenFisca Rules as Code model for France."
 readme = "README.md"
 keywords = ["microsimulation", "tax", "benefit", "rac", "rules-as-code", "france"]