From 093553bcfed721761c7b892c8b74927e0fcece68 Mon Sep 17 00:00:00 2001
From: Mason James <mtj@kohaaloha.com>
Date: Tue, 4 Jun 2013 09:55:18 +1200
Subject: [PATCH] Bug 10358 - Unable to return items via self check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="utf-8"

to test, before applying patch…

1/ issue an item to a user,
 set the duedate in the past (2001-01-01) to make this item overdue

2/ attempt to check-in item via SCO, at http://opac/cgi-bin/koha/sco/sco-main.pl
 note a warning message - with no option to return item :/
--------------------------------------
 Item cannot be checked out.
 Sorry, this item cannot be checked out at this station.
--------------------------------------

3/ apply patch

4/ attempt to check-in item via SCO
 note a warning message - now *with* a check-in button

5/ click 'check-in' button
6/ note that item has been returned successfully
---
 .../opac-tmpl/prog/en/modules/sco/sco-main.tt      |    4 ++--
 opac/sco/sco-main.pl                               |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
index bfd71a2..3b7535a 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
@@ -149,7 +149,7 @@ $(document).ready(function(){
    [% END %]
    Please see a member of the library staff.
 </p>
-[% IF ( returnitem ) %]
+
 [% IF ( AllowSelfCheckReturns ) %]
 <form action="/cgi-bin/koha/sco/sco-main.pl" name="errorForm" class="inline" method="post">
     <input type="hidden" name="op" value="returnbook" />
@@ -158,7 +158,7 @@ $(document).ready(function(){
     <input type="submit" name="returnbook" value="Return this item" class="return" />
 </form>
 [% END %]
-[% END %]
+
 <form action="/cgi-bin/koha/sco/sco-main.pl" name="errorForm" class="inline" method="post">
     <input type="hidden" name="op" value="" />
     <input type="hidden" name="patronid" value="[% patronid %]" />
diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl
index 0f16c8c..7a835df 100755
--- a/opac/sco/sco-main.pl
+++ b/opac/sco/sco-main.pl
@@ -152,6 +152,7 @@ elsif ( $op eq "checkout" ) {
             "circ_error_$issue_error" => 1,
             title                     => $item->{title},
             hide_main                 => 1,
+            barcode                   => $barcode,
         );
         if ($issue_error eq 'DEBT') {
             $template->param(amount => C4::Budgets->GetCurrency()->{symbol}.$impossible->{DEBT});
-- 
1.7.2.5