Commit 1cfc4f80 authored by Sli's avatar Sli

Merge branch 'new_django' into 'master'

Migration to django 1.11

See merge request !146
parents 39119f58 08de5dfe
Pipeline #1504 passed with stage
in 5 minutes and 32 seconds
......@@ -41,8 +41,6 @@ class CurrencyField(models.DecimalField):
"""
This is a custom database field used for currency
"""
__metaclass__ = models.SubfieldBase
def __init__(self, *args, **kwargs):
kwargs['max_digits'] = 12
kwargs['decimal_places'] = 2
......
......@@ -418,7 +418,7 @@ Welcome to the wiki page!
buying.save()
comptes = AccountingType(code='6', label="Comptes de charge", movement_type='DEBIT')
comptes.save()
simple = SimplifiedAccountingType(label='Je fais du simple 6', accounting_type=comptes, movement_type='DEBIT')
simple = SimplifiedAccountingType(label='Je fais du simple 6', accounting_type=comptes)
simple.save()
woenzco = Company(name="Woenzel & co")
woenzco.save()
......
......@@ -31,7 +31,7 @@ from django.forms.models import modelform_factory
from django.conf import settings
from django.utils.translation import ugettext_lazy as _
from django.http import HttpResponse
from django.core.servers.basehttp import FileWrapper
from wsgiref.util import FileWrapper
from django.core.urlresolvers import reverse
from django.core.exceptions import PermissionDenied
from django import forms
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment