diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 16c0039c75..a1bae5e5b9 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -2021,6 +2021,7 @@ sub AddIssue { $info = to_json( { issue => $issue->issue_id, + branchcode => $issue->branchcode, itemnumber => $item_object->itemnumber, confirmations => $confirmations, forced => $forced @@ -3693,7 +3694,7 @@ sub AddRenewal { }, { pretty => 1, - cononical => 1 + canonical => 1 } ); } diff --git a/circ/circulation.pl b/circ/circulation.pl index 1597852c59..d85defd0ad 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -444,7 +444,8 @@ if ( @$barcodes && $op eq 'cud-checkout' ) { } } - delete $needsconfirmation->{'DEBT'} if ($debt_confirmed); + my $needsconfirmationDEBT; + $needsconfirmationDEBT = delete $needsconfirmation->{'DEBT'} if ($debt_confirmed); if ( $item && C4::Context->preference('ClaimReturnedLostValue') ) { my $autoClaimReturnCheckout = C4::Context->preference('AutoClaimReturnStatusOnCheckout'); @@ -547,6 +548,7 @@ if ( @$barcodes && $op eq 'cud-checkout' ) { if ( my $booked = $needsconfirmation->{BOOKED_EARLY} // $alerts->{BOOKED} ) { $datedue = $booked->end_date; } + $needsconfirmation->{'DEBT'} = $needsconfirmationDEBT if ($debt_confirmed); my $issue = AddIssue( $patron, $barcode, $datedue, $cancelreserve, diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/action-logs.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/action-logs.inc index 03724bc859..6b0deca636 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/action-logs.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/action-logs.inc @@ -198,7 +198,7 @@ [% CASE 'PATRON_CANT' %] Max renewals reached [% CASE 'TOO_MANY' %] - Max renewals reached + Too many checkout [% CASE 'PREVISSUE' %] Patron was notified of previous issues [% CASE 'NOT_FOR_LOAN' %] @@ -226,11 +226,27 @@ [% CASE 'BOOKED_TO_ANOTHER' %] Item was booked to another patron [% CASE 'AGE_RESTRICTION' %] - Item has an eage restriction + Item has an age restriction [% CASE 'HIGHHOLDS' %] Item had high holds [% CASE 'BIBLIO_ALREADY_ISSUED' %] Biblio was already issued + [% CASE 'DEBARRED' %] + Patron is restricted + [% CASE 'RENEWAL_LIMIT' %] + Renewal limit override + [% CASE 'UNSEEN_LIMIT' %] + Override unseen item restriction + [% CASE 'AUTO_TOO_SOON' %] + Override auto-renew too soon restriction + [% CASE 'AUTO_TOO_LATE' %] + Override auto-renew too late restriction + [% CASE 'ACCOUNT_EXPIRED' %] + Account expired override + [% CASE 'ON_RESERVE' %] + Override Renew hold for another + [% CASE 'TOO_MUCH' %] + Override auto-renew too much owing restriction [% CASE %] [% override | html %] [% END %] 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 a53132ea91..44e6e4b20e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -339,11 +339,11 @@ Item [% loopro.json.barcode | html %]Item [% loopro.json.barcode | html %] [% loopro.json.branchcode | html %] - [% FOREACH force IN loopro.json.forces %] -