X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-basket.pl;h=7b3a90afa4ebbed179ae32106c9dc48fa7d776bd;hb=afccbfcce7192c6e1fcd73f137135cb5289c3d3d;hp=2ec664d2794ddd161e35ab5b42d4b2ccda0aed9b;hpb=a8222aeeb1169d7b1939d1e64c319a16e3846e8c;p=koha.git

diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl
index 2ec664d279..7b3a90afa4 100755
--- a/opac/opac-basket.pl
+++ b/opac/opac-basket.pl
@@ -11,9 +11,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 use strict;
@@ -21,7 +21,9 @@ use warnings;
 use CGI;
 use C4::Koha;
 use C4::Biblio;
+use C4::Branch;
 use C4::Items;
+use C4::Circulation;
 use C4::Auth;
 use C4::Output;
 
@@ -68,7 +70,7 @@ foreach my $biblionumber ( @bibs ) {
     my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
     my $marcseriesarray  = GetMarcSeries  ($record,$marcflavour);
     my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour);
-    my @items            = &GetItemsInfo( $biblionumber, 'opac' );
+    my @items            = &GetItemsInfo( $biblionumber );
     my $subtitle         = GetRecordValue('subtitle', $record, GetFrameworkCode($biblionumber));
 
     my $hasauthors = 0;
@@ -76,6 +78,7 @@ foreach my $biblionumber ( @bibs ) {
       $hasauthors = 1;
     }
     my $collections =  GetKohaAuthorisedValues('items.ccode',$dat->{'frameworkcode'}, 'opac');
+    my $shelflocations =GetKohaAuthorisedValues('items.location',$dat->{'frameworkcode'}, 'opac');
 
 	# COinS format FIXME: for books Only
         my $coins_format;
@@ -88,6 +91,18 @@ foreach my $biblionumber ( @bibs ) {
         $dat->{'even'} = 1;
     }
 
+my $branches = GetBranches();
+    for my $itm (@items) {
+        if ($itm->{'location'}){
+            $itm->{'location_opac'} = $shelflocations->{$itm->{'location'} };
+        }
+        my ( $transfertwhen, $transfertfrom, $transfertto ) = GetTransfers($itm->{itemnumber});
+        if ( defined( $transfertwhen ) && $transfertwhen ne '' ) {
+             $itm->{transfertwhen} = $transfertwhen;
+             $itm->{transfertfrom} = $branches->{$transfertfrom}{branchname};
+             $itm->{transfertto}   = $branches->{$transfertto}{branchname};
+        }
+    }
     $num++;
     $dat->{biblionumber} = $biblionumber;
     $dat->{ITEM_RESULTS}   = \@items;