From 70924e8001f6128d6f813d59b2d7a5be17bb6b8d Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Thu, 5 Sep 2013 15:27:58 -0400
Subject: [PATCH] Bug 10027: (follow-up) improve display of fine details on
 printed invoice

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.

Checked invoice is correctly printed for
- partially paid fines
- paid fines
- unpaid fines

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit e30612bb3f0465363842ff4269245095d32dee3b)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit bf33bd5cafce6a166f5c0e54098ab38c9ac59615)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit bf33bd5cafce6a166f5c0e54098ab38c9ac59615)
---
 .../prog/en/modules/members/printinvoice.tt          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
index 627d466b00..d5373c0566 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
@@ -17,23 +17,23 @@
 <table>
 [% IF ( LibraryName ) %]
   <tr>
-	<th colspan=3 class="centerednames">
+    <th colspan="4" class="centerednames">
 		<h3>[% LibraryName %]</h3>
 	</th>
   </tr>
 [% END %]
   <tr>
-	<th colspan=3 class="centerednames">
+    <th colspan="4" class="centerednames">
 		<h2><u>INVOICE</u></h2>
 	</th>
   </tr>
   <tr>
-	<th colspan=3 class="centerednames">
+    <th colspan="4" class="centerednames">
 		[% IF ( branchname ) %]<h2>[% branchname %]</h2>[% END %]
 	</th>
   </tr>
   <tr>
-	<th colspan=3 >
+    <th colspan="4" >
         Bill to: [% firstname %] [% surname %] <br />
         Card number: [% cardnumber %]<br />
 	</th>
@@ -42,6 +42,7 @@
 	<th>Date</th>
     <th>Description of charges</th>
     <th style="text-align:right;">Amount</th>
+    <th style="text-align:right;">Amount outstanding</th>
  </tr>
 
   [% FOREACH account IN accounts %]
@@ -49,12 +50,13 @@
       <td>[% account.date %]</td>
       <td>[% account.description %]</td>
       [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount %]</td>
+      [% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding %]</td>
     </tr>
 
   [% END %]
 <tfoot>
   <tr>
-    <td colspan="2">Total outstanding dues as on date: </td>
+    <td colspan="3">Total outstanding dues as on date: </td>
     [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total %]</td>
   </tr>
   </tfoot>
-- 
2.39.5