From ac5fc59c21d1cf82e8fa4577424006c184de3a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 13 Mar 2020 16:39:12 +0100
Subject: [PATCH 1/3] [closing motivve] display closing motive in remark

---
 CHANGELOG.md                                      | 5 +++++
 Resources/views/AccompanyingPeriod/list.html.twig | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73e743c02..a9753f86d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -79,3 +79,8 @@ Version 1.5.9
 - [UI] set action button bottom of edit form according to crud template
 - [closing motive] add an hierarchy for closing motives ;
 - [closing motive] Add an admin section for closing motives ;
+
+Version 1.5.10
+==============
+
+- [closing motive] display closing motive in remark
diff --git a/Resources/views/AccompanyingPeriod/list.html.twig b/Resources/views/AccompanyingPeriod/list.html.twig
index b3c5a9b0c..135810e4b 100644
--- a/Resources/views/AccompanyingPeriod/list.html.twig
+++ b/Resources/views/AccompanyingPeriod/list.html.twig
@@ -28,7 +28,6 @@
                         '%opening_date%': accompanying_period.openingDate|localizeddate('long', 'none'),
                         '%closing_date%': accompanying_period.closingDate|localizeddate('long', 'none')} 
                     ) }}
-                    <div>{{ accompanying_period.closingMotive|chill_entity_render_box }}</div>
                 {% endif %}
             </td>
             {% if chill_accompanying_periods.fields.user == 'visible'  %}
@@ -41,6 +40,10 @@
             </td>
             {% endif %}
             <td>
+                {% if accompanying_period.isOpen == false %}
+                    <div>{{ accompanying_period.closingMotive|chill_entity_render_box }}</div>
+                    <br/>
+                {% endif %}
                 {{ accompanying_period.remark|chill_print_or_message('No remark', 'blockquote') }}
             </td>
             <td>

From e11313ddab7717f3806a1c9e2ea1a21a075391ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 22 Apr 2020 22:42:51 +0200
Subject: [PATCH 2/3] fix versioning constraint

---
 CHANGELOG.md  | 5 +++++
 composer.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9753f86d..77a915f77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -84,3 +84,8 @@ Version 1.5.10
 ==============
 
 - [closing motive] display closing motive in remark
+
+Version 1.5.11
+==============
+
+- Fix versioning constraint to chill main
diff --git a/composer.json b/composer.json
index 404ff7810..28f9c8d2c 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "chill-project/main": "dev-CRUD-init@dev",
+        "chill-project/main": "~1.5",
         "chill-project/custom-fields": "~1.5"
     },
     "require-dev": {

From ad9e52810ae119fcc7dd3950a0dba97e651e7ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 1 May 2020 15:52:33 +0200
Subject: [PATCH 3/3] update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77a915f77..278ba6687 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -89,3 +89,9 @@ Version 1.5.11
 ==============
 
 - Fix versioning constraint to chill main
+
+Version 1.5.12
+==============
+
+- [addresses] add a homeless to person's addresses, and this information into 
+    person list