From 08948b3fa161bc70456803990400f331f786e57f Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Mon, 27 Jan 2020 11:48:31 +0000
Subject: [PATCH] Bug 24486: Remove duplicated account information at the OPAC

Test plan:
Create a manual invoice
Pay it
Void it

Go to the opac, account
=> You should see only one "(Voided)"

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
(cherry picked from commit 4f283ebba5ded2e64e8df26d19e24310234956c9)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../opac-tmpl/bootstrap/en/includes/account-table.inc      | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
index 7dbf9ad18e..f4476885e0 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
@@ -29,7 +29,6 @@
                     <td><span title="[% ACCOUNT_LINE.date | html %]">[% ACCOUNT_LINE.date | $KohaDates %]</span></td>
                     <td>
                         [% PROCESS account_type_description account=ACCOUNT_LINE %]
-                        [%- PROCESS account_status_description account=ACCOUNT_LINE -%]
                     </td>
                     <td>
                         [%- IF ACCOUNT_LINE.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', ACCOUNT_LINE.payment_type, 1) | html %][% END %]
@@ -59,7 +58,6 @@
                     <td><span title="[% outstanding_credit.date | html %]">[% outstanding_credit.date | $KohaDates %]</span></td>
                     <td>
                         [% PROCESS account_type_description account=outstanding_credit %]
-                        [%- PROCESS account_status_description account=outstanding_credit -%]
                     </td>
                     <td>
                         [%- IF outstanding_credit.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', outstanding_credit.payment_type, 1) | html %][% END %]
@@ -140,10 +138,6 @@
         [%- CASE 'Res'     -%]<span>Hold fee
         [%- CASE           -%]<span>[% account.accounttype | html %]
     [%- END -%]
-    [%- PROCESS account_status_description account=account -%]</span>
-[%- END -%]
-
-[%- BLOCK account_status_description -%]
     [%- SWITCH account.status -%]
         [%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>
         [%- CASE 'RETURNED'   -%]<span> (Returned)</span>
@@ -152,4 +146,5 @@
         [%- CASE 'VOID'       -%]<span> (Voided)</span>
         [%- CASE              -%]
     [%- END -%]
+    </span>
 [%- END -%]
-- 
2.39.5