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

(-)a/C4/Circulation.pm (-1 / +2 lines)
Lines 1995-2000 sub AddIssue { Link Here
1995
                    $info = to_json(
1995
                    $info = to_json(
1996
                        {
1996
                        {
1997
                            issue         => $issue->issue_id,
1997
                            issue         => $issue->issue_id,
1998
                            branchcode    => $issue->branchcode,
1998
                            itemnumber    => $item_object->itemnumber,
1999
                            itemnumber    => $item_object->itemnumber,
1999
                            confirmations => $confirmations,
2000
                            confirmations => $confirmations,
2000
                            forced        => $forced
2001
                            forced        => $forced
Lines 3663-3669 sub AddRenewal { Link Here
3663
                        },
3664
                        },
3664
                        {
3665
                        {
3665
                            pretty    => 1,
3666
                            pretty    => 1,
3666
                            cononical => 1
3667
                            canonical => 1
3667
                        }
3668
                        }
3668
                    );
3669
                    );
3669
                }
3670
                }
(-)a/circ/circulation.pl (-1 / +2 lines)
Lines 444-450 if ( @$barcodes && $op eq 'cud-checkout' ) { Link Here
444
            }
444
            }
445
        }
445
        }
446
446
447
        delete $needsconfirmation->{'DEBT'} if ($debt_confirmed);
447
        my $needsconfirmationDEBT = delete $needsconfirmation->{'DEBT'} if ($debt_confirmed);
