Skip to content

feat(members/excursion): various fixes and LJP proposal enhancements#230

Merged
chrisflav merged 14 commits intomainfrom
mk-excursion-fixes
Apr 1, 2026
Merged

feat(members/excursion): various fixes and LJP proposal enhancements#230
chrisflav merged 14 commits intomainfrom
mk-excursion-fixes

Conversation

@mariusrklein
Copy link
Copy Markdown
Collaborator

• Full receipt overview for LJP proposals – Added new LaTeX template (ljp_statement.tex) to generate comprehensive invoice and receipt summaries with all supporting documentation

• Download LJP proofs functionality – Implemented download_ljp_proofs() method in admin panel to generate and download complete proof collections with attachments (right next to other lip documents)

• Improved LJP participant counting – Fixed distinction between regular participants and LJP-eligible participants; introduced ljp_participant_count property for accurate subsidies calculation in excursion cost overview

• Qualification activity handling – Activities with qualification goal no longer apply age restrictions to participants and correctly exempt org fees

• Enhanced LJP proposal validation – Added custom form validation to enforce category-goal combinations: Qualification requires Staff Training category; other goals require Educational Programme

• Updated help texts & translations – Added clarifying help texts for night costs, kilometers traveled, and postcode fields; improved German translations throughout

• Org fee logic refinement – Org fees only charged when subsidies or allowances claimed, excluding qualification activities entirely

• UI improvements – Reordered fields in Freizeit admin for better logical flow; updated German translations for LJP-related terminology

…ar ones

this includes to the following features:

- calculation of org fee should be disabled for older participants in a yl activity
- calculation of ljp participants is different for yl acitivitis: there is no age limit.
- as a consequence, paid and requested ljp contributions are considerably higher

the ljp goal qualification can only occur with the category staff training (also the negation of both). This is restricted by a field validation so the discrimination can check for just one of the fields.
the document

- lists all bills for an activity
- adds up all allowances on top of the bill overview
- adds a custom receipt for the allowances
- appends all other receipts in their order on the list
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Feb 12, 2026

📚 Documentation deployed!

Documentation: https://chrisflav.github.io/kompass/mk-excursion-fixes/

Docker Images:

  • App: ghcr.io/chrisflav/kompass:pr-230
  • Nginx: ghcr.io/chrisflav/kompass-nginx:pr-230

Add the awaiting-deployment label to deploy this PR to a staging server.

Copy link
Copy Markdown
Owner

@chrisflav chrisflav left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do I understand correctly that now the finance report is required, but not the actual scanned invoices? Otherwise I am confused why we don't add the invoices to the current LJP finance overview.

Comment thread jdav_web/finance/locale/de/LC_MESSAGES/django.po Outdated
Comment thread jdav_web/members/locale/de/LC_MESSAGES/django.po Outdated
Comment thread jdav_web/members/locale/de/LC_MESSAGES/django.po Outdated
Comment thread jdav_web/members/locale/de/LC_MESSAGES/django.po Outdated
Comment thread jdav_web/members/admin.py Outdated
@chrisflav chrisflav changed the title Excursion Fixes and LJP Proposal Enhancements feat(members/excursion): various fixes and LJP Proposal Enhancements Mar 8, 2026
@chrisflav chrisflav changed the title feat(members/excursion): various fixes and LJP Proposal Enhancements feat(members/excursion): various fixes and LJP proposal enhancements Mar 8, 2026
mariusrklein and others added 5 commits March 8, 2026 21:58
Co-authored-by: Christian Merten <christian@merten.dev>
Co-authored-by: Christian Merten <christian@merten.dev>
Co-authored-by: Christian Merten <christian@merten.dev>
Co-authored-by: Christian Merten <christian@merten.dev>
Co-authored-by: Christian Merten <christian@merten.dev>
@mariusrklein
Copy link
Copy Markdown
Collaborator Author

Do I understand correctly that now the finance report is required, but not the actual scanned invoices? Otherwise I am confused why we don't add the invoices to the current LJP finance overview.

Correct, the PDF is currently handed in with the other files. Lately we had several requests to hand in all invoices of an excursion for proper checks. This would be greatly simplified by this feature. Also the internal review of the invoices is simplified if one only has to scroll through a long pdf...

- add two new variables in settings.toml
- replace hardcoded aid values 0.1 and 0.15 by variables
@chrisflav
Copy link
Copy Markdown
Owner

If you add a test (or tell me to do it), I'll merge this.

@chrisflav
Copy link
Copy Markdown
Owner

Thanks!

@chrisflav chrisflav merged commit 98dbb02 into main Apr 1, 2026
5 checks passed
@chrisflav chrisflav deleted the mk-excursion-fixes branch April 1, 2026 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants