View | Details | Raw Unified | Return to bug 30823
Collapse All | Expand All

(-)a/Koha/Recall.pm (-1 / +1 lines)
Lines 457-463 Set a recall as finished. This should only be called when the item allocated to Link Here
457
sub set_fulfilled {
457
sub set_fulfilled {
458
    my ( $self ) = @_;
458
    my ( $self ) = @_;
459
    $self->update({ status => 'fulfilled', completed => 1, completed_date => dt_from_string });
459
    $self->update({ status => 'fulfilled', completed => 1, completed_date => dt_from_string });
460
    C4::Log::logaction( 'RECALLS', 'FULFILL', $self->id, "Recall fulfilled", 'INTRANET' ) if ( C4::Context->preference('RecallsLog') );
460
    C4::Log::logaction( 'RECALLS', 'FILL', $self->id, "Recall fulfilled", 'INTRANET' ) if ( C4::Context->preference('RecallsLog') );
461
    return $self;
461
    return $self;
462
}
462
}
463
463
(-)a/installer/data/mysql/atomicupdate/bug_30823_-_update_recalls_FULFILL_actions.pl (+12 lines)
Line 0 Link Here
1
use Modern::Perl;
2
3
return {
4
    bug_number => "30823",
5
    description => "Replace recalls FULFILL actions with FILL in action logs",
6
    up => sub {
7
        my ($args) = @_;
8
        my ($dbh, $out) = @$args{qw(dbh out)};
9
10
        $dbh->do(q{ UPDATE action_logs SET action = 'FILL' WHERE action = 'FULFILL' AND module = 'RECALLS' });
11
    },
12
};
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-3 / +1 lines)
Lines 145-151 Link Here
145
[%        CASE 'SERIAL CLAIM' %]<span>Serial claim</span>
145
[%        CASE 'SERIAL CLAIM' %]<span>Serial claim</span>
146
[%        CASE 'ACQUISITION CLAIM' %]<span>Acquisition claim</span>
146
[%        CASE 'ACQUISITION CLAIM' %]<span>Acquisition claim</span>
147
[%        CASE 'ACQUISITION ORDER' %]<span>Acquisition order</span>
147
[%        CASE 'ACQUISITION ORDER' %]<span>Acquisition order</span>
148
[%        CASE 'FULFILL' %]<span>Fulfill</span>
149
[%        CASE 'OVERDUE' %]<span>Overdue</span>
148
[%        CASE 'OVERDUE' %]<span>Overdue</span>
150
[%        CASE 'EXPIRE'  %]<span>Expire</span>
149
[%        CASE 'EXPIRE'  %]<span>Expire</span>
151
[%        CASE %][% action | html %]
150
[%        CASE %][% action | html %]
Lines 240-246 Link Here
240
                                        <label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>
239
                                        <label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>
241
                                    [% END %]
240
                                    [% END %]
242
241
243
                                    [% 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' ] %]
242
                                    [% 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' ] %]
244
                                        [% IF actions.grep(actx).size %]
243
                                        [% IF actions.grep(actx).size %]
245
                                            <label for="action[% actx| replace('\s+', '_') | html %]" class="viewlog"><input type="checkbox" id="action[% actx | replace('\s+', '_') | html %]" name="actions" value="[% actx | html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>
244
                                            <label for="action[% actx| replace('\s+', '_') | html %]" class="viewlog"><input type="checkbox" id="action[% actx | replace('\s+', '_') | html %]" name="actions" value="[% actx | html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>
246
                                        [% ELSE %]
245
                                        [% ELSE %]
247
- 

Return to bug 30823