rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-27 07:02:26 +00:00
Code Issues Releases Wiki Activity

Display payment method on invoices

Browse source
This commit is contained in:
Hugo LEVY-FALK 2018-12-29 15:15:33 +01:00 committed by chirac
parent e7a7e81a2c
commit fd57a9b925
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cotisations/templates/cotisations/factures.tex
View file

@ -43,7 +43,7 @@
\begin{document} \begin{document}
%---------------------------------------------------------------------------------------- %----------------------------------------------------------------------------------------
% HEADING SECTION % HEADING SECTION
%---------------------------------------------------------------------------------------- %----------------------------------------------------------------------------------------
@ -70,7 +70,7 @@
{\bf Siret :} {{siret|safe}} {\bf Siret :} {{siret|safe}}
\vspace{2cm} \vspace{2cm}
\begin{tabular*}{\textwidth}{@{\extracolsep{\fill}} l r} \begin{tabular*}{\textwidth}{@{\extracolsep{\fill}} l r}
{\bf Pour :} {{recipient_name|safe}} & {\bf Date :} {{DATE}} \\ {\bf Pour :} {{recipient_name|safe}} & {\bf Date :} {{DATE}} \\
{\bf Adresse :} {% if address is None %}Aucune adresse renseignée{% else %}{{address}}{% endif %} & \\ {\bf Adresse :} {% if address is None %}Aucune adresse renseignée{% else %}{{address}}{% endif %} & \\
@ -84,20 +84,20 @@
%---------------------------------------------------------------------------------------- %----------------------------------------------------------------------------------------
% TABLE OF EXPENSES % TABLE OF EXPENSES
%---------------------------------------------------------------------------------------- %----------------------------------------------------------------------------------------
\begin{tabularx}{\textwidth}{|X|r|r|r|} \begin{tabularx}{\textwidth}{|X|r|r|r|}
\hline \hline
\textbf{Désignation} & \textbf{Prix Unit.} \euro & \textbf{Quantité} & \textbf{Prix total} \euro\\ \textbf{Désignation} & \textbf{Prix Unit.} \euro & \textbf{Quantité} & \textbf{Prix total} \euro\\
\doublehline \doublehline
{% for a in article %} {% for a in article %}
{{a.name}} & {{a.price}} \euro & {{a.quantity}} & {{a.total_price}} \euro\\ {{a.name}} & {{a.price}} \euro & {{a.quantity}} & {{a.total_price}} \euro\\
\hline \hline
{% endfor %} {% endfor %}
\end{tabularx} \end{tabularx}
\vspace{1cm} \vspace{1cm}
\hfill \hfill
@ -109,14 +109,22 @@
\textbf{À PAYER} & {% if not paid %}{{total|floatformat:2}}{% else %} 00,00 {% endif %} \euro\\ \textbf{À PAYER} & {% if not paid %}{{total|floatformat:2}}{% else %} 00,00 {% endif %} \euro\\
\hline \hline
\end{tabular} \end{tabular}
\vspace{1cm}
\begin{tabularx}{\textwidth}{c X}
\hline
\textbf{Moyen de paiement} & {{payment_method|default:"Non spécifié"}} \\
\hline
\end{tabularx}
\vfill \vfill
%---------------------------------------------------------------------------------------- %----------------------------------------------------------------------------------------
% FOOTNOTE % FOOTNOTE
%---------------------------------------------------------------------------------------- %----------------------------------------------------------------------------------------
\hrule \hrule
\smallskip \smallskip
\footnotesize{TVA non applicable, art. 293 B du CGI} \footnotesize{TVA non applicable, art. 293 B du CGI}

6
cotisations/views.py
View file

@ -270,7 +270,8 @@ def facture_pdf(request, facture, **_kwargs):
'siret': AssoOption.get_cached_value('siret'), 'siret': AssoOption.get_cached_value('siret'),
'email': AssoOption.get_cached_value('contact'), 'email': AssoOption.get_cached_value('contact'),
'phone': AssoOption.get_cached_value('telephone'), 'phone': AssoOption.get_cached_value('telephone'),
'tpl_path': os.path.join(settings.BASE_DIR, LOGO_PATH) 'tpl_path': os.path.join(settings.BASE_DIR, LOGO_PATH),
'payment_method': facture.paiement.moyen,
}) })
@ -405,7 +406,8 @@ def custom_invoice_pdf(request, invoice, **_kwargs):
'siret': AssoOption.get_cached_value('siret'), 'siret': AssoOption.get_cached_value('siret'),
'email': AssoOption.get_cached_value('contact'), 'email': AssoOption.get_cached_value('contact'),
'phone': AssoOption.get_cached_value('telephone'), 'phone': AssoOption.get_cached_value('telephone'),
'tpl_path': os.path.join(settings.BASE_DIR, LOGO_PATH) 'tpl_path': os.path.join(settings.BASE_DIR, LOGO_PATH),
'payment_method': invoice.payment,
}) })