From 37606f8b44ae1d680a32e83458df5601b94efb33 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 12 Apr 2019 09:36:22 +0100
Subject: [PATCH] Bug 22521: (QA follow-up) remove FFOR from display

A rebase re-introduced the FFOR accounttype in the display list.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc       | 1 -
 koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc | 1 -
 2 files changed, 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
index ee1a90f47c..678fc75ef9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
@@ -14,7 +14,6 @@
         [%- CASE 'HE'      -%]<span>Hold waiting too long</span>
         [%- CASE 'Rent'    -%]<span>Rental fee</span>
         [%- CASE 'FOR'     -%]<span>Forgiven</span>
-        [%- CASE 'FFOR'  -%]<span>Fine forgiven</span>
         [%- CASE 'LR'      -%]<span>Lost item fee refund</span>
         [%- CASE 'PF'    -%]<span>Lost item processing fee</span>
         [%- CASE 'PAY'     -%]<span>Payment</span>
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 58a58ee9b2..6a1b891091 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
@@ -43,7 +43,6 @@
                         [% CASE 'HE' %]Hold waiting too long
                         [% CASE 'Rent' %]Rental fee
                         [% CASE 'FOR' %]Forgiven
-                        [% CASE 'FFOR' %]Fine forgiven
                         [% CASE 'LR' %]Lost item fee refund
                         [% CASE 'PF' %]Lost item processing fee
                         [% CASE 'PAY' %]Payment
-- 
2.39.5