@@ -, +, @@ - modules: recalls - actions: fill --- Koha/Recall.pm | 2 +- .../bug_30823_-_update_recalls_FULFILL_actions.pl | 12 ++++++++++++ .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 3 +-- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100755 installer/data/mysql/atomicupdate/bug_30823_-_update_recalls_FULFILL_actions.pl --- a/Koha/Recall.pm +++ a/Koha/Recall.pm @@ -457,7 +457,7 @@ Set a recall as finished. This should only be called when the item allocated to sub set_fulfilled { my ( $self ) = @_; $self->update({ status => 'fulfilled', completed => 1, completed_date => dt_from_string }); - C4::Log::logaction( 'RECALLS', 'FULFILL', $self->id, "Recall fulfilled", 'INTRANET' ) if ( C4::Context->preference('RecallsLog') ); + C4::Log::logaction( 'RECALLS', 'FILL', $self->id, "Recall fulfilled", 'INTRANET' ) if ( C4::Context->preference('RecallsLog') ); return $self; } --- a/installer/data/mysql/atomicupdate/bug_30823_-_update_recalls_FULFILL_actions.pl +++ a/installer/data/mysql/atomicupdate/bug_30823_-_update_recalls_FULFILL_actions.pl @@ -0,0 +1,12 @@ +use Modern::Perl; + +return { + bug_number => "30823", + description => "Replace recalls FULFILL actions with FILL in action logs", + up => sub { + my ($args) = @_; + my ($dbh, $out) = @$args{qw(dbh out)}; + + $dbh->do(q{ UPDATE action_logs SET action = 'FILL' WHERE action = 'FULFILL' AND module = 'RECALLS' }); + }, +}; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -145,7 +145,6 @@ [% CASE 'SERIAL CLAIM' %]Serial claim [% CASE 'ACQUISITION CLAIM' %]Acquisition claim [% CASE 'ACQUISITION ORDER' %]Acquisition order -[% CASE 'FULFILL' %]Fulfill [% CASE 'OVERDUE' %]Overdue [% CASE 'EXPIRE' %]Expire [% CASE %][% action | html %] @@ -240,7 +239,7 @@ [% END %] - [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'FILL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'Run' 'EDIT_MAPPINGS' 'RESET_MAPPINGS' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' 'CANCEL_ORDER' 'CREATE_ORDER' 'MODIFY_ORDER' 'CREATE_INVOICE_ADJUSTMENT' 'UPDATE_INVOICE_ADJUSTMENT' 'DELETE_INVOICE_ADJUSTMENT' 'RECEIVE_ORDER' 'MODIFY_BUDGET' 'MODIFY_FUND' 'CREATE_FUND' 'DELETE_FUND' 'OVERDUE' 'EXPIRE' 'FULFILL' ] %] + [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'FILL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'Run' 'EDIT_MAPPINGS' 'RESET_MAPPINGS' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' 'CANCEL_ORDER' 'CREATE_ORDER' 'MODIFY_ORDER' 'CREATE_INVOICE_ADJUSTMENT' 'UPDATE_INVOICE_ADJUSTMENT' 'DELETE_INVOICE_ADJUSTMENT' 'RECEIVE_ORDER' 'MODIFY_BUDGET' 'MODIFY_FUND' 'CREATE_FUND' 'DELETE_FUND' 'OVERDUE' 'EXPIRE' ] %] [% IF actions.grep(actx).size %] [% ELSE %] --