import sql-ledger 2.4.4

[freeside.git] / sql-ledger / templates / German-invoice.html

diff --git a/sql-ledger/templates/German-invoice.html b/sql-ledger/templates/German-invoice.html
index b2128c9..d181bda 100644 (file)
--- a/sql-ledger/templates/German-invoice.html
+++ b/sql-ledger/templates/German-invoice.html
@@ -77,17 +77,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>
@@ -131,6 +139,7 @@ adjust the colspan if you include this to shift subtotal one to the right
 you can also use netprice instead of sellprice if you
 don't want to show the discount
 netprice = sellprice - discount
+to show the percentage for a discount use <%discountrate%>
 -->
 
     <tr>