Migrate accounting

accounting/templates/accounting/accountingtype_list.jinja

@@ -5,6 +5,11 @@
 {% endblock %}
 
 {% block content %}
+    <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>

accounting/templates/accounting/bank_account_details.jinja

@@ -1,10 +1,15 @@
 {% extends "core/base.jinja" %}
 
+{% block title %}
+{% trans %}Bank account: {% endtrans %}{{ object.name }}
+{% endblock %}
+
 {% block content %}
     <p>
     <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
     {{ object.name }}
     </p>
+    <hr>
     <h2>{% trans %}Bank account: {% endtrans %}{{ object.name }}</h2>
     <h4>{% trans %}Infos{% endtrans %}</h4>
     <ul>
@@ -14,9 +19,12 @@
     <p><a href="{{ url('accounting:club_new') }}?parent={{ object.id }}">{% trans %}New club account{% endtrans %}</a></p>
     <ul>
     {% for c in object.club_accounts.all() %}
-        <li><a href="{{ url('accounting:club_details', c_account_id=c.id) }}">{{ c }}</a> -
-            <a href="{{ url('accounting:club_edit', c_account_id=c.id) }}">{% trans %}Edit{% endtrans %}</a> -
-            <a href="{{ url('accounting:club_delete', c_account_id=c.id) }}">{% trans %}Delete{% endtrans %}</a></li>
+        <li><a href="{{ url('accounting:club_details', c_account_id=c.id) }}">{{ c }}</a>
+            - <a href="{{ url('accounting:club_edit', c_account_id=c.id) }}">{% trans %}Edit{% endtrans %}</a>
+            {% if user.is_root %}
+            - <a href="{{ url('accounting:club_delete', c_account_id=c.id) }}">{% trans %}Delete{% endtrans %}</a>
+            {% endif %}
+            </li>
     {% endfor %}
     </ul>
 

accounting/templates/accounting/bank_account_list.jinja

@@ -5,15 +5,24 @@
 {% endblock %}
 
 {% block content %}
+    <h4>
+    {% trans %}Accounting{% endtrans %}
+    </h4>
+    {% if user.is_in_group(settings.SITH_GROUPS['accounting-admin']['name']) %}
+    <p><a href="{{ url('accounting:simple_type_list') }}">{% trans %}Manage simplified types{% endtrans %}</a></p>
     <p><a href="{{ url('accounting:type_list') }}">{% trans %}Manage accounting types{% endtrans %}</a></p>
     <p><a href="{{ url('accounting:bank_new') }}">{% trans %}New bank account{% endtrans %}</a></p>
+    {% endif %}
     {% if bankaccount_list %}
     <h3>{% trans %}Bank account list{% endtrans %}</h3>
         <ul>
-            {% for a in bankaccount_list  %}
-            <li><a href="{{ url('accounting:bank_details', b_account_id=a.id) }}">{{ a }}</a> -
-                <a href="{{ url('accounting:bank_edit', b_account_id=a.id) }}">{% trans %}Edit{% endtrans %}</a> -
-                <a href="{{ url('accounting:bank_delete', b_account_id=a.id) }}">{% trans %}Delete{% endtrans %}</a></li>
+            {% for a in object_list  %}
+            <li><a href="{{ url('accounting:bank_details', b_account_id=a.id) }}">{{ a }}</a>
+                - <a href="{{ url('accounting:bank_edit', b_account_id=a.id) }}">{% trans %}Edit{% endtrans %}</a>
+                {% if user.is_root %}
+                - <a href="{{ url('accounting:bank_delete', b_account_id=a.id) }}">{% trans %}Delete{% endtrans %}</a>
+                {% endif %}
+            </li>
             {% endfor %}
         </ul>
     {% else %}

accounting/templates/accounting/club_account_details.jinja

@@ -1,10 +1,16 @@
 {% extends "core/base.jinja" %}
 
+{% block title %}
+{% trans %}Club account:{% endtrans %} {{ object.name }}
+{% endblock %}
+
 {% block content %}
     <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 not object.has_open_journal() %}
     <p><a href="{{ url('accounting:journal_new') }}?parent={{ object.id }}">{% trans %}New journal{% endtrans %}</a></p>

accounting/templates/accounting/journal_details.jinja

@@ -1,5 +1,9 @@
 {% extends "core/base.jinja" %}
 
+{% block title %}
+{% trans %}General journal:{% endtrans %} {{ object.name }}
+{% endblock %}
+
 {% block content %}
     <p>
     <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
@@ -7,6 +11,8 @@
     <a href="{{ url('accounting:club_details', c_account_id=object.club_account.id) }}">{{ object.club_account }}</a> >
     {{ object.name }}
     </p>
+    <hr>
+    <h2>{% trans %}General journal:{% endtrans %} {{ object.name }}</h2>
     <p><strong>{% trans %}Amount: {% endtrans %}</strong>{{ object.amount }} € -
     <strong>{% trans %}Effective amount: {% endtrans %}</strong>{{ object.effective_amount }} €</p>
     {% if object.closed %}
