From 1396f2ca840f1064174ca2d21e22df9265105b25 Mon Sep 17 00:00:00 2001
From: Skia <skia@libskia.so>
Date: Fri, 24 Jun 2016 19:43:11 +0200
Subject: [PATCH] Improve accounting ease of use

---
 .../migrations/0010_remove_operation_type.py  | 18 +++++++
 accounting/models.py                          | 10 ++--
 .../accounting/bank_account_details.jinja     |  2 +-
 .../accounting/club_account_details.jinja     |  2 +-
 .../accounting/journal_details.jinja          |  2 +-
 accounting/views.py                           | 53 ++++++++++++++-----
 .../templates/core/create.jinja               |  3 +-
 core/templates/core/edit.jinja                | 13 +++++
 8 files changed, 79 insertions(+), 24 deletions(-)
 create mode 100644 accounting/migrations/0010_remove_operation_type.py
 rename accounting/templates/accounting/account_edit.jinja => core/templates/core/create.jinja (89%)
 create mode 100644 core/templates/core/edit.jinja

diff --git a/accounting/migrations/0010_remove_operation_type.py b/accounting/migrations/0010_remove_operation_type.py
new file mode 100644
index 00000000..64883343
--- /dev/null
+++ b/accounting/migrations/0010_remove_operation_type.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounting', '0009_auto_20160622_1030'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='operation',
+            name='type',
+        ),
+    ]
diff --git a/accounting/models.py b/accounting/models.py
index 87c62dd4..e14a0d44 100644
--- a/accounting/models.py
+++ b/accounting/models.py
@@ -130,7 +130,7 @@ class GeneralJournal(models.Model):
         self.amount = 0
         self.effective_amount = 0
         for o in self.operations.all():
-            if o.type == "credit":
+            if o.accounting_type.movement_type == "credit":
                 if o.done:
                     self.effective_amount += o.amount
                 self.amount += o.amount
@@ -154,10 +154,6 @@ class Operation(models.Model):
     invoice = models.FileField(upload_to='invoices', null=True, blank=True)
     done = models.BooleanField(_('is done'), default=False)
     accounting_type = models.ForeignKey('AccountingType', related_name="operations")
-    type = models.CharField(_('operation type'), max_length=8, choices=[
-        ('debit', _('Debit')),
-        ('credit', _('Credit')),
-        ])
 
     def save(self):
         super(Operation, self).save()
@@ -186,8 +182,8 @@ class Operation(models.Model):
         return reverse('accounting:journal_details', kwargs={'j_id': self.journal.id})
 
     def __str__(self):
