X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=sql-ledger%2Ftemplates%2FGerman-invoice.html;h=d181bdae24335419d106ac9927bfc1dcef98441f;hp=b2128c959616793788ee9e518c88e8d3d9ec40df;hb=c2146ae32fdef80049abfa13098db2d45f3ebdd5;hpb=c0567c688084e89fcd11bf82348b6c418f1254ac
diff --git a/sql-ledger/templates/German-invoice.html b/sql-ledger/templates/German-invoice.html
index b2128c959..d181bdae2 100644
--- a/sql-ledger/templates/German-invoice.html
+++ b/sql-ledger/templates/German-invoice.html
@@ -77,17 +77,25 @@
<%name%>
-
<%addr1%>
-
<%addr2%>
-
<%addr3%>
-
<%addr4%>
+
<%address1%>
+ <%if address2%>
+
<%address2%>
+<%end address2%>
+
<%city%> <%state%> <%zipcode%>
+ <%if country%>
+<%country%>
+<%end country%>
|
<%shiptoname%>
-
<%shiptoaddr1%>
-
<%shiptoaddr2%>
-
<%shiptoaddr3%>
-
<%shiptoaddr4%>
+
<%shiptoaddress1%>
+ <%if shiptoaddress2%>
+
<%shiptoaddress2%>
+<%end shiptoaddress2%>
+
<%shiptocity%> <%shiptostate%> <%shiptozipcode%>
+ <%if shiptocountry%>
+<%shiptocountry%>
+<%end shiptocountry%>
|
@@ -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%>
-->