Merge branch 'stable'

CHANGELOG.md

@@ -80,8 +80,26 @@ Version 1.5.9
 - [closing motive] add an hierarchy for closing motives ;
 - [closing motive] Add an admin section for closing motives ;
 
+<<<<<<< HEAD
 Master branch
 =============
 
 - [CRUD] add step delete
 
+=======
+Version 1.5.10
+==============
+
+- [closing motive] display closing motive in remark
+
+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
+

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>

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": {