448
448
449
        if ( $item && C4::Context->preference('ClaimReturnedLostValue') ) {
449
        if ( $item && C4::Context->preference('ClaimReturnedLostValue') ) {
450
            my $autoClaimReturnCheckout = C4::Context->preference('AutoClaimReturnStatusOnCheckout');
450
            my $autoClaimReturnCheckout = C4::Context->preference('AutoClaimReturnStatusOnCheckout');
Lines 547-552 if ( @$barcodes && $op eq 'cud-checkout' ) { Link Here
547
                if ( my $booked = $needsconfirmation->{BOOKED_EARLY} // $alerts->{BOOKED} ) {
547
                if ( my $booked = $needsconfirmation->{BOOKED_EARLY} // $alerts->{BOOKED} ) {
548
                    $datedue = $booked->end_date;
548
                    $datedue = $booked->end_date;
549
                }
549
                }
550
                $needsconfirmation->{'DEBT'} = $needsconfirmationDEBT if ($debt_confirmed);
550
                my $issue = AddIssue(
551
                my $issue = AddIssue(
551
                    $patron, $barcode, $datedue,
552
                    $patron, $barcode, $datedue,
552
                    $cancelreserve,
553
                    $cancelreserve,
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/action-logs.inc (-2 / +18 lines)
Lines 198-204 Link Here
198
    [% CASE 'PATRON_CANT' %]
198
    [% CASE 'PATRON_CANT' %]
199
        <span>Max renewals reached</span>
199
        <span>Max renewals reached</span>
200
    [% CASE 'TOO_MANY' %]
200
    [% CASE 'TOO_MANY' %]
201
        <span>Max renewals reached</span>
201
        <span>Too many checkout</span>
202
    [% CASE 'PREVISSUE' %]
202
    [% CASE 'PREVISSUE' %]
203
        <span>Patron was notified of previous issues</span>
203
        <span>Patron was notified of previous issues</span>
204
    [% CASE 'NOT_FOR_LOAN' %]
204
    [% CASE 'NOT_FOR_LOAN' %]
Lines 226-236 Link Here
226
    [% CASE 'BOOKED_TO_ANOTHER' %]
226
    [% CASE 'BOOKED_TO_ANOTHER' %]
227
        <span>Item was booked to another patron</span>
227
        <span>Item was booked to another patron</span>
228
    [% CASE 'AGE_RESTRICTION' %]
228
    [% CASE 'AGE_RESTRICTION' %]
229
        <span>Item has an eage restriction</span>
229
        <span>Item has an age restriction</span>
230
    [% CASE 'HIGHHOLDS' %]
230
    [% CASE 'HIGHHOLDS' %]
231
        <span>Item had high holds</span>
231
        <span>Item had high holds</span>
232
    [% CASE 'BIBLIO_ALREADY_ISSUED' %]
232
    [% CASE 'BIBLIO_ALREADY_ISSUED' %]
233
        <span>Biblio was already issued</span>
233
        <span>Biblio was already issued</span>
234
    [% CASE 'DEBARRED' %]
235
        <span>Patron is restricted</span>
236
    [% CASE 'RENEWAL_LIMIT' %]
237
        <span>Renewal limit override</span>
238
    [% CASE 'UNSEEN_LIMIT' %]
239
        <span>Override unseen item restriction</span>
240
    [% CASE 'AUTO_TOO_SOON' %]
241
        <span>Override auto-renew too soon restriction</span>
242
    [% CASE 'AUTO_TOO_LATE' %]
243
        <span>Override auto-renew too late restriction</span>
244
    [% CASE 'ACCOUNT_EXPIRED' %]
245
        <span>Account expired override</span
246
    [% CASE 'ON_RESERVE' %]
247
        <span>Override Renew hold for another</span>
248
    [% CASE 'TOO_MUCH' %]
249
        <span>Override auto-renew too much owing restriction</span>
234
    [% CASE %]
250
    [% CASE %]
235
        <span>[% override | html %]</span>
251
        <span>[% override | html %]</span>
236
    [% END %]
252
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-3 / +3 lines)
Lines 339-349 Link Here
339
                                                <a
339
                                                <a
340
                                                    href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% loopro.json.itemnumber | uri %]&amp;biblionumber=[% loopro.json.biblionumber | uri %]&amp;bi=[% loopro.json.biblioitemnumber | uri %]#item[% loopro.json.itemnumber | uri %]"
340
                                                    href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% loopro.json.itemnumber | uri %]&amp;biblionumber=[% loopro.json.biblionumber | uri %]&amp;bi=[% loopro.json.biblioitemnumber | uri %]#item[% loopro.json.itemnumber | uri %]"
341
                                                    title="Display detail for this item"
341
                                                    title="Display detail for this item"
342
                                                    >Item [% loopro.json.barcode | html %]</a
342
                                                    >Item [% loopro.json.barcode | html %] [% loopro.json.branchcode | html %]</a
343
                                                >
343
                                                >
344
                                            </div>
344
                                            </div>
345
                                            [% FOREACH force IN loopro.json.forces %]
345
                                            [% FOREACH force IN loopro.json.forced %]
346
                                                <div class="forced"> [% PROCESS translare_log_override override=force %] </div>
346
                                                <div class="forced"> [% PROCESS translate_log_override override=force %] </div>
347
                                            [% END %]
347
                                            [% END %]
348
                                            [% FOREACH confirmation IN loopro.json.confirmations %]
348
                                            [% FOREACH confirmation IN loopro.json.confirmations %]
349
                                                <div class="confirmed"> [% PROCESS translate_log_override override=confirmation %] </div>
349
                                                <div class="confirmed"> [% PROCESS translate_log_override override=confirmation %] </div>
(-)a/svc/renew (-1 / +4 lines)
Lines 67-72 $data->{branchcode} = $branchcode; Link Here
67
my $patron = Koha::Patrons->find($borrowernumber);
67
my $patron = Koha::Patrons->find($borrowernumber);
68
my $item   = Koha::Items->find($itemnumber);
68
my $item   = Koha::Items->find($itemnumber);
69
69
70
my $confirmations;
70
( $data->{renew_okay}, $data->{error} ) =
71
( $data->{renew_okay}, $data->{error} ) =
71
    CanBookBeRenewed( $patron, $item->checkout, $override_limit );
72
    CanBookBeRenewed( $patron, $item->checkout, $override_limit );
72
73
Lines 75-80 if ( $data->{error} && $data->{error} eq 'on_reserve' && C4::Context->preference Link Here
75
    $data->{renew_okay} = 1;
76
    $data->{renew_okay} = 1;
76
    $data->{error}      = undef;
77
    $data->{error}      = undef;
77
78
79
    push @{$confirmations}, 'ON_RESERVE' if $override_limit;
78
    $message = "Override Renew hold for another";
80
    $message = "Override Renew hold for another";
79
    @message = ("Override Renew hold for another");
81
    @message = ("Override Renew hold for another");
80
82
Lines 133-139 if ( $data->{renew_okay} || ( $seen && $data->{error} eq 'too_unseen' ) ) { Link Here
133
                itemnumber     => $itemnumber,
135
                itemnumber     => $itemnumber,
134
                branch         => $branchcode,
136
                branch         => $branchcode,
135
                datedue        => $date_due,
137
                datedue        => $date_due,
136
                seen           => $seen
138
                seen           => $seen,
139
                confirmations  => $confirmations
137
            }
140
            }
138
        );
141
        );
139
        $data->{date_due}   = output_pref( { dt => $date_due, as_due_date => 1 } );
142
        $data->{date_due}   = output_pref( { dt => $date_due, as_due_date => 1 } );
(-)a/tools/viewlog.pl (-1 / +1 lines)
Lines 181-186 if ($do_it) { Link Here
181
                    $decoded->{biblionumber}     = $item->biblionumber;
181
                    $decoded->{biblionumber}     = $item->biblionumber;
182
                    $decoded->{biblioitemnumber} = $item->biblionumber;
182
                    $decoded->{biblioitemnumber} = $item->biblionumber;
183
                    $decoded->{barcode}          = $item->barcode;
183
                    $decoded->{barcode}          = $item->barcode;
184
                    $decoded->{branchcode}       = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
184
                }
185
                }
185
                $result->{'json'} = $decoded;
186
                $result->{'json'} = $decoded;
186
            } else {
187
            } else {
187
- 

Return to bug 9762