From 9232282cdf9e8511e5dc6189d8a5b3e8463bcb51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Kervella?= <kervella.mael@gmail.com>
Date: Wed, 11 Apr 2018 18:38:07 +0000
Subject: [PATCH] Align PDF invoice info and better hline for tables

---
 .../templates/cotisations/factures.tex        | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/cotisations/templates/cotisations/factures.tex b/cotisations/templates/cotisations/factures.tex
index 4751edc1..1f1fe0cf 100644
--- a/cotisations/templates/cotisations/factures.tex
+++ b/cotisations/templates/cotisations/factures.tex
@@ -37,7 +37,7 @@
 \pagestyle{empty} % No page numbers
 \linespread{1.5} % Line spacing
 
-\setlength{\doublerulesep}{\arrayrulewidth} % Double rules look like one thick one
+\newcommand{\doublehline}{\noalign{\hrule height 1pt}}
 \setlength{\parindent}{0cm}
 
 
@@ -55,28 +55,30 @@
     \hrule
     \smallskip
 
-    \begin{multicols}{2}
-        \begin{tabular}{@{\extracolsep{\fill}}l r}
-        {\bf Adresse :} & {{line1|safe}} \\
-                        & {{line2|safe}} \\
+    {\setlength{\tabcolsep}{0pt} % Make table columns tighter, usefull for postionning
+        \begin{tabular}{l l}
+            {\bf Adresse :}~ & {{line1|safe}} \\
+                             & {{line2|safe}} \\
         \end{tabular}
-    \columnbreak
-        \\
-        {\bf Téléphone :} {{phone}} \\
-        {\bf Mail :} {{email|safe}}
-    \end{multicols}
-
+        \hfill
+        \begin{tabular}{r}
+            {\bf Téléphone :} {{phone}} \\
+            {\bf Mail :} {{email|safe}} \\
+        \end{tabular}
+    }
+    \\
     {\bf Siret :} {{siret|safe}}
-    
-    \vspace{2cm}
 
+    \vspace{2cm}
+     
     \begin{tabular*}{\textwidth}{@{\extracolsep{\fill}} l r}
         {\bf Pour :} {{recipient_name|safe}} & {\bf Date :} {{DATE}} \\
         {\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*}
-    {% if fid is not None %}
-    {\bf Facture n\textsuperscript{o} :} {{ fid }} \\
-    {% endif %}
+    \\
 
 
     %----------------------------------------------------------------------------------------
@@ -87,15 +89,13 @@
 
         \hline
         \textbf{Désignation} & \textbf{Prix Unit.} \euro & \textbf{Quantité} & \textbf{Prix total} \euro\\
-        \hline
-        \hline
+        \doublehline
         
         {% for a in article %}
         {{a.0.name}} & {{a.0.prix}} \euro & {{a.1}} & {{a.2}} \euro\\
         \hline
         {% endfor %}
         
-        \hline
     \end{tabularx}
     
     \vspace{1cm}
@@ -105,10 +105,9 @@
             \hline
             \textbf{Total} & {{total|floatformat:2}} \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\\
             \hline
-            \hline
         \end{tabular}
     
     \vfill