From cc8df97448a87a14a3ffbb40e61636e546526d64 Mon Sep 17 00:00:00 2001 From: Rafal Kopaczka Date: Fri, 25 Oct 2013 16:34:16 +0200 Subject: [PATCH] Bug 10770: reserve slip don't print correctly. When print slip is requested on hold with next available copy option, informations about items arent populated. This patch modifies reservations before generatig print slip. Test plan: 1. Place new hold on next available copy. 2. Check in any item from this hold biblio. 3. Click Print and confirm. 4. There shuld be missing itemcallnumber and barcode info. 5. Check in and print again and all informations are ok. 6. Delete hold. 7. Apply patch. 8. Repat 1-3, now at print slip there shuld be barcode and itemnumber after first print. --- circ/hold-transfer-slip.pl | 3 +++ circ/returns.pl | 2 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 10 +++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/circ/hold-transfer-slip.pl b/circ/hold-transfer-slip.pl index 8ae5d2a..7adcf52 100755 --- a/circ/hold-transfer-slip.pl +++ b/circ/hold-transfer-slip.pl @@ -38,6 +38,7 @@ my $session = get_session($sessionID); my $biblionumber = $input->param('biblionumber'); my $borrowernumber = $input->param('borrowernumber'); +my $itemnumber = $input->param('itemnumber'); my $transfer = $input->param('transfer'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( @@ -52,6 +53,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( ); my $userenv = C4::Context->userenv; + +ModReserveAffect( $itemnumber, $borrowernumber, $transfer); my ($slip, $is_html); if ( my $letter = ReserveSlip ($session->param('branch') || $userenv->{branch}, $borrowernumber, $biblionumber) ) { $slip = $letter->{content}; diff --git a/circ/returns.pl b/circ/returns.pl index 93f36f2..137983c 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -403,7 +403,7 @@ if ( $messages->{'ResFound'}) { barcode => $barcode, destbranch => $reserve->{'branchcode'}, borrowernumber => $reserve->{'borrowernumber'}, - itemnumber => $reserve->{'itemnumber'}, + itemnumber => $itemnumber, reservenotes => $reserve->{'reservenotes'}, ); } # else { ; } # error? diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index fb30311..e18cd98 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -108,7 +108,7 @@ $(document).ready(function () { - + [% END %] [% END %] @@ -144,7 +144,7 @@ $(document).ready(function () {
- + [% FOREACH inputloo IN inputloop %] @@ -186,7 +186,7 @@ $(document).ready(function () { - + [% FOREACH inputloo IN inputloop %] @@ -294,10 +294,10 @@ $(document).ready(function () { [% IF ( transfertodo ) %] - + [% ELSE %] - + [% END %] [% FOREACH inputloo IN inputloop %] -- 1.7.2.5