@@ -, +, @@ date --- circ/circulation.pl | 13 +++++++++++-- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 14 ++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) --- a/circ/circulation.pl +++ a/circ/circulation.pl @@ -55,7 +55,6 @@ use Date::Calc qw( ); use List::MoreUtils qw/uniq/; - # # PARAMETERS READING # @@ -122,7 +121,6 @@ my $borrowernumber = $query->param('borrowernumber'); $branch = C4::Context->userenv->{'branch'}; $printer = C4::Context->userenv->{'branchprinter'}; - # If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian if (C4::Context->preference("AutoLocation") != 1) { $template->param(ManualLocation => 1); @@ -138,6 +136,7 @@ $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace $barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter')); my $stickyduedate = $query->param('stickyduedate') || $session->param('stickyduedate'); my $duedatespec = $query->param('duedatespec') || $session->param('stickyduedate'); +my $restoreduedatespec = $query->param('restoreduedatespec') || $session->param('stickyduedate'); my $issueconfirmed = $query->param('issueconfirmed'); my $cancelreserve = $query->param('cancelreserve'); my $print = $query->param('print') || q{}; @@ -534,6 +533,15 @@ my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{stree $template->param(%$borrower); +unless ($stickyduedate eq 'on') { + $duedatespec = ''; +} else { + if ($restoreduedatespec) { + $duedatespec = $restoreduedatespec; + } + $session->param( 'stickyduedate', $duedatespec ); +} + $template->param( lib_messages_loop => $lib_messages_loop, bor_messages_loop => $bor_messages_loop, @@ -552,6 +560,7 @@ $template->param( barcode => $barcode, stickyduedate => $stickyduedate, duedatespec => $duedatespec, + restoreduedatespec => $restoreduedatespec, message => $message, totaldue => sprintf('%.2f', $total), inprocess => $inprocess, --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -300,13 +300,14 @@ $(document).ready(function() { [% IF HIGHHOLDS %] [% END %] [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
+ [% IF (forceallow) %][% END %] @@ -353,6 +354,7 @@ $(document).ready(function() { [% IF (forceallow) %][% END %] + [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %] [% IF ( RENEW_ISSUE ) %] @@ -403,6 +405,7 @@ $(document).ready(function() { [% IF (forceallow) %][% END %] + @@ -508,11 +511,11 @@ No patron matched [% message %] [% END %] - [% IF ( borrowers ) %] [% INCLUDE 'patron-toolbar.inc' %] +
Patron selection @@ -563,8 +566,8 @@ No patron matched [% message %] [% END %] - + [% IF ( issue ) %]
[% ELSE %] @@ -748,8 +751,6 @@ No patron matched [% message %] [% END %] - - @@ -808,7 +809,6 @@ No patron matched [% message %] [% END %] - @@ -922,8 +922,6 @@ No patron matched [% message %] [% END %] - - [% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]
--