Merge branch 'master' into rector/rules-symfony

This commit is contained in:
Julien Fastré 2023-10-02 12:30:15 +02:00
commit 2efd5ebc9a
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
8 changed files with 20 additions and 20 deletions

View File

@ -1,7 +0,0 @@
kind: Feature
body: "The regulation list load accompanying periods by exact postal code (address
associated with postal code), and not by the content of the postal code (postal
code with same code's string)"
time: 2023-09-26T16:44:41.414746336+02:00
custom:
Issue: "155"

View File

@ -1,5 +0,0 @@
kind: Fixed
body: Fix the label of filter ActivityTypeFilter to a more obvious one
time: 2023-09-13T11:59:54.948009297+02:00
custom:
Issue: "142"

View File

@ -1,6 +0,0 @@
kind: Fixed
body: '[export] Fix association of filter "filter location by type" which did not
appears on "list of activities"'
time: 2023-09-26T17:58:15.871908118+02:00
custom:
Issue: "140"

View File

@ -0,0 +1,5 @@
kind: Fixed
body: 'View a third party: avoid errors when a contact has a civility'
time: 2023-09-28T12:09:10.199359071+02:00
custom:
Issue: "164"

6
.changes/v2.7.0.md Normal file
View File

@ -0,0 +1,6 @@
## v2.7.0 - 2023-09-27
### Feature
* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string)
### Fixed
* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one
* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities"

View File

@ -6,6 +6,13 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
and is generated by [Changie](https://github.com/miniscruff/changie).
## v2.7.0 - 2023-09-27
### Feature
* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string)
### Fixed
* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one
* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities"
## v2.6.3 - 2023-09-19
### Fixed
* Remove id property from document

View File

@ -119,7 +119,7 @@ final readonly class AccompanyingPeriodWorkRepository implements ObjectRepositor
. ")";
}
$sql .= " AND daterange(:after::date, :before::date) && daterange(w.startDate, w.endDate)";
$sql .= " AND daterange(:after::date, :before::date) && daterange(w.startDate, w.endDate, '[]')";
// if the start and end date were inversed, we inverse the order to avoid an error
if (null !== ($filters['after'] ?? null) && null !== ($filters['before']) && $filters['after'] > $filters['before']) {

View File

@ -25,7 +25,7 @@
<dt>{{ 'Name'|trans }}</dt>
<dd>
{% if thirdParty.isLeaf == true %}{{ thirdParty.civility }}{% endif %}
{% if thirdParty.isLeaf == true and thirdParty.civility is not same as null %}{{ thirdParty.civility.name|localize_translatable_string }}{% endif %}
{{ thirdParty.firstname ~ ' ' ~ thirdParty.name }}
</dd>