X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=sql-ledger%2Ftemplates%2FService-statement.html;fp=sql-ledger%2Ftemplates%2FService-statement.html;h=5e288505efeb8f895e906ace9aa9d70929626d8e;hp=6fca322eea9078bc2429cfc6dbf9a4ff9acbf425;hb=32306b5f8ffe4ce594409aa6e89626740b225a39;hpb=52072fcd26f2faf57923f598c358e7f47c4e2643

diff --git a/sql-ledger/templates/Service-statement.html b/sql-ledger/templates/Service-statement.html
index 6fca322ee..5e288505e 100644
--- a/sql-ledger/templates/Service-statement.html
+++ b/sql-ledger/templates/Service-statement.html
@@ -36,20 +36,24 @@
       <table width=100%>
 	<tr valign=top>
 	  <td><%name%>
-	  <br><%addr1%>
-	  <br><%addr2%>
-	  <br><%addr3%>
-	  <br><%addr4%>
+	  <br><%address1%>
+	  <%if address2%>
+          <br><%address2%>
+          <%end address2%>
+	  <br><%city%> <%state%> <%zipcode%>
+	  <%if country%>
+          <br><%country%>
+          <%end country%>
 	  <br>
-<%if customerphone%>
+          <%if customerphone%>
 	  <br>Tel: <%customerphone%>
-<%end customerphone%>
-<%if customerfax%>
+          <%end customerphone%>
+          <%if customerfax%>
 	  <br>Fax: <%customerfax%>
-<%end customerfax%>
-<%if email%>
+          <%end customerfax%>
+          <%if email%>
 	  <br><%email%>
-<%end email%>
+          <%end email%>
 	  </td>
 	</tr>
       </table>
@@ -62,16 +66,20 @@
       <table width=100%>
         <tr>
 	  <th align=left>Invoice #</th>
-	  <th width=15%>Date</th>
-	  <th width=15%>Due</th>
+	  <th align=left>Order #</th>
+<!-- <th align=left>Notes</th> -->
+	  <th width=10%>Date</th>
+	  <th width=10%>Due</th>
 	  <th width=10%>Current</th>
 	  <th width=10%>30</th>
 	  <th width=10%>60</th>
 	  <th width=10%>90+</th>
 	</tr>
-<%foreach invnumber%>
+        <%foreach invnumber%>
 	<tr>
 	  <td><%invnumber%></td>
+	  <td><%ordnumber%></td>
+<!-- <td><%notes%></td> -->
 	  <td><%invdate%></td>
 	  <td><%duedate%></td>
 	  <td align=right><%c0%></td>
@@ -79,14 +87,15 @@
 	  <td align=right><%c60%></td>
 	  <td align=right><%c90%></td>
 	</tr>
-<%end invnumber%>
+        <%end invnumber%>
         <tr>
-	  <td colspan=7><hr size=1></td>
+	  <td colspan=8><hr size=1></td>
 	</tr>
 	<tr>
 	  <td>&nbsp;</td>
 	  <td>&nbsp;</td>
 	  <td>&nbsp;</td>
+	  <td>&nbsp;</td>
 	  <th align=right><%c0total%></td>
 	  <th align=right><%c30total%></td>
 	  <th align=right><%c60total%></td>