This repository has been archived by the owner on Jun 24, 2024. It is now read-only.
Release/3.6.0 #954
Closed
Release/3.6.0 #954
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
YC-1177: Display user full name in timeline instead of username
* fix entrypoint * adress review comments * use elif * compile messages * DRY version --------- Co-authored-by: Rémi Bovard <[email protected]>
* Initial work on 'emoluments' for polcons. * Add table and update view + minor fixes in models and form. * Update date widget for Prestations. * Update settings: add default prestation price. * Update payment models. * Update submission form. * Add prestation_price to the AdministrativeEntity accounts/model. * Add new entry in AdministrativeEntityAdmin. * Add new entry 'administrative_entity' in list_display and search_fields in the admin. * Update submission form. * Update dev compose file. * Update payement models; add administrative_entity and permit_department fields. * Add new permission 'has_permission_to_add_prestations'. * Add new action fields to PrestationTable. * Add new url /prestations * Remove for from _submission_actions in order to keep it an other file. * Update dev Compose file. * Add new statuses for the ability to add prestations and remove unused variable. * Formatting * Add new function 'create_new_submission_prestation' to create a new prestation. * Update LC_MESSAGES. * Update submissions templates related to prestations. * Update _submission_actions template. * Update shortcuts. * Add empty_text to prestation table. * Update _submission_actions template. * Minor fix. * Minor fix. * Update urls; add a route for editing services fees. * Update messages. * Remove comments. * Major update: filter service fees by submissions and user groups' status. Harmonize namming. Add missing translations. * Update locale. * Add reset script for convenience. * Minor fix. * Minor fix. * Update ServiceFeesForm in forms.py. * Fix agenda_visible variable default value. * Update submission model: add an action for updating a service fee. * Update urls.py add routes for CRUD operation on service fees. * Update ServiceFees and ServicesFeesType models. * Update tables.py: add permit_department column. * Rename service fee creation template to fit CRUD naming. * Update permissions for creating a service fee and add permission for updating a service fee. * Update shortcuts.py: add function to get services fee for user or 404. * Minor fix on _submission_actions template. * Update logging capabilities. * Minor fix in reset script for development. * Update locale. * Update views.py: add some view to update and delete service fees. * Add templates for deleting and updating service fees. * Add table template for editing and deleting service fees. * Add condition on db service in dev Compose file. * Minor fix on AdministrativeEntity account model. * Get pricing from administrative_entity in ServicesFees model. * Minor fix. * Upgrade fixturize data. * Minor fix. * Minor: fix visibility of 'services_fees_type' in ServicesFeesForm. * Minor fix. * Code cleaning. * Code cleaning. * Upgrade the get_service_fees() method to get_service_fees_for_user(). * Code cleaning. * Add permission to delete a service fee. * Update locale. * Update locale. Switch back main language to fr. * Update base_generic.html. Add timer script to display info messages. * Update account admin. * Update account model: add min_cfc2_price and services_fees_hourly_rate fields. * Add message timer script. * Add fixed is_fixed_price field to ServicesFeesTypeAdmin. * Add SubmissionCFC2Price model in payements. * Minor fix. * Minor fix. * Add action to manage CFC 2 amount in the Submission model. * Minor fix. * Minor fix. * Minor fix. * Minor fix. * Minor update in settings. * Add permissions to create, update and delete service fees for all 3 main user groups. * Add permissions to create, update and delete service fees in Submission model. * Update urlpatterns for a clearer separation. * Minor fix in ServicesFees model. * Update permissions to allow validators to create, update and delete sercice fees. * Update submission forms: add CFC2Form + fix set form in readonly when instantiate from the delete view. * Update service fees html templates. * Major refactor of the service fees views. * Minor fix. * Restore .pre-commit-config.yaml. * Minor fix. * Remove unnecessary code. * Code cleaning. * Update service fees views and templates: add a cancel button on update view. * Retore dev Compose file. * Add Cancel button everywhere in service fees views. * Update locale. * UX/UI enhancements. * Minor fix. * Update main.css. * Code cleaning. * Update submission model: remove unnecessary constants. * Update tables: add footer with sum over the amount of the services fees. * Minor updates on service fees templates. * Fix locale. * Fix error in ServicesFeesTable. * Minor fix. * Update ServicesFeesTable: add sum for timedelta. * Formatting. * Add convenience functions. * Minor fix in ServicesFeesForm. * Update *_submission_service_fees views to autofill 'provided_by' when not present. * Update submission views and forms; move logic about the 'provided_by' autocompletion for validators in forms.py. * Update locale. * UX/UI update on buttons. * Add is_fixed_priced boolean field to ServicesFees model. * Major update: add the abilit to add a fix price service fee. * Minor update. * Harmonize service fees templates. * Minor update. * Minor update. * Update locale. * Make get_service_fee_for_user_or_404 function more robust. * Move some logic from service fees related views to ServicesFeesForm. * Add new generic template for services fees actions. * Add new generic view and url for services fees actions. * Clean ServicesFeesForm. * Move mode from URL to query params. Add action to query params. * Update template to include the CREATE action. * Minor fix. * Update urls: remove CRUD verbs from endpoints. * Remove deprecated code: add the ability to CREATE a new service fee in submission_service_fees(). * Remove deprecated templates. * Add verbosity. * Add missing form for create action in template. * Add some missing condition checks for create action in submission_service_fees() and remove deprecated code. * Minor fix. * Replace detailed permissions in Submission model. * Remove unncessary field and minor fix. * Replace detailed permissions with a unique generic one for managing services fees. * Add inline for ServicesFees in the account admin in order to manage sercices fees at the administrative entity level. * Replace detailed permissions by a unique and more generic one for managing services fees. * Add verbosity. * Update locale. * Minor fix. * Override form for ServicesFeesTypeAdmin using ServicesFeesTypeAdminForm. * Add statuses to get_service_fee(). * Update locale. * Minor update. * Minor fix. * Update ServicesFeesType() model; set a fix_price attribute. * Add fix_price to ServicesFeesTypeAdminForm and ServicesFeesTypeAdmin. * Add context data to submission_service_fees view. * Add icon for ServicesFeesType in jazzmin admin. * Use a global settings for the currency of service fees. * Cleaning. * Update monetary_amount in the form based on the service fee type defined by the admin. * Update locale. * Add migrations files. * Update migations. * Fix _submission_actions template. * Fixtures, Tests, Bugfixes, DRYer approach * handle validator + backoffice user case * fix according to review and handle user name representation * keep same tab open after crud * change migration numbers and dependencies * make forms.py more readable for future improvement * update comment * add more security to ServiceFee access * reformat file, add missing div and missing space * fix tests * rename function --------- Co-authored-by: nicolas-heigvd <[email protected]> Co-authored-by: Alexandre Junod <[email protected]>
* YC-1149 prolongation with payment * YC-1149 - Add clearer test * merge develop * lint * lint * fix migration conflict * update html * indent html code * Fix html --------- Co-authored-by: monodo <[email protected]> Co-authored-by: Alexandre Junod <[email protected]>
* fix datetime from service_fees mistake * add status field for agenda * revert featured_agenda * improve agenda status in form
add django-ckeditor-5
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.