1 files changed, 8 insertions, 4 deletions
diff --git a/sql-ledger/templates/Estonian-purchase_order.html b/sql-ledger/templates/Estonian-purchase_order.html
index 7ee0073e8..4ad1c7f81 100644
--- a/sql-ledger/templates/Estonian-purchase_order.html
+++ b/sql-ledger/templates/Estonian-purchase_order.html
@@ -68,10 +68,14 @@
 
     <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>
     </tr>
     </table>