X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=sql-ledger%2Ftemplates%2FGerman-sales_order.tex;h=98f2cc40129a578642afed87366d99a1cde4bdfc;hp=21948c682087fe200e4aa1b9830c2d6be21971cb;hb=32306b5f8ffe4ce594409aa6e89626740b225a39;hpb=52072fcd26f2faf57923f598c358e7f47c4e2643

diff --git a/sql-ledger/templates/German-sales_order.tex b/sql-ledger/templates/German-sales_order.tex
index 21948c682..98f2cc401 100644
--- a/sql-ledger/templates/German-sales_order.tex
+++ b/sql-ledger/templates/German-sales_order.tex
@@ -73,21 +73,28 @@
 
 <%name%>
 
-<%addr1%>
+<%address1%>
 
-<%addr2%>
+<%if address2%>
+<%address2%>
+<%end address2%>
 
-<%addr3%>
+<%city%> <%state%> <%zipcode%>
 
-<%addr4%>
+<%if country%>
+<%country%>
+<%end country%>
 
 \vspace{3.5cm}
 
 \textbf{B E S T E L L U N G}
 \hfill
 \begin{tabular}[t]{l@{\hspace{0.3cm}}l}
-  \textbf{Datum} & <%orddate%> \\
-  \textbf{Nummer} & <%ordnumber%>
+  \textbf{Bestelldatum} & <%orddate%> \\
+<%if reqdate%>
+  \textbf{Lieferbar bei} & <%reqdate%> \\
+<%end reqdate%>
+  \textbf{Bestellnummer} & <%ordnumber%>
 \end{tabular}
 
 \vspace{1cm}