From ad8a1b5555ca214dbe4af34755b45c3273e1317b Mon Sep 17 00:00:00 2001
From: Axel Amghar <axel.amghar@gmail.com>
Date: Fri, 12 Apr 2019 17:09:32 +0200
Subject: [PATCH] Bug 22632: adding of the rescearch of merge in the log viewer

---
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
index d036880..9644426 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
@@ -57,6 +57,7 @@
 [%        CASE 'DELCIRCMESSAGE' %]Delete circulation message
 [%        CASE 'STATUS_CHANGE'  %]Change ILL request status
 [%        CASE 'Run'    %]Run
+[%        CASE 'Merge'    %]Merge
 [%        CASE %][% action | html %]
 [%    END %]
 [% END %]
@@ -123,7 +124,7 @@
                                         <option value="">All</option>
                                     [% END %]
 
-                                    [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' ] %]
+                                    [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' 'Merge' ] %]
                                         [% IF actions.grep(actx).size %]
                                             <option value="[% actx | html %]" selected="selected">[% PROCESS translate_log_action action=actx %]</option>
                                         [% ELSE %]
-- 
2.7.4