X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=sql-ledger%2Ftemplates%2FEstonian-sales_order.tex;fp=sql-ledger%2Ftemplates%2FEstonian-sales_order.tex;h=6056039446ddcf40375c970cebbd7ccad85a1535;hp=beb32c52d7ae867884123c3b48a97af2635d3cd8;hb=32306b5f8ffe4ce594409aa6e89626740b225a39;hpb=52072fcd26f2faf57923f598c358e7f47c4e2643

diff --git a/sql-ledger/templates/Estonian-sales_order.tex b/sql-ledger/templates/Estonian-sales_order.tex
index beb32c52d..605603944 100644
--- a/sql-ledger/templates/Estonian-sales_order.tex
+++ b/sql-ledger/templates/Estonian-sales_order.tex
@@ -73,13 +73,17 @@
 
 <%name%>
 
-<%addr1%>
+<%address1%>
 
-<%addr2%>
+<%if address2%>
+<%address2%>
+<%end address2%>
 
-<%addr3%>
+<%city%> <%state%> <%zipcode%>
 
-<%addr4%>
+<%if country%>
+<%country%>
+<%end country%>
 
 \vspace{3.5cm}
 
@@ -87,6 +91,9 @@
 \hfill
 \begin{tabular}[t]{l@{\hspace{0.3cm}}l}
   \textbf{Kuupäev} & <%orddate%> \\
+<%if reqdate%>
+  \textbf{Tarnekuupäev} & <%reqdate%> \\
+<%end reqdate%>
   \textbf{Number} & <%ordnumber%>
 \end{tabular}