import sql-ledger 2.4.4

[freeside.git] / sql-ledger / templates / Estonian-sales_order.html

diff --git a/sql-ledger/templates/Estonian-sales_order.html b/sql-ledger/templates/Estonian-sales_order.html
index d608b73..1c712ea 100644 (file)
--- a/sql-ledger/templates/Estonian-sales_order.html
+++ b/sql-ledger/templates/Estonian-sales_order.html
@@ -69,17 +69,25 @@
 \r
     <tr>\r
       <td><%name%>\r
-      <br><%addr1%>\r
-      <br><%addr2%>\r
-      <br><%addr3%>\r
-      <br><%addr4%>\r
+      <br><%address1%>\r
+      <%if address2%>
+<br><%address2%>
+<%end address2%>\r
+      <br><%city%> <%state%> <%zipcode%>\r
+      <%if country%>
+<%country%>
+<%end country%>\r
       </td>\r
 \r
       <td><%shiptoname%>\r
-      <br><%shiptoaddr1%>\r
-      <br><%shiptoaddr2%>\r
-      <br><%shiptoaddr3%>\r
-      <br><%shiptoaddr4%>\r
+      <br><%shiptoaddress1%>\r
+      <%if shiptoaddress2%>
+<br><%shiptoaddress2%>
+<%end shiptoaddress2%>\r
+      <br><%shiptocity%> <%shiptostate%> <%shiptozipcode%>\r
+      <%if shiptocountry%>
+<%shiptocountry%>
+<%end shiptocountry%>\r
       </td>\r
     </tr>\r
     </table>\r