X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=sql-ledger%2Ftemplates%2FFrench-invoice.html;h=69cae5650d3c1b47d71f681c0e36aa33f2c12638;hb=112afd3c02c998d7545a36704668f9baa373d0bd;hp=901a31737e9a7460d421440d7b0fccb3959cf094;hpb=f6c9088e16c4c083174dd1130ae58d213923cdef;p=freeside.git
diff --git a/sql-ledger/templates/French-invoice.html b/sql-ledger/templates/French-invoice.html
index 901a31737..69cae5650 100644
--- a/sql-ledger/templates/French-invoice.html
+++ b/sql-ledger/templates/French-invoice.html
@@ -87,17 +87,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%>
|
@@ -142,6 +150,7 @@ ceci permettra de d
vous pouvez également utiliser netprice à la place de sellprice
si vous ne voulez pas afficher la remise
netprice = sellprice - discount
+to show the percentage for a discount use <%discountrate%>
-->