BUGFIX (bloquing) moredetail & item edition

[koha_fer] / catalogue / moredetail.pl

diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
index 9c390d0..4736ded 100755 (executable)
--- a/catalogue/moredetail.pl
+++ b/catalogue/moredetail.pl
@@ -22,10 +22,13 @@ use strict;
 require Exporter;
 use C4::Koha;
 use CGI;
-use C4::Biblio;             # to use &GetBiblioItemData &GetItemsByBiblioitemnumber
+use C4::Biblio;
+use C4::Items;
+use C4::Branch;
 use C4::Acquisition;
 use C4::Output;             # contains gettemplate
 use C4::Auth;
+use C4::Serials;
 use C4::Dates qw/format_date/;
 use C4::Circulation;  # to use itemissues
 
@@ -53,6 +56,9 @@ my $title=$query->param('title');
 my $data=GetBiblioData($biblionumber);
 my $dewey = $data->{'dewey'};
 
+#coping with subscriptions
+my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
+
 # FIXME Dewey is a string, not a number, & we should use a function
 # $dewey =~ s/0+$//;
 # if ($dewey eq "000.") { $dewey = "";};
@@ -74,28 +80,41 @@ my $ordernum = GetOrderNumber($biblionumber);
 my $order = GetOrder($ordernum);
 my $ccodes= GetKohaAuthorisedValues('items.ccode',$fw);
 my $itemtypes = GetItemTypes;
+
+$data->{'itemtypename'} = $itemtypes->{$data->{'itemtype'}}->{'description'};
 $results[0]=$data;
 foreach my $item (@items){
-       $item->{itemlostloop}= GetAuthorisedValues(GetAuthValCode('items.itemlost',$fw),$item->{itemlost}) if GetAuthValCode('items.itemlost',$fw);
-       $item->{itemdamagedloop}= GetAuthorisedValues(GetAuthValCode('items.damaged',$fw),$item->{damaged}) if GetAuthValCode('items.damaged',$fw);
-       $item->{'collection'} = $ccodes->{$item->{ccode}};
-       $item->{'itype'} = $itemtypes->{$item->{'itype'}}->{'description'}; 
-       $item->{'replacementprice'}=sprintf("%.2f", $item->{'replacementprice'});
+    $item->{itemlostloop}= GetAuthorisedValues(GetAuthValCode('items.itemlost',$fw),$item->{itemlost}) if GetAuthValCode('items.itemlost',$fw);
+    $item->{itemdamagedloop}= GetAuthorisedValues(GetAuthValCode('items.damaged',$fw),$item->{damaged}) if GetAuthValCode('items.damaged',$fw);
+    $item->{'collection'} = $ccodes->{$item->{ccode}};
+    $item->{'itype'} = $itemtypes->{$item->{'itype'}}->{'description'}; 
+    $item->{'replacementprice'}=sprintf("%.2f", $item->{'replacementprice'});
     $item->{'datelastborrowed'}= format_date($item->{'datelastborrowed'});
     $item->{'dateaccessioned'} = format_date($item->{'dateaccessioned'});
     $item->{'datelastseen'} = format_date($item->{'datelastseen'});
     $item->{'ordernumber'} = $ordernum;
     $item->{'booksellerinvoicenumber'} = $order->{'booksellerinvoicenumber'};
 
-    if ($item->{'date_due'} eq ''){
+    if (C4::Context->preference("IndependantBranches")) {
+        #verifying rights
+        my $userenv = C4::Context->userenv();
+        unless (($userenv->{'flags'} == 1) or ($userenv->{'branch'} eq $item->{'homebranch'})) {
+                $item->{'nomod'}=1;
+        }
+    }
+    $item->{'homebranchname'} = GetBranchName($item->{'homebranch'});
+    $item->{'holdingbranchname'} = GetBranchName($item->{'holdingbranch'});
+    if ($item->{'onloan'} eq ''){
         $item->{'issue'}= 0;
     } else {
-        $item->{'date_due'} = format_date($item->{'date_due'});
+        $item->{'onloan'} = format_date($item->{'onloan'});
         $item->{'issue'}= 1;
     }
 }
-
-$template->param(count => $data->{'count'});
+$template->param(count => $data->{'count'},
+       subscriptionsnumber => $subscriptionsnumber,
+    subscriptiontitle   => $data->{title},
+);
 $template->param(BIBITEM_DATA => \@results);
 $template->param(ITEM_DATA => \@items);
 $template->param(moredetailview => 1);