-
+
{{ form.name }}
{% if form.name.errors %}{% for error in form.name.errors %}{{error}}{% endfor %}{% endif %}
diff --git a/templates/billing/clients/details.html b/billing/templates/clients/details.html
similarity index 100%
rename from templates/billing/clients/details.html
rename to billing/templates/clients/details.html
diff --git a/templates/billing/clients/listing.html b/billing/templates/clients/listing.html
similarity index 100%
rename from templates/billing/clients/listing.html
rename to billing/templates/clients/listing.html
diff --git a/templates/billing/compta.html b/billing/templates/compta.html
similarity index 100%
rename from templates/billing/compta.html
rename to billing/templates/compta.html
diff --git a/templates/billing/contracts/create.html b/billing/templates/contracts/create.html
similarity index 100%
rename from templates/billing/contracts/create.html
rename to billing/templates/contracts/create.html
diff --git a/templates/billing/contracts/details.html b/billing/templates/contracts/details.html
similarity index 100%
rename from templates/billing/contracts/details.html
rename to billing/templates/contracts/details.html
diff --git a/templates/billing/contracts/listing.html b/billing/templates/contracts/listing.html
similarity index 100%
rename from templates/billing/contracts/listing.html
rename to billing/templates/contracts/listing.html
diff --git a/templates/billing/prestations/create.html b/billing/templates/prestations/create.html
similarity index 100%
rename from templates/billing/prestations/create.html
rename to billing/templates/prestations/create.html
diff --git a/templates/billing/prestations/listing.html b/billing/templates/prestations/listing.html
similarity index 100%
rename from templates/billing/prestations/listing.html
rename to billing/templates/prestations/listing.html
diff --git a/billing/views.py b/billing/views.py
index f45f949..ffde0a1 100644
--- a/billing/views.py
+++ b/billing/views.py
@@ -49,7 +49,7 @@ def client_listing(request):
""" Récupère la liste de tous les clients. """
client_list = Client.objects.all()
context = {"client_list": client_list}
- return render(request, "billing/clients/listing.html", context)
+ return render(request, "clients/listing.html", context)
@login_required
@@ -62,7 +62,7 @@ def client_details(request, client_id=None):
"""
client = get_object_or_404(Client, pk=client_id)
context = {"client": client}
- return render(request, "billing/clients/details.html", context)
+ return render(request, "clients/details.html", context)
@login_required
@@ -90,7 +90,7 @@ def client_create_or_update(request, client_id=None):
form = ClientForm(instance=client)
context = {"form": form, "client_id": client_id}
- return render(request, "billing/clients/create.html", context)
+ return render(request, "clients/create.html", context)
@login_required
@@ -99,7 +99,7 @@ def contract_listing(request):
""" Récupère la liste de tous les contrats. """
contract_list = Contract.objects.all()
context = {"contract_list": contract_list}
- return render(request, "billing/contracts/listing.html", context)
+ return render(request, "contracts/listing.html", context)
@login_required
@@ -125,7 +125,7 @@ def contract_detail(request, contract_id):
"prestation_count": prestation_count,
"total": total,
}
- return render(request, "billing/contracts/details.html", context)
+ return render(request, "contracts/details.html", context)
@login_required
@@ -153,7 +153,7 @@ def contract_create_or_update(request, contract_id=None):
form = ContractForm(instance=contract)
context = {"form": form, "contract_id": contract_id}
- return render(request, "billing/contracts/create.html", context)
+ return render(request, "contracts/create.html", context)
@login_required
@@ -206,7 +206,7 @@ def prestation_create_or_update(request, prestation_id=None):
form = PrestationForm(instance=prestation)
context = {"form": form, "prestation_id": prestation_id}
- return render(request, "billing/prestations/create.html", context)
+ return render(request, "prestations/create.html", context)
@login_required
diff --git a/comptaClub/settings.py b/comptaClub/settings.py
index ee831c4..ace86f2 100644
--- a/comptaClub/settings.py
+++ b/comptaClub/settings.py
@@ -47,10 +47,12 @@ INSTALLED_APPS = [
"django.contrib.messages",
"django.contrib.staticfiles",
"comptabilite.apps.ComptabiliteConfig",
+ "core.apps.CoreConfig",
"eventCompta.apps.ManagementConfig",
"billing.apps.BillingConfig",
"django.contrib.humanize",
"django_select2",
+ "django_admin_listfilter_dropdown",
]
MIDDLEWARE = [
diff --git a/templates/comptability/export_table.html b/comptabilite/templates/export_table.html
similarity index 100%
rename from templates/comptability/export_table.html
rename to comptabilite/templates/export_table.html
diff --git a/templates/comptability/transactions/create.html b/comptabilite/templates/transactions/create.html
similarity index 100%
rename from templates/comptability/transactions/create.html
rename to comptabilite/templates/transactions/create.html
diff --git a/templates/comptability/transactions/details.html b/comptabilite/templates/transactions/details.html
similarity index 100%
rename from templates/comptability/transactions/details.html
rename to comptabilite/templates/transactions/details.html
diff --git a/templates/comptability/transactions/listing.html b/comptabilite/templates/transactions/listing.html
similarity index 100%
rename from templates/comptability/transactions/listing.html
rename to comptabilite/templates/transactions/listing.html
diff --git a/templates/comptability/year_listing.html b/comptabilite/templates/year_listing.html
similarity index 100%
rename from templates/comptability/year_listing.html
rename to comptabilite/templates/year_listing.html
diff --git a/templates/comptability/year_transaction_export_ooo.html b/comptabilite/templates/year_transaction_export_ooo.html
similarity index 100%
rename from templates/comptability/year_transaction_export_ooo.html
rename to comptabilite/templates/year_transaction_export_ooo.html
diff --git a/templates/comptability/year_transaction_export_spf.html b/comptabilite/templates/year_transaction_export_spf.html
similarity index 100%
rename from templates/comptability/year_transaction_export_spf.html
rename to comptabilite/templates/year_transaction_export_spf.html
diff --git a/templates/comptability/year_transaction_export_sxs.html b/comptabilite/templates/year_transaction_export_sxs.html
similarity index 100%
rename from templates/comptability/year_transaction_export_sxs.html
rename to comptabilite/templates/year_transaction_export_sxs.html
diff --git a/templates/comptability/year_transaction_listing.html b/comptabilite/templates/year_transaction_listing.html
similarity index 100%
rename from templates/comptability/year_transaction_listing.html
rename to comptabilite/templates/year_transaction_listing.html
diff --git a/comptabilite/views.py b/comptabilite/views.py
index e0fa399..bc3864a 100644
--- a/comptabilite/views.py
+++ b/comptabilite/views.py
@@ -343,7 +343,7 @@ def year_listing(request):
year_list.append((year.year, Transaction.objects.by_year(year.year).count(),))
context = {"year_list": year_list}
- return render(request, "comptability/year_listing.html", context)
+ return render(request, "year_listing.html", context)
@login_required
@@ -390,7 +390,7 @@ def transaction_listing_for_year_and_type(
"total_simulated": total_simulated,
"total": total,
}
- return render(request, "comptability/transactions/listing.html", context)
+ return render(request, "transactions/listing.html", context)
@login_required
@@ -402,7 +402,7 @@ def transaction_details(request, transaction_id):
transaction = Transaction.objects.get(pk=transaction_id)
context = {"event": transaction.event, "transaction": transaction}
# changed template
- return render(request, "comptability/transactions/details.html", context)
+ return render(request, "transactions/details.html", context)
@login_required
@@ -430,4 +430,4 @@ def transaction_create_or_update(request, transaction_id=None):
form = TransactionForm(instance=transaction)
context = {"form": form, "transaction_id": transaction_id}
- return render(request, "comptability/transactions/create.html", context)
+ return render(request, "transactions/create.html", context)
diff --git a/core/apps.py b/core/apps.py
new file mode 100644
index 0000000..aa7e4d9
--- /dev/null
+++ b/core/apps.py
@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class CoreConfig(AppConfig):
+ default_auto_field = 'django.db.models.BigAutoField'
+ name = "core"
+ verbose_name = "Core"
diff --git a/templates/base.html b/core/templates/base.html
similarity index 100%
rename from templates/base.html
rename to core/templates/base.html
diff --git a/templates/login.html b/core/templates/login.html
similarity index 75%
rename from templates/login.html
rename to core/templates/login.html
index 74401a9..a48751e 100644
--- a/templates/login.html
+++ b/core/templates/login.html
@@ -47,7 +47,7 @@
{% if message %}
-