-        return "%d | %s | %d € | %s | %s | %s" % (
-                self.id, self.type, self.amount, self.date, self.accounting_type, self.done,
+        return "%d | %d € | %s | %s | %s" % (
+                self.id, self.amount, self.date, self.accounting_type, self.done,
                 )
 
 class AccountingType(models.Model):
diff --git a/accounting/templates/accounting/bank_account_details.jinja b/accounting/templates/accounting/bank_account_details.jinja
index 74695755..93d20581 100644
--- a/accounting/templates/accounting/bank_account_details.jinja
+++ b/accounting/templates/accounting/bank_account_details.jinja
@@ -11,7 +11,7 @@
         <li>{{ k }} - {{ v }}</li>
     {% endfor %}
     </ul>
-    <p><a href="{{ url('accounting:club_new') }}">New club account</a></p>
+    <p><a href="{{ url('accounting:club_new') }}?parent={{ object.id }}">New club account</a></p>
     <ul>
     {% for c in object.club_accounts.all() %}
         <li><a href="{{ url('accounting:club_details', c_account_id=c.id) }}">{{ c }}</a> -
diff --git a/accounting/templates/accounting/club_account_details.jinja b/accounting/templates/accounting/club_account_details.jinja
index 96fcd037..67c41bb0 100644
--- a/accounting/templates/accounting/club_account_details.jinja
+++ b/accounting/templates/accounting/club_account_details.jinja
@@ -11,7 +11,7 @@
         <li>{{ k }} - {{ v }}</li>
     {% endfor %}
     </ul>
-    <p><a href="{{ url('accounting:journal_new') }}">New journal</a></p>
+    <p><a href="{{ url('accounting:journal_new') }}?parent={{ object.id }}">New journal</a></p>
     <ul>
     {% for j in object.journals.all() %}
     <li>
diff --git a/accounting/templates/accounting/journal_details.jinja b/accounting/templates/accounting/journal_details.jinja
index 0216b16b..2b2dfcbe 100644
--- a/accounting/templates/accounting/journal_details.jinja
+++ b/accounting/templates/accounting/journal_details.jinja
@@ -8,7 +8,7 @@
 {{ object.name }}
 </p>
     <p><strong>Amount: </strong>{{ object.amount }} € - <strong>Effective amount: </strong>{{ object.effective_amount }} €</p>
-    <p><a href="{{ url('accounting:op_new') }}">New operation</a></p>
+    <p><a href="{{ url('accounting:op_new') }}?parent={{ object.id }}">New operation</a></p>
     <table>
         <tr>
             <td>Nb</td>
diff --git a/accounting/views.py b/accounting/views.py
index 5563dd4e..953b0fcc 100644
--- a/accounting/views.py
+++ b/accounting/views.py
@@ -24,7 +24,7 @@ class AccountingTypeEditView(CanViewMixin, UpdateView):
     model = AccountingType
     pk_url_kwarg = "type_id"
     fields = ['code', 'label', 'movement_type']
-    template_name = 'accounting/account_edit.jinja'
+    template_name = 'core/edit.jinja'
 
 class AccountingTypeCreateView(CanEditPropMixin, CreateView): # TODO: move to CanCreateMixin
     """
@@ -32,7 +32,7 @@ class AccountingTypeCreateView(CanEditPropMixin, CreateView): # TODO: move to Ca
     """
     model = AccountingType
     fields = ['code', 'label', 'movement_type']
-    template_name = 'accounting/account_edit.jinja'
+    template_name = 'core/create.jinja'
 
 # BankAccount views
 
@@ -49,8 +49,8 @@ class BankAccountEditView(CanViewMixin, UpdateView):
     """
     model = BankAccount
     pk_url_kwarg = "b_account_id"
-    fields = ['name', 'rib', 'number']
-    template_name = 'accounting/account_edit.jinja'
+    fields = ['name', 'iban', 'number']
+    template_name = 'core/edit.jinja'
 
 class BankAccountDetailView(CanViewMixin, DetailView):
     """
@@ -65,8 +65,8 @@ class BankAccountCreateView(CanEditPropMixin, CreateView): # TODO: move to CanCr
     Create a bank account (for the admins)
     """
     model = BankAccount
-    fields = ['name', 'rib', 'number']
-    template_name = 'accounting/account_edit.jinja'
+    fields = ['name', 'iban', 'number']
+    template_name = 'core/create.jinja'
 
 class BankAccountDeleteView(CanEditPropMixin, DeleteView): # TODO change Delete to Close
     """
@@ -86,7 +86,7 @@ class ClubAccountEditView(CanViewMixin, UpdateView):
     model = ClubAccount
     pk_url_kwarg = "c_account_id"
     fields = ['name', 'club', 'bank_account']
-    template_name = 'accounting/account_edit.jinja'
+    template_name = 'core/edit.jinja'
 
 class ClubAccountDetailView(CanViewMixin, DetailView):
     """
@@ -102,7 +102,15 @@ class ClubAccountCreateView(CanEditPropMixin, CreateView): # TODO: move to CanCr
     """
     model = ClubAccount
     fields = ['name', 'club', 'bank_account']
-    template_name = 'accounting/account_edit.jinja'
+    template_name = 'core/create.jinja'
+
+    def get_initial(self):
+        ret = super(ClubAccountCreateView, self).get_initial()
+        if 'parent' in self.request.GET.keys():
+            obj = BankAccount.objects.filter(id=int(self.request.GET['parent'])).first()
+            if obj is not None:
+                ret['bank_account'] = obj.id
+        return ret
 
 class ClubAccountDeleteView(CanEditPropMixin, DeleteView): # TODO change Delete to Close
     """
@@ -120,8 +128,16 @@ class JournalCreateView(CanCreateMixin, CreateView):
     Create a general journal
     """
     model = GeneralJournal
-    template_name = 'accounting/account_edit.jinja'
     fields = ['name', 'start_date', 'club_account']
+    template_name = 'core/create.jinja'
+
+    def get_initial(self):
+        ret = super(JournalCreateView, self).get_initial()
+        if 'parent' in self.request.GET.keys():
+            obj = ClubAccount.objects.filter(id=int(self.request.GET['parent'])).first()
+            if obj is not None:
+                ret['club_account'] = obj.id
+        return ret
 
 class JournalDetailView(CanViewMixin, DetailView):
     """
@@ -138,7 +154,7 @@ class JournalEditView(CanEditMixin, UpdateView):
     model = GeneralJournal
     pk_url_kwarg = "j_id"
     fields = ['name', 'start_date', 'club_account']
-    template_name = 'accounting/account_edit.jinja'
+    template_name = 'core/edit.jinja'
 
 # Operation views
 
@@ -147,8 +163,19 @@ class OperationCreateView(CanEditMixin, CreateView): # TODO: move to CanCreateMi
     Create an operation
     """
     model = Operation
-    fields = ['type', 'amount', 'label', 'remark', 'journal', 'date', 'cheque_number', 'accounting_type', 'done']
-    template_name = 'accounting/account_edit.jinja'
+    # fields = ['type', 'amount', 'label', 'remark', 'journal', 'date', 'cheque_number', 'accounting_type', 'done']
+    form_class = modelform_factory(Operation,
+            fields=['amount', 'label', 'remark', 'journal', 'date', 'cheque_number', 'accounting_type', 'done'],
+            widgets={'journal': HiddenInput})
+    template_name = 'core/create.jinja'
+
+    def get_initial(self):
+        ret = super(OperationCreateView, self).get_initial()
+        if 'parent' in self.request.GET.keys():
+            obj = GeneralJournal.objects.filter(id=int(self.request.GET['parent'])).first()
+            if obj is not None:
+                ret['journal'] = obj.id
+        return ret
 
 class OperationEditView(CanViewMixin, UpdateView):
     """
@@ -157,5 +184,5 @@ class OperationEditView(CanViewMixin, UpdateView):
     model = Operation
     pk_url_kwarg = "op_id"
     fields = ['amount', 'label', 'remark', 'date', 'cheque_number', 'accounting_type', 'done']
-    template_name = 'accounting/account_edit.jinja'
+    template_name = 'core/edit.jinja'
 
diff --git a/accounting/templates/accounting/account_edit.jinja b/core/templates/core/create.jinja
similarity index 89%
rename from accounting/templates/accounting/account_edit.jinja
rename to core/templates/core/create.jinja
index 092f0666..611f93ed 100644
--- a/accounting/templates/accounting/account_edit.jinja
+++ b/core/templates/core/create.jinja
@@ -1,7 +1,7 @@
 {% extends "core/base.jinja" %}
 
 {% block content %}
-    <h2>Edit account</h2>
+    <h2>Create</h2>
     <form action="" method="post">
         {% csrf_token %}
         {{ form.as_p() }}
@@ -11,3 +11,4 @@
 
 
 
+
diff --git a/core/templates/core/edit.jinja b/core/templates/core/edit.jinja
new file mode 100644
index 00000000..b44cdbbd
--- /dev/null
+++ b/core/templates/core/edit.jinja
@@ -0,0 +1,13 @@
+{% extends "core/base.jinja" %}
+
+{% block content %}
+    <h2>Edit {{ object }}</h2>
+    <form action="" method="post">
+        {% csrf_token %}
+        {{ form.as_p() }}
+        <p><input type="submit" value="Save!" /></p>
+    </form>
+{% endblock %}
+
+
+