-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #743 from ae-utbm/taiste
Taiste
- Loading branch information
Showing
240 changed files
with
9,593 additions
and
8,982 deletions.
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,21 @@ | ||
| repos: | ||
| - repo: https://github.com/astral-sh/ruff-pre-commit | ||
| # Ruff version. | ||
| rev: v0.5.1 | ||
| rev: v0.5.5 | ||
| hooks: | ||
| - id: ruff # just check the code, and print the errors | ||
| - id: ruff # actually fix the fixable errors, but print nothing | ||
| args: ["--fix", "--silent"] | ||
| # Run the formatter. | ||
| - id: ruff-format | ||
| - id: ruff-format | ||
| - repo: https://github.com/rtts/djhtml | ||
| rev: 3.0.6 | ||
| hooks: | ||
| - id: djhtml | ||
| name: format templates | ||
| entry: djhtml --tabwidth 2 | ||
| types: ["jinja"] | ||
| - id: djcss | ||
| name: format scss files | ||
| entry: djcss --tabwidth 2 | ||
| types: ["scss"] |
38 changes: 19 additions & 19 deletions
38
accounting/templates/accounting/accountingtype_list.jinja
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 |
|---|---|---|
| @@ -1,27 +1,27 @@ | ||
| {% extends "core/base.jinja" %} | ||
|
|
||
| {% block title %} | ||
| {% trans %}Accounting type list{% endtrans %} | ||
| {% trans %}Accounting type list{% endtrans %} | ||
| {% endblock %} | ||
|
|
||
| {% block content %} | ||
| <div id="accounting"> | ||
| <p> | ||
| <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> > | ||
| {% trans %}Accounting types{% endtrans %} | ||
| </p> | ||
| <hr> | ||
| <p><a href="{{ url('accounting:type_new') }}">{% trans %}New accounting type{% endtrans %}</a></p> | ||
| {% if accountingtype_list %} | ||
| <h3>{% trans %}Accounting type list{% endtrans %}</h3> | ||
| <ul> | ||
| {% for a in accountingtype_list %} | ||
| <li><a href="{{ url('accounting:type_edit', type_id=a.id) }}">{{ a }}</a></li> | ||
| {% endfor %} | ||
| </ul> | ||
| {% else %} | ||
| {% trans %}There is no types in this website.{% endtrans %} | ||
| {% endif %} | ||
| </div> | ||
| <div id="accounting"> | ||
| <p> | ||
| <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> > | ||
| {% trans %}Accounting types{% endtrans %} | ||
| </p> | ||
| <hr> | ||
| <p><a href="{{ url('accounting:type_new') }}">{% trans %}New accounting type{% endtrans %}</a></p> | ||
| {% if accountingtype_list %} | ||
| <h3>{% trans %}Accounting type list{% endtrans %}</h3> | ||
| <ul> | ||
| {% for a in accountingtype_list %} | ||
| <li><a href="{{ url('accounting:type_edit', type_id=a.id) }}">{{ a }}</a></li> | ||
| {% endfor %} | ||
| </ul> | ||
| {% else %} | ||
| {% trans %}There is no types in this website.{% endtrans %} | ||
| {% endif %} | ||
| </div> | ||
| {% endblock %} | ||
|
|
56 changes: 28 additions & 28 deletions
56
accounting/templates/accounting/bank_account_details.jinja
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
122 changes: 61 additions & 61 deletions
122
accounting/templates/accounting/club_account_details.jinja
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 |
|---|---|---|
| @@ -1,68 +1,68 @@ | ||
| {% extends "core/base.jinja" %} | ||
|
|
||
| {% block title %} | ||
| {% trans %}Club account:{% endtrans %} {{ object.name }} | ||
| {% trans %}Club account:{% endtrans %} {{ object.name }} | ||
| {% endblock %} | ||
|
|
||
| {% block content %} | ||
| <div id="accounting"> | ||
| <p> | ||
| <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> > | ||
| <a href="{{ url('accounting:bank_details', b_account_id=object.bank_account.id) }}">{{object.bank_account }}</a> > | ||
| {{ object }} | ||
| </p> | ||
| <hr> | ||
| <h2>{% trans %}Club account:{% endtrans %} {{ object.name }}</h2> | ||
| {% if user.is_root and not object.journals.exists() %} | ||
| <a href="{{ url('accounting:club_delete', c_account_id=object.id) }}">{% trans %}Delete{% endtrans %}</a> | ||
| {% endif %} | ||
| {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %} | ||
| <p><a href="{{ url('accounting:label_new') }}?parent={{ object.id }}">{% trans %}New label{% endtrans %}</a></p> | ||
| {% endif %} | ||
| <p><a href="{{ url('accounting:label_list', clubaccount_id=object.id) }}">{% trans %}Label list{% endtrans %}</a></p> | ||
| {% if not object.has_open_journal() %} | ||
| <p><a href="{{ url('accounting:journal_new') }}?parent={{ object.id }}">{% trans %}New journal{% endtrans %}</a></p> | ||
| {% else %} | ||
| <p>{% trans %}You can not create new journal while you still have one opened{% endtrans %}</p> | ||
| {% endif %} | ||
| <table> | ||
| <thead> | ||
| <tr> | ||
| <td>{% trans %}Name{% endtrans %}</td> | ||
| <td>{% trans %}Start{% endtrans %}</td> | ||
| <td>{% trans %}End{% endtrans %}</td> | ||
| <td>{% trans %}Amount{% endtrans %}</td> | ||
| <td>{% trans %}Effective amount{% endtrans %}</td> | ||
| <td>{% trans %}Closed{% endtrans %}</td> | ||
| <td>{% trans %}Actions{% endtrans %}</td> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| {% for j in object.journals.all() %} | ||
| <tr> | ||
| <td>{{ j.name }}</td> | ||
| <td>{{ j.start_date }}</td> | ||
| {% if j.end_date %} | ||
| <td>{{ j.end_date }}</td> | ||
| {% else %} | ||
| <td> - </td> | ||
| {% endif %} | ||
| <td>{{ j.amount }} €</td> | ||
| <td>{{ j.effective_amount }} €</td> | ||
| {% if j.closed %} | ||
| <td>{% trans %}Yes{% endtrans %}</td> | ||
| {% else %} | ||
| <td>{% trans %}No{% endtrans %}</td> | ||
| {% endif %} | ||
| <td> <a href="{{ url('accounting:journal_details', j_id=j.id) }}">{% trans %}View{% endtrans %}</a> | ||
| <a href="{{ url('accounting:journal_edit', j_id=j.id) }}">{% trans %}Edit{% endtrans %}</a> | ||
| {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and j.operations.count() == 0 %} | ||
| <a href="{{ url('accounting:journal_delete', j_id=j.id) }}">{% trans %}Delete{% endtrans %}</a> | ||
| {% endif %} | ||
| </td> | ||
| </tr> | ||
| {% endfor %} | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| <div id="accounting"> | ||
| <p> | ||
| <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> > | ||
| <a href="{{ url('accounting:bank_details', b_account_id=object.bank_account.id) }}">{{object.bank_account }}</a> > | ||
| {{ object }} | ||
| </p> | ||
| <hr> | ||
| <h2>{% trans %}Club account:{% endtrans %} {{ object.name }}</h2> | ||
| {% if user.is_root and not object.journals.exists() %} | ||
| <a href="{{ url('accounting:club_delete', c_account_id=object.id) }}">{% trans %}Delete{% endtrans %}</a> | ||
| {% endif %} | ||
| {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %} | ||
| <p><a href="{{ url('accounting:label_new') }}?parent={{ object.id }}">{% trans %}New label{% endtrans %}</a></p> | ||
| {% endif %} | ||
| <p><a href="{{ url('accounting:label_list', clubaccount_id=object.id) }}">{% trans %}Label list{% endtrans %}</a></p> | ||
| {% if not object.has_open_journal() %} | ||
| <p><a href="{{ url('accounting:journal_new') }}?parent={{ object.id }}">{% trans %}New journal{% endtrans %}</a></p> | ||
| {% else %} | ||
| <p>{% trans %}You can not create new journal while you still have one opened{% endtrans %}</p> | ||
| {% endif %} | ||
| <table> | ||
| <thead> | ||
| <tr> | ||
| <td>{% trans %}Name{% endtrans %}</td> | ||
| <td>{% trans %}Start{% endtrans %}</td> | ||
| <td>{% trans %}End{% endtrans %}</td> | ||
| <td>{% trans %}Amount{% endtrans %}</td> | ||
| <td>{% trans %}Effective amount{% endtrans %}</td> | ||
| <td>{% trans %}Closed{% endtrans %}</td> | ||
| <td>{% trans %}Actions{% endtrans %}</td> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| {% for j in object.journals.all() %} | ||
| <tr> | ||
| <td>{{ j.name }}</td> | ||
| <td>{{ j.start_date }}</td> | ||
| {% if j.end_date %} | ||
| <td>{{ j.end_date }}</td> | ||
| {% else %} | ||
| <td> - </td> | ||
| {% endif %} | ||
| <td>{{ j.amount }} €</td> | ||
| <td>{{ j.effective_amount }} €</td> | ||
| {% if j.closed %} | ||
| <td>{% trans %}Yes{% endtrans %}</td> | ||
| {% else %} | ||
| <td>{% trans %}No{% endtrans %}</td> | ||
| {% endif %} | ||
| <td> <a href="{{ url('accounting:journal_details', j_id=j.id) }}">{% trans %}View{% endtrans %}</a> | ||
| <a href="{{ url('accounting:journal_edit', j_id=j.id) }}">{% trans %}Edit{% endtrans %}</a> | ||
| {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and j.operations.count() == 0 %} | ||
| <a href="{{ url('accounting:journal_delete', j_id=j.id) }}">{% trans %}Delete{% endtrans %}</a> | ||
| {% endif %} | ||
| </td> | ||
| </tr> | ||
| {% endfor %} | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| {% endblock %} |
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 |
|---|---|---|
| @@ -1,30 +1,30 @@ | ||
| {% extends "core/base.jinja" %} | ||
|
|
||
| {% block title %} | ||
| {% trans %}Company list{% endtrans %} | ||
| {% trans %}Company list{% endtrans %} | ||
| {% endblock %} | ||
|
|
||
| {% block content %} | ||
| <div id="accounting"> | ||
| {% if user.is_root | ||
| or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) | ||
| %} | ||
| <p><a href="{{ url('accounting:co_new') }}">{% trans %}Create new company{% endtrans %}</a></p> | ||
| {% endif %} | ||
| <br/> | ||
| <table> | ||
| <thead> | ||
| <tr> | ||
| <td>{% trans %}Companies{% endtrans %}</td> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| {% for o in object_list %} | ||
| <tr> | ||
| <td><a href="{{ url('accounting:co_edit', co_id=o.id) }}">{{ o.get_display_name() }}</a></td> | ||
| </tr> | ||
| {% endfor %} | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| <div id="accounting"> | ||
| {% if user.is_root | ||
| or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) | ||
| %} | ||
| <p><a href="{{ url('accounting:co_new') }}">{% trans %}Create new company{% endtrans %}</a></p> | ||
| {% endif %} | ||
| <br/> | ||
| <table> | ||
| <thead> | ||
| <tr> | ||
| <td>{% trans %}Companies{% endtrans %}</td> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| {% for o in object_list %} | ||
| <tr> | ||
| <td><a href="{{ url('accounting:co_edit', co_id=o.id) }}">{{ o.get_display_name() }}</a></td> | ||
| </tr> | ||
| {% endfor %} | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| {% endblock %} |
Oops, something went wrong.