@@ -19,7 +25,6 @@
         <tr>
             <td>{% trans %}Nb{% endtrans %}</td>
             <td>{% trans %}Date{% endtrans %}</td>
-            <td>{% trans %}Label{% endtrans %}</td>
             <td>{% trans %}Amount{% endtrans %}</td>
             <td>{% trans %}Payment mode{% endtrans %}</td>
             <td>{% trans %}Target{% endtrans %}</td>
@@ -36,7 +41,6 @@
         <tr>
             <td>{{ o.number }}</td>
             <td>{{ o.date }}</td>
-            <td>{{ o.label }}</td>
             <td>{{ o.amount }} €</td>
             <td>{{ o.get_mode_display() }}</td>
             {% if o.target_type == "OTHER" %}

accounting/templates/accounting/operation_edit.jinja

@@ -0,0 +1,55 @@
+{% extends "core/base.jinja" %}
+
+{% block title %}
+{% trans %}Edit operation{% endtrans %}
+{% endblock %}
+
+{% block content %}
+<h2>{% trans %}Edit operation{% endtrans %}</h2>
+<form action="" method="post">
+    {% csrf_token %}
+    {{ form.journal }}
+    {{ form.target_id }}
+    <p>{{ form.amount.errors }}<label for="{{ form.amount.name }}">{{ form.amount.label }}</label> {{ form.amount }}</p>
+    <p>{{ form.remark.errors }}<label for="{{ form.remark.name }}">{{ form.remark.label }}</label> {{ form.remark }}</p>
+    <p>{{ form.target_type.errors }}<label for="{{ form.target_type.name }}">{{ form.target_type.label }}</label> </p>
+    {% for choice in form.target_type %}
+        {% if choice.choice_value != "" %}
+        {{ choice }}
+        {% if choice.choice_value == "USER" %}
+            {{ form.user }}
+        {% elif choice.choice_value == "CLUB" %}
+            {{ form.club }}
+        {% elif choice.choice_value == "ACCOUNT" %}
+            {{ form.club_account }}
+        {% elif choice.choice_value == "COMPANY" %}
+            {{ form.company }}
+        {% elif choice.choice_value == "OTHER" %}
+            {{ form.target_label }}
+        {% endif %}
+        {% else %}
+        {% endif %}
+    {% endfor %}
+    <p>{{ form.date.errors }}<label for="{{ form.date.name }}">{{ form.date.label }}</label> {{ form.date }}</p>
+    <p>{{ form.mode.errors }}<label for="{{ form.mode.name }}">{{ form.mode.label }}</label> {{ form.mode }}</p>
+    <p>{{ form.cheque_number.errors }}<label for="{{ form.cheque_number.name }}">{{ form.cheque_number.label }}</label> {{
+    form.cheque_number }}</p>
+    <p>{{ form.invoice.errors }}<label for="{{ form.invoice.name }}">{{ form.invoice.label }}</label> {{ form.invoice }}</p>
+    <p>{{ form.simpleaccounting_type.errors }}<label for="{{ form.simpleaccounting_type.name }}">{{
+        form.simpleaccounting_type.label }}</label> {{ form.simpleaccounting_type }}</p>
+    <p>{{ form.accounting_type.errors }}<label for="{{ form.accounting_type.name }}">{{ form.accounting_type.label }}</label> {{
+    form.accounting_type }}</p>
+    <p>{{ form.done.errors }}<label for="{{ form.done.name }}">{{ form.done.label }}</label> {{ form.done }}</p>
+    <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
+</form>
+{% endblock %}
+
+{% block script %}
+    {{ super() }}
+<script>
+$( function() {
+} );
+</script>
+{% endblock %}
+
+

accounting/templates/accounting/simplifiedaccountingtype_list.jinja

@@ -0,0 +1,25 @@
+{% extends "core/base.jinja" %}
+
+{% block title %}
+{% trans %}Simplified type list{% endtrans %}
+{% endblock %}
+
+{% block content %}
+    <p>
+    <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
+    {% trans %}Simplified types{% endtrans %}
+    </p>
+    <hr>
+    <p><a href="{{ url('accounting:simple_type_new') }}">{% trans %}New simplified type{% endtrans %}</a></p>
+    {% if simplifiedaccountingtype_list %}
+    <h3>{% trans %}Simplified type list{% endtrans %}</h3>
+    <ul>
+        {% for a in simplifiedaccountingtype_list  %}
+        <li><a href="{{ url('accounting:simple_type_edit', type_id=a.id) }}">{{ a }}</a></li>
+        {% endfor %}
+    </ul>
+    {% else %}
+    {% trans %}There is no types in this website.{% endtrans %}
+    {% endif %}
+{% endblock %}
+