Merge branch 'new_django' into 'master'

Migration to django 1.11

See merge request ae/Sith!146
This commit is contained in:
Antoine Bartuccio 2018-06-10 16:37:57 +02:00
commit 1cfc4f8092
4 changed files with 4 additions and 6 deletions

View File

@ -41,8 +41,6 @@ class CurrencyField(models.DecimalField):
""" """
This is a custom database field used for currency This is a custom database field used for currency
""" """
__metaclass__ = models.SubfieldBase
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
kwargs['max_digits'] = 12 kwargs['max_digits'] = 12
kwargs['decimal_places'] = 2 kwargs['decimal_places'] = 2

View File

@ -418,7 +418,7 @@ Welcome to the wiki page!
buying.save() buying.save()
comptes = AccountingType(code='6', label="Comptes de charge", movement_type='DEBIT') comptes = AccountingType(code='6', label="Comptes de charge", movement_type='DEBIT')
comptes.save() 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() simple.save()
woenzco = Company(name="Woenzel & co") woenzco = Company(name="Woenzel & co")
woenzco.save() woenzco.save()

View File

@ -31,7 +31,7 @@ from django.forms.models import modelform_factory
from django.conf import settings from django.conf import settings
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.http import HttpResponse 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.urlresolvers import reverse
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from django import forms from django import forms

View File

@ -1,11 +1,11 @@
# Django 1.8 LTS is required, version 1.9 is not supported # Django 1.8 LTS is required, version 1.9 is not supported
Django >=1.8,<1.9 Django >=1.11, <2.0
Pillow Pillow
mistune mistune
django-jinja django-jinja
pyopenssl pyopenssl
pytz pytz
djangorestframework <3.7 djangorestframework
django-phonenumber-field django-phonenumber-field
django-ajax-selects django-ajax-selects
reportlab reportlab