Update pip modules and app

.gitignore

@@ -74,7 +74,7 @@ coverage.xml
 # Django stuff:
 *.log
 local_settings.py
-#db.sqlite3
+db.sqlite3
 db.sqlite3-journal
 
 # Flask stuff:
@@ -180,4 +180,7 @@ coverage.xml
 *.pot
 
 # Sphinx documentation
-docs/_build/
+docs/_build/
+
+# OS X
+.DS_Store

billing/urls.py

@@ -0,0 +1,12 @@
+from django.urls import path, re_path
+
+from . import views
+
+billing_urlpatterns = [
+    path(r"contract/pdf/<int:contractid>/", views.contract_export, name="contract_export"),
+    path(r"contract/<int:contractid>/", views.contract_detail, name="contract_detail"),
+    path(r"contract", views.contract_listing, name="contract_listing"),
+    path(r"prestation", views.prestation_listing, name="prestation_listing"),
+    path(r"client", views.client_listing, name="client_listing"),
+]
+

billing/views.py

@@ -29,7 +29,7 @@ def contract_listing(request):
 
     contract_list = Contract.objects.all()
     context = {'contract_list': contract_list}
-    return render(request, 'contract_listing.html', context)
+    return render(request, 'billing/contract/listing.html', context)
 
 
 def contract_detail(request, contractid):
@@ -46,7 +46,7 @@ def contract_detail(request, contractid):
                 'prestation_list': prestation_list,
                 'prestation_count': prestation_count,
                 'total': total}
-    return render(request, 'contract_detail.html', context)
+    return render(request, 'billing/contract/detail.html', context)
 
 
 def client_listing(request):
@@ -55,7 +55,7 @@ def client_listing(request):
     """
     client_list = Client.objects.all()
     context = {'client_list': client_list}
-    return render(request, 'client_listing.html', context)
+    return render(request, 'billing/client/listing.html', context)
 
 
 def prestation_listing(request):
@@ -64,7 +64,7 @@ def prestation_listing(request):
     """
     prestation_list = Prestation.objects.all()
     context = {'prestation_list': prestation_list}
-    return render(request, 'prestation_listing.html', context)
+    return render(request, 'billing/prestation/listing.html', context)
 
 
 Y = 841.89

compta/urls.py

@@ -0,0 +1,9 @@
+from django.urls import path, re_path
+
+from . import views
+
+compta_urlpatterns = [
+    path(r"transaction/<int:transactionid>/", views.transaction_detail, name="transaction_detail"),
+    path(r"<int:year>/", views.transaction_listing, name="transaction_listing"),
+]
+

compta/views.py

@@ -34,7 +34,7 @@ def transaction_listing(request, year):
                 'Transactions': Transaction.objects.filter(date__year = year).order_by('date') }
     
     # 3) Faire le calcul ici en "static" ou en jquery dans ma vue, en "dynamique" (suivant les cases cochées ou pas, ...)
-    return render(request, 'transaction_listing.html', context)
+    return render(request, 'compta/transaction/listing.html', context)
 
 
 def transaction_detail(request, transactionid):
@@ -44,7 +44,7 @@ def transaction_detail(request, transactionid):
 
     transaction = Transaction.objects.get(pk=transactionid)
     context = {'transaction': transaction}
-    return render(request, 'transaction_detail.html', context)
+    return render(request, 'compta/transaction/detail.html', context)
 
 
 def year_listing(request):

comptabilite/facture_config.py

@@ -10,7 +10,7 @@ def loadFactureConfig(request):
     informations = None
     with open(os.path.join(current_path, "facture_config.yaml"), 'r') as stream:
         try:
-            informations = yaml.load(stream)
+            informations = yaml.safe_load(stream)
         except yaml.YAMLError as exc:
             print(exc)
 

comptabilite/settings.py

@@ -106,3 +106,8 @@ STATICFILES_DIRS = (
     os.path.join(BASE_DIR, 'static'),   
 )
 
+# Default primary key field type
+# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
+
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+

comptabilite/urls.py

@@ -13,29 +13,26 @@ Including another URLconf
     1. Add an import:  from blog import urls as blog_urls
     2. Add a URL to urlpatterns:  url(r'^blog/', include(blog_urls))
 """
-from django.conf.urls import include, url
 from django.contrib import admin
+from django.urls import include, path
+
 from compta.views import (
-    transaction_listing,
-    transaction_detail,
     year_listing,
 )
-from billing.views import (
-    client_listing,
-    contract_listing,
-    contract_detail,
-    contract_export,
-    prestation_listing,
-)
+
+import billing.urls
+import compta.urls
 
 urlpatterns = [
-    url(r'^admin/', admin.site.urls),
-    url(r'^billing/contract/pdf/(?P<contractid>[0-9]+)', contract_export, name="contract_export"),
-    url(r'^billing/contract/(?P<contractid>[0-9]+)', contract_detail, name="contract_detail"),
-    url(r'^billing/contract', contract_listing, name="contract_listing"),
-    url(r'^billing/prestation', prestation_listing, name="prestation_listing"),
-    url(r'^billing/client', client_listing, name="client_listing"),
-    url(r'^compta/transaction/(?P<transactionid>[0-9]+)', transaction_detail, name="transaction_detail"),
-    url(r'^compta/(?P<year>[0-9]{4})', transaction_listing, name="transaction_listing"),
-    url(r'^$', year_listing, name="home")
+    # Profile list
+    path(r"billing/", include(billing.urls.billing_urlpatterns)),
+
+    # Compta
+    path(r"compta/", include(compta.urls.compta_urlpatterns)),
+
+    # Home
+    path(r"", year_listing, name="home"),
+
+    # Administration
+    path('admin/', admin.site.urls),
 ]

requirements/dev.txt

@@ -1,8 +1,8 @@
-asgiref==3.2.3
-Django==3.0.3
-Pillow==7.0.0
-pyaml==19.12.0
-pytz==2019.3
-PyYAML==5.3
-reportlab==3.5.34
-sqlparse==0.3.0
+asgiref==3.4.1
+Django==4.0
+Pillow==8.4.0
+pyaml==21.10.1
+pytz==2021.3
+PyYAML==6.0
+reportlab==3.6.5
+sqlparse==0.4.2