X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=sql-ledger%2Ftemplates%2FFrench-sales_order.tex;h=ceefade72ee4455ce93fffde7f2eed7157ccfaf6;hp=88e142fce626ca33757b4753db21a8f6b05328e8;hb=32306b5f8ffe4ce594409aa6e89626740b225a39;hpb=52072fcd26f2faf57923f598c358e7f47c4e2643

diff --git a/sql-ledger/templates/French-sales_order.tex b/sql-ledger/templates/French-sales_order.tex
index 88e142fce..ceefade72 100644
--- a/sql-ledger/templates/French-sales_order.tex
+++ b/sql-ledger/templates/French-sales_order.tex
@@ -45,7 +45,7 @@
 \pagestyle{myheadings}
 %\thispagestyle{empty}     use this with letterhead paper
 
-<%pagebreak 90 27 48%>
+<%pagebreak 90 27 37%>
 \end{tabular*}
 
   \rule{\textwidth}{2pt}
@@ -74,13 +74,17 @@
 
 <%name%>
 
-<%addr1%>
+<%address1%>
 
-<%addr2%>
+<%if address2%>
+<%address2%>
+<%end address2%>
 
-<%addr3%>
+<%city%> <%state%> <%zipcode%>
 
-<%addr4%>
+<%if country%>
+<%country%>
+<%end country%>
 
 \vspace{3.5cm}
 
@@ -88,6 +92,9 @@
 \hfill
 \begin{tabular}[t]{l@{\hspace{0.3cm}}l}
   \textbf{Date de la commande} & <%orddate%> \\
+  <%if reqdate%>
+    \textbf{Livrable le} & <%reqdate%> \\
+  <%end reqdate%>
   \textbf{Numéro de commande} & <%ordnumber%>
 \end{tabular}