nobohan
8c7da5f80c
Merge branch 'master' into issue345_internal_thirdparty_contact
2022-02-18 11:22:51 +01:00
ee8044b857
Merge branch 'workflow/fix-sending-notifications' into 'master'
...
workflow: fix sending notifications
See merge request Chill-Projet/chill-bundles!347
2022-02-17 22:40:53 +00:00
1fda56b5f7
Merge remote-tracking branch 'origin/master' into workflow/fix-sending-notifications
2022-02-17 23:34:20 +01:00
ca79da2f9b
Merge branch 'issue434_endDate_enfantHorsMenage' into 'master'
...
Add end date field for enfant hors menage
See merge request Chill-Projet/chill-bundles!341
2022-02-17 22:33:47 +00:00
c90e6231f9
Merge remote-tracking branch 'origin/master' into issue434_endDate_enfantHorsMenage
2022-02-17 23:31:14 +01:00
e86fa41180
Merge branch 'issue448_search_3rd_party' into 'master'
...
thirdparty search: add where clause for searching into children
See merge request Chill-Projet/chill-bundles!344
2022-02-17 22:28:25 +00:00
ebea4b7008
Merge remote-tracking branch 'origin/master' into issue434_endDate_enfantHorsMenage
2022-02-17 23:25:07 +01:00
9565464489
Merge branch 'homepage/add-workflow' into 'master'
...
add workflow on widget homepage
See merge request Chill-Projet/chill-bundles!343
2022-02-17 22:19:25 +00:00
05f83bf566
Merge remote-tracking branch 'origin/master' into issue448_search_3rd_party
2022-02-17 23:16:41 +01:00
673d0c1e53
Merge branch 'issue422_and_others_on_AddPersons' into 'master'
...
addPersons improvements
See merge request Chill-Projet/chill-bundles!340
2022-02-17 22:15:43 +00:00
fe35a29fb8
homepage vue / my workflow: replace "document" by object type
2022-02-17 23:12:14 +01:00
53d51fea2f
Merge remote-tracking branch 'origin/master' into issue422_and_others_on_AddPersons
2022-02-17 22:51:52 +01:00
caaebd593b
misc fixes for Thirdparty / addPerson
...
* set default values for ThirdParty in ThirdParty.vue
* set correct value for binding with phone (telephone instead of
phonenumber)
* add validation on ThirdParty/denomination: at least two characters, no
Null value
2022-02-17 22:42:52 +01:00
672fa48140
Merge branch 'issue415_filter_suggested_entities_by_close_participations' into 'master'
...
accompanying course: filter suggested entities by open participations
See merge request Chill-Projet/chill-bundles!339
2022-02-17 20:46:03 +00:00
a9aeea234c
Merge remote-tracking branch 'origin/master' into issue415_filter_suggested_entities_by_close_participations
2022-02-17 21:45:43 +01:00
1683685f6b
Merge branch 'issue465_display_person_resources' into 'master'
...
Display more info for person ressources
See merge request Chill-Projet/chill-bundles!338
2022-02-17 20:38:32 +00:00
e4aac56f2d
Merge remote-tracking branch 'origin/master' into issue415_filter_suggested_entities_by_close_participations
2022-02-17 21:35:18 +01:00
d6990349d8
PersonResource: add link to person or 3party in the associated person or
...
3party part
There was a mismatch between "opening a resource to see the resource
details" and "see the associated person/3party details". On the previous location,
the user would expect to open the resource details, and not the person
details.
2022-02-17 21:28:27 +01:00
9ac2f7e359
Merge branch 'issue476_activity_fix_concerned_group' into 'master'
...
activity: can click through the cross icon for removing person in concerned group + fix duplicate display
See merge request Chill-Projet/chill-bundles!337
2022-02-17 20:22:04 +00:00
f86c0353a2
Merge remote-tracking branch 'origin/master' into issue465_display_person_resources
2022-02-17 21:17:40 +01:00
0a289e1edd
Merge remote-tracking branch 'origin/master' into issue476_activity_fix_concerned_group
2022-02-17 21:11:45 +01:00
c2c5bec0e5
in period notification, handle case when period referrer is null
2022-02-17 21:08:55 +01:00
95b2fcead7
update changelog [ci-skip]
2022-02-16 21:58:49 +01:00
45beb27f83
fix sending notifications
2022-02-16 21:54:37 +01:00
aebb21935b
fix page "my accompanying period" and do not show drafts periods in
...
homepage (+ ordering)
2022-02-16 19:57:35 +01:00
d4534b56a0
bugfix listing mes parcours for user
2022-02-16 15:28:08 +01:00
e4793e1a77
minor fixes
2022-02-16 13:52:20 +01:00
8347ddd5be
bugfix if there is no address edit of resourceItem was not possible
2022-02-16 13:51:51 +01:00
12412e05a7
removal double entry
2022-02-16 13:33:45 +01:00
nobohan
dd99c35e35
upd CHANGELOG
2022-02-16 11:24:30 +01:00
nobohan
9d651a70e9
merge last AddPerson branch
2022-02-16 11:23:21 +01:00
b0d50d315c
Merge conflict in changelog fixed
2022-02-16 10:56:44 +01:00
41bddf2db6
return interchange of name and text back to how it was before -> solves one bug recreates the other
2022-02-16 10:55:44 +01:00
769700fe83
comment removed
2022-02-16 10:55:44 +01:00
433ccb1fc4
bugfix of double civility abbreviation after edit
2022-02-16 10:55:44 +01:00
145c1d59e9
bugfix emit saveFormOnTheFly and add newly created contact to suggestion list immediately
2022-02-16 10:55:44 +01:00
ae8cc0f700
attempt to not include parent address
2022-02-16 10:55:24 +01:00
a764da3e99
changelog updated
2022-02-16 10:55:05 +01:00
8f92f79f85
placeholders for civility and profession
2022-02-16 10:55:05 +01:00
f093765d03
correction for POST phonenumber and email
2022-02-16 10:55:05 +01:00
c44d962ba8
only show addcontact button for personne morale
2022-02-16 10:55:05 +01:00
20d22b726c
possible to add a contact to a thirdparty
2022-02-16 10:55:05 +01:00
8fa2f0e7ad
small corrections
2022-02-16 10:54:42 +01:00
604c7f385e
further attempts to do POST of thirdparty contact, passing parent id causes problems + civility and profession fk's are not saved on POST
2022-02-16 10:54:42 +01:00
1a07c9d71a
v-model added so data is taken from the form for all fields + modal title correction
2022-02-16 10:54:20 +01:00
f7e287d415
onTheFly modal to add contact to thirdparty - form fields for profession,civility, and comment added - no saving possible yet
2022-02-16 10:54:04 +01:00
b16cc2dc27
translations added
2022-02-16 10:53:34 +01:00
188447fc10
use correct button
2022-02-16 10:48:23 +01:00
b920bf6d22
parent id added to thirdparty data
2022-02-16 10:47:59 +01:00
32ff54e130
v-model added so data is taken from the form for all fields + modal title correction
2022-02-16 10:47:59 +01:00
