X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=sql-ledger%2Ftemplates%2FGerman-sales_order.html;h=ce37fc492638482cbc71848912a6b4c845f8a46f;hp=edb8b9076305f034cdbfcec57c67e3c165c28948;hb=948b8acdd4b9b3864342062d0c397a11f57c5700;hpb=c0567c688084e89fcd11bf82348b6c418f1254ac

diff --git a/sql-ledger/templates/German-sales_order.html b/sql-ledger/templates/German-sales_order.html
index edb8b9076..ce37fc492 100644
--- a/sql-ledger/templates/German-sales_order.html
+++ b/sql-ledger/templates/German-sales_order.html
@@ -38,7 +38,7 @@
     <td align=right>
     <table>
     <tr>
-      <th align=right>Datum</th><td width=10>&nbsp;</td><td><%orddate%></td>
+      <th align=right>Bestelldatum</th><td width=10>&nbsp;</td><td><%orddate%></td>
     </tr>
   
     <tr>
@@ -66,17 +66,25 @@
 
     <tr>
       <td><%name%>
-      <br><%addr1%>
-      <br><%addr2%>
-      <br><%addr3%>
-      <br><%addr4%>
+      <br><%address1%>
+      <%if address2%>
+<br><%address2%>
+<%end address2%>
+      <br><%city%> <%state%> <%zipcode%>
+      <%if country%>
+<%country%>
+<%end country%>
       </td>
 
       <td><%shiptoname%>
-      <br><%shiptoaddr1%>
-      <br><%shiptoaddr2%>
-      <br><%shiptoaddr3%>
-      <br><%shiptoaddr4%>
+      <br><%shiptoaddress1%>
+      <%if shiptoaddress2%>
+<br><%shiptoaddress2%>
+<%end shiptoaddress2%>
+      <br><%shiptocity%> <%shiptostate%> <%shiptozipcode%>
+      <%if shiptocountry%>
+<%shiptocountry%>
+<%end shiptocountry%>
       </td>
     </tr>
     </table>