Skip to content

Economy makeover - #1946

Merged
tykling merged 17 commits into
mainfrom
expense-revenue-reimbursement-redisbursement
Dec 22, 2025
Merged

tykling merged 17 commits into
mainfrom
expense-revenue-reimbursement-redisbursement

Conversation

@tykling

@tykling tykling commented Dec 18, 2025 •

Copy link
Copy Markdown
Member

Primary changes:

  1. Make it possible to include revenues in reimbursements
  2. Add payment_status field to Expense and Revenue models, to replace the existing paid_by_bornhack with a more flexible way to express the payment status of expenses and revenues. Includes a data migration to migrate existing expenses, this code should be extra carefully reviewed since it deals with existing data. Code is in economy/migrations/0048_migrate_exp_rev_reimb.py

Minor changes

  1. Remove responsible_team from expenses - the data has never been used, it is pointless to collect it
  2. Refactor economy forms a bit to facilitate the new payment status field
  3. Remove invoice_fk from Revenue model, it has never been used

Todo

  1. When this is in, and the data on prod is migrated we can add another migration to remove the paid_by_bornhack field from the Expense model.

@tykling
tykling requested review from flummer and valberg December 18, 2025 19:18
@tykling
tykling marked this pull request as ready for review December 18, 2025 22:07
Comment thread src/economy/models.py Outdated
Comment thread src/economy/models.py Outdated
Comment thread src/economy/models.py
Comment thread src/economy/models.py Outdated
Comment thread src/economy/models.py
Comment thread src/economy/models.py
Comment thread src/economy/views.py Outdated
Comment thread src/economy/views.py Outdated
Comment thread src/economy/views.py
Comment thread src/backoffice/views/economy.py
@tykling
tykling merged commit 24b804c into main Dec 22, 2025
1 of 3 checks passed
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