Merge branch 'dev_GK_20230626_finances_QoL' into 'master' (74231cb6) · Commits · SciPost / SciPost · GitLab

SciPost Code Repository

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

SciPost
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

74231cb6

Commit 74231cb6 authored 1 year ago by Jean-Sébastien Caux

Downloads
- Plain Diff

Merge branch 'dev_GK_20230626_finances_QoL' into 'master'

Add monthly salary to timesheet view

See merge request !46

parents 0128ef92 4817cff8

No related branches found

No related tags found

1 merge request!46Add monthly salary to timesheet view

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

scipost_django/finances/forms.py 58 additions, 12 deletions

scipost_django/finances/forms.py
scipost_django/finances/models.py 2 additions, 0 deletions

scipost_django/finances/models.py
scipost_django/finances/templates/finances/timesheets.html 15 additions, 25 deletions

scipost_django/finances/templates/finances/timesheets.html
scipost_django/finances/templates/finances/timesheets_detailed.html 8 additions, 17 deletions

...ango/finances/templates/finances/timesheets_detailed.html

with 83 additions and 54 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

SciPost Code Repository