From 2cce506a80c6d0aa910ff1d466fd170093418f9d Mon Sep 17 00:00:00 2001 From: simith Date: Thu, 26 Feb 2015 15:35:11 -0500 Subject: [PATCH] This patch adds the following warning during the return of a document that was reserved to a course: "Please return 'title' to the 'course name' class reserve." Testing: 1) Define a document as a course reserve see manual.koha-community.org/3.14/en/coursereserves.html 2) Checkout and checkin this document. Validade the warning http://bugs.koha-community.org/show_bug.cgi?id=13334 --- circ/returns.pl | 11 ++++++++++- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 7 +++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/circ/returns.pl b/circ/returns.pl index 9f2e52dab1..095c1c3cfd 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -42,6 +42,7 @@ use C4::Members; use C4::Output qw( output_html_with_http_headers ); use C4::Reserves qw( ModReserve ModReserveAffect CheckReserves ); use C4::RotatingCollections; +use C4::CourseReserves; use Koha::AuthorisedValues; use Koha::BiblioFrameworks; use Koha::Calendar; @@ -430,7 +431,15 @@ if ($barcode && ( $op eq 'cud-checkin' || $op eq 'cud-affect_reserve' ) ) { ); } } - + # Verify if the item is in the course reserve + my $course_reserves = C4::CourseReserves::GetItemCourseReservesInfo( itemnumber => $itemnumber ); + if($course_reserves) { + $template->param( + found => 1, + course_reserve => 1, + course_name => $course_reserves->[0]->{course}->{course_name} + ); + } } elsif ( C4::Context->preference('ShowAllCheckins') and !$messages->{'BadBarcode'} and !$needs_confirm and !$bundle_confirm ) { my $duedate = 0; if ($issue) { 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 6f091f67a6..7c7ac974ba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -739,6 +739,13 @@ [% END # /IF waiting %] + [% IF ( course_reserve ) %] + +
+

[% title or "item" |html %] is part of the [% course_name %] course reserve.

+
+ [% END %] + [% IF (transfer || needstransfer) && !(reserved and !recalled and !waitingrecall) %] [% IF Koha.Preference('TransfersBlockCirc') %]