X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=sql-ledger%2Ftemplates%2FService-purchase_order.html;h=de5fd805200e640b484ec7b8aefae3ee5ba935d8;hp=f2e9f7e227487e2789000e6f68dfc409007da8d6;hb=32306b5f8ffe4ce594409aa6e89626740b225a39;hpb=52072fcd26f2faf57923f598c358e7f47c4e2643

diff --git a/sql-ledger/templates/Service-purchase_order.html b/sql-ledger/templates/Service-purchase_order.html
index f2e9f7e22..de5fd8052 100644
--- a/sql-ledger/templates/Service-purchase_order.html
+++ b/sql-ledger/templates/Service-purchase_order.html
@@ -65,10 +65,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>
@@ -130,7 +134,7 @@ adjust the colspan if you include this to shift subtotal one to the right
     <tr>
       <td colspan=2>Terms Net <b><%terms%></b> days</td>
       <th colspan=2 align=right>Total</th>
-      <th colspan=2 align=right><%total%></th>
+      <th colspan=2 align=right><%ordtotal%></th>
     </tr>
 
     <tr>