X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=sql-ledger%2Ftemplates%2FEstonian-sales_order.html;h=1c712ead775e90d0ac571cf8af199924f7b9c007;hb=5fc8c5edf574ab024d4646914b6432d458e2ffbd;hp=d608b730bb232167687de0c441f62610ab50c035;hpb=c0567c688084e89fcd11bf82348b6c418f1254ac;p=freeside.git

diff --git a/sql-ledger/templates/Estonian-sales_order.html b/sql-ledger/templates/Estonian-sales_order.html
index d608b730b..1c712ead7 100644
--- a/sql-ledger/templates/Estonian-sales_order.html
+++ b/sql-ledger/templates/Estonian-sales_order.html
@@ -69,17 +69,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>