From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Sun, 25 Apr 2010 19:44:33 +0000 (+1200)
Subject: Bug 4372 - Fix for bookcount.pl not counting started transfers as seeing an item
X-Git-Tag: v3.02.00-alpha2~88
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=8478586cf145fa19f4383812289bbf22b72d2d64;p=koha-ffzg.git

Bug 4372 - Fix for bookcount.pl not counting started transfers as seeing an item

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 00b11efa02..77650a0fab 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -326,8 +326,9 @@ sub transferbook {
 
         # don't need to update MARC anymore, we do it in batch now
         $messages->{'WasTransfered'} = 1;
-		ModDateLastSeen( $itemnumber );
+
     }
+    ModDateLastSeen( $itemnumber );
     return ( $dotransfer, $messages, $biblio );
 }
 
diff --git a/circ/bookcount.pl b/circ/bookcount.pl
index 2ae4f4a3a3..228772efe8 100755
--- a/circ/bookcount.pl
+++ b/circ/bookcount.pl
@@ -162,9 +162,12 @@ sub lastseenat {
     $sth->execute( $itm, $brc, $itm, $brc );
     my ($date1) = $sth->fetchrow_array;
     $sth = $dbh->prepare(
-"SELECT max(datearrived) FROM branchtransfers WHERE itemnumber=? AND tobranch = ?"
+    "SELECT MAX(transfer) FROM (SELECT max(datearrived) AS transfer FROM branchtransfers WHERE itemnumber=? AND tobranch = ?
+     UNION ALL
+     SELECT max(datesent) AS transfer FROM branchtransfers WHERE itemnumber=? AND frombranch = ?
+	) tmp"
     );
-    $sth->execute( $itm, $brc );
+    $sth->execute( $itm, $brc, $itm, $brc );
     my ($date2) = $sth->fetchrow_array;
 
     my $date = ( $date1 lt $date2 ) ? $date2 : $date1 ;