From c8d464cf1d2b6a0f7ab1852866c73f097acc42a8 Mon Sep 17 00:00:00 2001 From: Nathan Boiron Date: Wed, 28 Jan 2026 21:09:43 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Suppression=20de=20l'affichage=20de=20la=20?= =?UTF-8?q?colonne=20`ann=C3=A9e`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit La liste des factures est affichée par année de toute façon. --- templates/admin/accounting/invoice/list.html.twig | 2 -- 1 file changed, 2 deletions(-) diff --git a/templates/admin/accounting/invoice/list.html.twig b/templates/admin/accounting/invoice/list.html.twig index 98eeb84d1..05359b6e5 100644 --- a/templates/admin/accounting/invoice/list.html.twig +++ b/templates/admin/accounting/invoice/list.html.twig @@ -17,7 +17,6 @@ - {% for line in lines %} - From fdef9397207df9051955f947615ed9819eca4946 Mon Sep 17 00:00:00 2001 From: Nathan Boiron Date: Wed, 28 Jan 2026 21:11:09 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Am=C3=A9lioration=20de=20libell=C3=A9s=20po?= =?UTF-8?q?ur=20les=20listes=20de=20devis=20et=20factures?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/admin/accounting/invoice/list.html.twig | 6 +++--- templates/admin/accounting/quotation/list.html.twig | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/admin/accounting/invoice/list.html.twig b/templates/admin/accounting/invoice/list.html.twig index 05359b6e5..4e7b3c951 100644 --- a/templates/admin/accounting/invoice/list.html.twig +++ b/templates/admin/accounting/invoice/list.html.twig @@ -28,10 +28,10 @@ - + - - + + diff --git a/templates/admin/accounting/quotation/list.html.twig b/templates/admin/accounting/quotation/list.html.twig index 9a112d3d0..f96c8830c 100644 --- a/templates/admin/accounting/quotation/list.html.twig +++ b/templates/admin/accounting/quotation/list.html.twig @@ -31,8 +31,8 @@ - - + + @@ -42,7 +42,7 @@ - + From c652082f827f008b03ffd07fb2bc10cc3bf7b8ed Mon Sep 17 00:00:00 2001 From: Nathan Boiron Date: Thu, 29 Jan 2026 10:49:31 +0100 Subject: [PATCH 3/3] =?UTF-8?q?Libell=C3=A9s=20dynamiques=20en=20fonction?= =?UTF-8?q?=20de=20la=20p=C3=A9riode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pour prendre en compte l'époque où l'asso n'était pas soumise à la TVA. --- .../Admin/Accounting/Invoice/ListInvoiceAction.php | 2 ++ .../Admin/Accounting/Quotation/ListQuotationAction.php | 2 ++ templates/admin/accounting/invoice/list.html.twig | 6 ++++-- templates/admin/accounting/quotation/list.html.twig | 4 +++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sources/AppBundle/Controller/Admin/Accounting/Invoice/ListInvoiceAction.php b/sources/AppBundle/Controller/Admin/Accounting/Invoice/ListInvoiceAction.php index d6f7a1cb1..469b9f29f 100644 --- a/sources/AppBundle/Controller/Admin/Accounting/Invoice/ListInvoiceAction.php +++ b/sources/AppBundle/Controller/Admin/Accounting/Invoice/ListInvoiceAction.php @@ -4,6 +4,7 @@ namespace AppBundle\Controller\Admin\Accounting\Invoice; +use Afup\Site\Utils\Vat; use AppBundle\Accounting\Form\InvoicingPeriodType; use AppBundle\Accounting\InvoicingPaymentStatus; use AppBundle\Accounting\Model\Invoicing; @@ -52,6 +53,7 @@ public function __invoke(Request $request): Response 'direction' => $direction, 'sort' => $sort, 'totalHt' => $totalHt, + 'isSubjectedToVat' => Vat::isSubjectedToVat($period->getEndDate()), ])); } } diff --git a/sources/AppBundle/Controller/Admin/Accounting/Quotation/ListQuotationAction.php b/sources/AppBundle/Controller/Admin/Accounting/Quotation/ListQuotationAction.php index 14b40ec0d..34218afc5 100644 --- a/sources/AppBundle/Controller/Admin/Accounting/Quotation/ListQuotationAction.php +++ b/sources/AppBundle/Controller/Admin/Accounting/Quotation/ListQuotationAction.php @@ -4,6 +4,7 @@ namespace AppBundle\Controller\Admin\Accounting\Quotation; +use Afup\Site\Utils\Vat; use AppBundle\Accounting\Form\InvoicingPeriodType; use AppBundle\Accounting\Model\Repository\InvoicingRepository; use AppBundle\Accounting\Model\Repository\InvoicingPeriodRepository; @@ -38,6 +39,7 @@ public function __invoke(Request $request): Response 'formPeriod' => $formPeriod->createView(), 'direction' => $direction, 'sort' => $sort, + 'isSubjectedToVat' => Vat::isSubjectedToVat($period->getEndDate()), ])); } } diff --git a/templates/admin/accounting/invoice/list.html.twig b/templates/admin/accounting/invoice/list.html.twig index 4e7b3c951..2ab9cc79c 100644 --- a/templates/admin/accounting/invoice/list.html.twig +++ b/templates/admin/accounting/invoice/list.html.twig @@ -31,7 +31,9 @@ - + @@ -89,7 +91,7 @@
Année Date @@ -39,7 +38,6 @@
{{ line.quotationDate|date('Y') }} {{ line.quotationDate|format_date('short') }} {{ line.company }} {{ line.city }}VilleNumero factureNuméro facture Référence clientEtat paiementPrixÉtat paiementMontant HT
Ville Ref clientNumero devisPrixNuméro devisMontant HT Facturé ?  
{{ line.quotationDate|format_date('short') }} {{ line.company }}{{ line.city }}{{ line.city }} {{ line.refClt1 }} {{ line.quotationNumber }} {{ line.price|number_format(2, ',', ' ') }}Numéro facture Référence client État paiementMontant HT + Montant{% if isSubjectedToVat %} HT{% endif %} +
- Total facturé en HT sur cette période : {{ totalHt|number_format(2, ',', ' ') }} € + Total facturé {% if isSubjectedToVat %}en HT{% endif %} sur cette période : {{ totalHt|number_format(2, ',', ' ') }} €
{% else %}
diff --git a/templates/admin/accounting/quotation/list.html.twig b/templates/admin/accounting/quotation/list.html.twig index f96c8830c..f470fcf96 100644 --- a/templates/admin/accounting/quotation/list.html.twig +++ b/templates/admin/accounting/quotation/list.html.twig @@ -32,7 +32,9 @@ Ville Ref client Numéro devis - Montant HT + + Montant{% if isSubjectedToVat %} HT{% endif %} + Facturé ?