-
Notifications
You must be signed in to change notification settings - Fork 30
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Features/finanskonto for foreninger #1126
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
0b5a394
Tilføjet finanskonto til forening
rvpsolution e73e0f8
Merge branch 'master' into Features/finanskonto
mhewel aea582a
Added permission check for new gl_account field
mhewel b973602
Merge branch 'master' into Features/finanskonto
mhewel cbe98b3
Create 0059_merge_20241113_2111.py
mhewel bc58e93
remove debug print. Renamed permission shortname
mhewel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
42 changes: 42 additions & 0 deletions
42
members/migrations/0058_alter_union_options_union_gl_account.py
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
# Generated by Django 4.2.11 on 2024-11-13 19:56 | ||
|
||
import django.core.validators | ||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
("members", "0057_municipality"), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterModelOptions( | ||
name="union", | ||
options={ | ||
"ordering": ["name"], | ||
"permissions": ( | ||
("view_all_unions", "Can view all Foreninger"), | ||
("showledgeraccount", "Show General Ledger Account"), | ||
), | ||
"verbose_name": "Forening", | ||
"verbose_name_plural": "Foreninger", | ||
}, | ||
), | ||
migrations.AddField( | ||
model_name="union", | ||
name="gl_account", | ||
field=models.CharField( | ||
blank=True, | ||
help_text="Kontonummer i formatet 1234", | ||
max_length=4, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Har vi bekræftet med bogholder at vi max vil have 4 tegn i kontonumre? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Det var kravet som Anders har angivet |
||
validators=[ | ||
django.core.validators.RegexValidator( | ||
message="Indtast kontonummer i det rigtige format.", | ||
regex="^[0-9]{4}", | ||
) | ||
], | ||
verbose_name="Finanskonto:", | ||
), | ||
), | ||
] |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
# Generated by Django 4.2.11 on 2024-11-13 20:11 | ||
|
||
from django.db import migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
( | ||
"members", | ||
"0058_alter_municipality_options_remove_municipality_email_and_more", | ||
), | ||
("members", "0058_alter_union_options_union_gl_account"), | ||
] | ||
|
||
operations = [] |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# Generated by Django 4.2.11 on 2024-11-13 21:20 | ||
|
||
from django.db import migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
("members", "0059_merge_20241113_2111"), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterModelOptions( | ||
name="union", | ||
options={ | ||
"ordering": ["name"], | ||
"permissions": ( | ||
("view_all_unions", "Can view all Foreninger"), | ||
("show_ledger_account", "Show General Ledger Account"), | ||
), | ||
"verbose_name": "Forening", | ||
"verbose_name_plural": "Foreninger", | ||
}, | ||
), | ||
] |
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bare for at være konsistent med andre permission definitions?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Der findes en senere migration hvor det ændres til det.