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

Align PDF invoice info and better hline for tables

Browse source
This commit is contained in:
Maël Kervella 2018-04-11 18:38:07 +00:00
parent d9c42e89db
commit 9232282cdf
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,7 @@
\pagestyle{empty} % No page numbers \pagestyle{empty} % No page numbers
\linespread{1.5} % Line spacing \linespread{1.5} % Line spacing
\setlength{\doublerulesep}{\arrayrulewidth} % Double rules look like one thick one \newcommand{\doublehline}{\noalign{\hrule height 1pt}}
\setlength{\parindent}{0cm} \setlength{\parindent}{0cm}
@ -55,17 +55,18 @@
\hrule \hrule
\smallskip \smallskip
\begin{multicols}{2} {\setlength{\tabcolsep}{0pt} % Make table columns tighter, usefull for postionning
\begin{tabular}{@{\extracolsep{\fill}}l r} \begin{tabular}{l l}
{\bf Adresse :} & {{line1|safe}} \\ {\bf Adresse :}~ & {{line1|safe}} \\
& {{line2|safe}} \\ & {{line2|safe}} \\
\end{tabular} \end{tabular}
\columnbreak \hfill
\\ \begin{tabular}{r}
{\bf Téléphone :} {{phone}} \\ {\bf Téléphone :} {{phone}} \\
{\bf Mail :} {{email|safe}} {\bf Mail :} {{email|safe}} \\
\end{multicols} \end{tabular}
}
\\
{\bf Siret :} {{siret|safe}} {\bf Siret :} {{siret|safe}}
\vspace{2cm} \vspace{2cm}
@ -73,10 +74,11 @@
\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 %} & \\
{% if fid is not None %}
{\bf Facture n\textsuperscript{o} :} {{ fid }} & \\
{% endif %}
\end{tabular*} \end{tabular*}
{% if fid is not None %} \\
{\bf Facture n\textsuperscript{o} :} {{ fid }} \\
{% endif %}
%---------------------------------------------------------------------------------------- %----------------------------------------------------------------------------------------
@ -87,15 +89,13 @@
\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\\
\hline \doublehline
\hline
{% for a in article %} {% for a in article %}
{{a.0.name}} & {{a.0.prix}} \euro & {{a.1}} & {{a.2}} \euro\\ {{a.0.name}} & {{a.0.prix}} \euro & {{a.1}} & {{a.2}} \euro\\
\hline \hline
{% endfor %} {% endfor %}
\hline
\end{tabularx} \end{tabularx}
\vspace{1cm} \vspace{1cm}
@ -105,10 +105,9 @@
\hline \hline
\textbf{Total} & {{total|floatformat:2}} \euro \\ \textbf{Total} & {{total|floatformat:2}} \euro \\
\textbf{Votre règlement} & {% if paid %}{{total|floatformat:2}}{% else %} 00,00 {% endif %} \euro \\ \textbf{Votre règlement} & {% if paid %}{{total|floatformat:2}}{% else %} 00,00 {% endif %} \euro \\
\hline \doublehline
\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
\hline
\end{tabular} \end{tabular}
\vfill \vfill