Add nice whole file support

accounting/migrations/0017_auto_20160810_0547.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounting', '0016_auto_20160807_2000'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='operation',
+            name='invoice',
+            field=models.ForeignKey(blank=True, related_name='operations', to='core.SithFile', null=True, verbose_name='invoice'),
+        ),
+    ]

accounting/models.py

@@ -7,7 +7,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.template import defaultfilters
 
 from decimal import Decimal
-from core.models import User
+from core.models import User, SithFile
 from club.models import Club
 
 class CurrencyField(models.DecimalField):
@@ -156,7 +156,7 @@ class Operation(models.Model):
     remark = models.TextField(_('remark'), max_length=255)
     mode = models.CharField(_('payment method'), max_length=255, choices=settings.SITH_ACCOUNTING_PAYMENT_METHOD)
     cheque_number = models.IntegerField(_('cheque number'), default=-1)
-    invoice = models.FileField(upload_to='invoices', verbose_name=_("invoice"), null=True, blank=True)
+    invoice = models.ForeignKey(SithFile, related_name='operations', verbose_name=_("invoice"), null=True, blank=True)
     done = models.BooleanField(_('is done'), default=False)
     accounting_type = models.ForeignKey('AccountingType', related_name="operations", verbose_name=_("accounting type"))
     target_type = models.CharField(_('target type'), max_length=10,

accounting/templates/accounting/journal_details.jinja

@@ -27,6 +27,7 @@
             <td>{% trans %}Nature{% endtrans %}</td>
             <td>{% trans %}Done{% endtrans %}</td>
             <td>{% trans %}Comment{% endtrans %}</td>
+            <td>{% trans %}File{% endtrans %}</td>
             <td>{% trans %}Actions{% endtrans %}</td>
         </tr>
         </thead>
@@ -51,6 +52,11 @@
             <td>{% trans %}No{% endtrans %}</td>
             {% endif %}
             <td>{{ o.remark }}</td>
+            {% if o.invoice %}
+            <td><a href="{{ url('core:download') + '?file=' + o.invoice.name }}">{{ o.invoice.name }}</a></td>
+            {% else %}
+            <td>-</td>
+            {% endif %}
             <td>
                 {% if not o.journal.closed %}
                 <a href="{{ url('accounting:op_edit', op_id=o.id) }}">{% trans %}Edit{% endtrans %}</a>

accounting/views.py

@@ -4,8 +4,10 @@ from django.shortcuts import render
 from django.core.urlresolvers import reverse_lazy
 from django.forms.models import modelform_factory
 from django.forms import HiddenInput
+from django.forms.extras.widgets import SelectDateWidget
 
 from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin, CanCreateMixin
+from core.views.forms import SelectFile
 from accounting.models import BankAccount, ClubAccount, GeneralJournal, Operation, AccountingType, Company
 
 # Accounting types
@@ -166,7 +168,7 @@ class OperationCreateView(CanCreateMixin, CreateView):
     form_class = modelform_factory(Operation,
             fields=['amount', 'label', 'remark', 'journal', 'target_type', 'target_id', 'target_label', 'date', 'mode',
                 'cheque_number', 'invoice', 'accounting_type', 'done'],
-            widgets={'journal': HiddenInput})
+            widgets={'journal': HiddenInput, 'date': SelectDateWidget})
     template_name = 'core/create.jinja'
 
     def get_initial(self):
@@ -183,8 +185,10 @@ class OperationEditView(CanEditMixin, UpdateView):
     """
     model = Operation
     pk_url_kwarg = "op_id"
-    fields = ['amount', 'label', 'remark', 'target_type', 'target_id', 'target_label', 'date', 'mode', 'cheque_number',
-            'invoice', 'accounting_type', 'done']
+    form_class = modelform_factory(Operation,
+            fields = ['amount', 'label', 'remark', 'target_type', 'target_id', 'target_label', 'date', 'mode', 'cheque_number',
+                    'invoice', 'accounting_type', 'done'],
+            widgets={'date': SelectDateWidget, 'invoice': SelectFile})
     template_name = 'core/edit.jinja'
 
 # Company views