X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=conf%2Finvoice_htmlsummary;h=249db9b07d25fe67ee95c1e424d2a5271c9c0567;hp=47bdbfb7cac1d5d6ce2dcf6e5c3bcb2dce3e37db;hb=11bbf29de447fe39e9d7155fe280a0df70fa8c3c;hpb=642cd9bbd96603c696f3932f527d57ad33e9b7ee

diff --git a/conf/invoice_htmlsummary b/conf/invoice_htmlsummary
index 47bdbfb7c..249db9b07 100644
--- a/conf/invoice_htmlsummary
+++ b/conf/invoice_htmlsummary
@@ -9,29 +9,20 @@
       <table class="invoice_summary">
         <tr><th colspan=2><br></th></tr>
         <tr>
-          <td><b><u><br>Summary of Previous Balance and Payments<br></u></b></td>
+          <td><b><u><br>Summary of Previous Balance<br></u></b></td>
           <td></td>
         </tr>
         <tr>
           <td><b>Previous Balance</b></td>
-          <td align="right"><b><%= $dollar.$true_previous_balance %></b></td>
-        </tr>
-        <tr>
-          <td><b>Payments</b></td>
-          <th align="right"><b><%= $dollar.$balance_adjustments %></b></th>
-        </tr>
-        <tr>
-          <td><b>Balance Outstanding</b></td>
-          <td align="right"><b><%= $dollar.sprintf('%.2f', $true_previous_balance - $balance_adjustments) %></b></td>
+          <td align=right><b><%= "${dollar}${true_previous_balance}" %></b></td>
         </tr>
         <tr><th colspan=2><br></th></tr>
         <tr><td colspan=2><br></td></tr>
         <tr>
           <td><b><u>Summary of New Charges</u></b></td>
-          <td></td>
         </tr>
         <tr><td colspan=2><br></td></tr>
-        <%= 
+        <%=
           my $last = $summary_subtotals[-1];
           foreach my $section (@summary_subtotals) {
             $OUT .= '<tr><td><b>'. ($section->{'description'} ? $section->{'description'} : 'Charges' ). '</b></td>';
@@ -44,15 +35,23 @@
           <td align="right"><b><%= $dollar.$current_less_finance %></b></td>
         </tr>
         <tr><th colspan=2><br></th></tr>
+        <tr>
+          <td><b><u><br>Summary of Payments and Credits<br></u></b></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td><b>Payments and Credits</b></td>
+          <td align="right"><b>-<%= $dollar.$balance_adjustments %></b></td>
+        </tr>
+        <tr><th colspan=2><br></th></tr>
         <tr><td colspan=2><br></td></tr>
         <tr>
           <td><b><u>Invoice Summary</u></b></td>
-          <td></td>
         </tr>
         <tr><td colspan=2><br></td></tr>
         <tr>
           <td><b>Previous Past Due Charges</b></td>
-          <td align="right"><b><%= $dollar.sprintf('%.2f', $true_previous_balance - $balance_adjustments) %></b></td>
+          <td align="right"><b><%= $dollar.$true_previous_balance %></b></td>
         </tr>
         <tr>
           <td><b>Finance charges on overdue amount</b></td>
@@ -60,18 +59,18 @@
         </tr>
         <tr>
           <td><b>New Charges</b></td>
-          <th align="right"><b><%= $dollar.$current_less_finance %></b></th>
+          <td align="right"><b><%= $dollar.$current_less_finance %></b></td>
         </tr>
-
-        <%= 
-          
-          #false laziness w/invoice_latexsummary and above
+        <%=
           foreach my $section ( grep $_->{adjust_section}, @sections) {
             $OUT .= '<tr><td><b>'. ($section->{'description'} ? $section->{'description'} : 'Charges' ). '</b></td>';
             $OUT .= qq(<th align="right"><b>). $section->{'subtotal'}. "</b></th></tr>";
           }
         %>
-
+        <tr>
+          <td><b>Payments and Credits</b></td>
+          <th align="right"><b>-<%= $dollar.sprintf('%.2f', $balance_adjustments) %></b></th>
+        </tr>
         <tr>
           <td><b>Total Amount Due</b></td>
           <td align="right"><b><%= $dollar.sprintf('%.2f', $balance) %></b></td>