Merge branch 'master' of /home/jmf/repos/koha-rm-root.git/
[koha_gimpoz] / acqui / orderreceive.pl
index 033e31d..5836227 100644 (file)
@@ -47,6 +47,8 @@ the number of this invoice.
 =item biblio
 The biblionumber of this order.
 
+=item daterecieved
+
 =item catview
 
 =item gst
@@ -58,49 +60,81 @@ The biblionumber of this order.
 use strict;
 use CGI;
 use C4::Context;
+use C4::Koha;   # GetKohaAuthorisedValues GetItemTypes
 use C4::Acquisition;
-use C4::Koha;
 use C4::Auth;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Date;
 use C4::Bookseller;
 use C4::Members;
+use C4::Branch;    # GetBranches
 
 my $input      = new CGI;
 my $supplierid = $input->param('supplierid');
 my $dbh        = C4::Context->dbh;
 
-my $search  = $input->param('recieve');
-my $invoice = $input->param('invoice');
-my $freight = $input->param('freight');
-my $biblio  = $input->param('biblio');
-my $catview = $input->param('catview');
-my $gst     = $input->param('gst');
-my @results = SearchOrder( $search, $supplierid, $biblio, $catview );
-my $count = scalar @results;
+my $search       = $input->param('recieve');
+my $invoice      = $input->param('invoice');
+my $freight      = $input->param('freight');
+my $biblionumber       = $input->param('biblionumber');
+my $daterecieved = $input->param('daterecieved') || format_date(join "-",Date::Calc::Today());
+my $catview      = $input->param('catview');
+my $gst          = $input->param('gst');
+
+my @results = SearchOrder( $search, $supplierid, $biblionumber, $catview );
+my $count   = scalar @results;
 
-# warn "C:$count for ordersearch($search,$supplierid,$biblio,$catview);";
 my @booksellers = GetBookSeller( $results[0]->{'booksellerid'} );
 
 my $date = $results[0]->{'entrydate'};
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-{
+    {
         template_name   => "acqui/orderreceive.tmpl",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
         flagsrequired   => { acquisition => 1 },
         debug           => 1,
-}
+    }
 );
 $template->param($count);
-my ($flags, $homebranch) = GetFlagsAndBranchFromBorrower($loggedinuser);
 
 if ( $count == 1 ) {
-    my $sth;
 
-    my $branches = GetBranches;
+    my $itemtypes = GetItemTypes;
+    my @itemtypesloop;
+    foreach my $thisitemtype (sort keys %$itemtypes) {
+        my %row = (
+                    value => $thisitemtype,
+                    description => $itemtypes->{$thisitemtype}->{'description'},
+                  );
+        push @itemtypesloop, \%row;
+    }
+    
+    $template->param(itemtypeloop => \@itemtypesloop);
+
+
+    my $locations = GetKohaAuthorisedValues( 'items.location' );
+    if ($locations) {
+        my @location_codes = keys %$locations;
+        my $CGIlocation    = CGI::scrolling_list(
+            -name     => 'location',
+            -id       => 'location',
+            -values   => \@location_codes,
+            -default  => $results[0]->{'itemtype'},
+            -labels   => $locations,
+            -size     => 1,
+            -tabindex => '',
+            -multiple => 0
+        );
+        $template->param( CGIlocation => $CGIlocation );
+    }
+    my $onlymine=C4::Context->preference('IndependantBranches') && 
+                C4::Context->userenv && 
+                C4::Context->userenv->{flags} !=1  && 
+                C4::Context->userenv->{branch};
+    my $branches = GetBranches($onlymine);
     my @branchloop;
     foreach my $thisbranch ( sort keys %$branches ) {
         my %row = (
@@ -108,82 +142,91 @@ if ( $count == 1 ) {
             branchname => $branches->{$thisbranch}->{'branchname'},
         );
         push @branchloop, \%row;
-}
+    }
 
     my $auto_barcode = C4::Context->boolean_preference("autoBarcode") || 0;
 
-# See whether barcodes should be automatically allocated.
-# Defaults to 0, meaning "no".
+    # See whether barcodes should be automatically allocated.
+    # Defaults to 0, meaning "no".
     my $barcode;
-    if ( $auto_barcode eq '1' ) {
-        $sth = $dbh->prepare("Select max(barcode) from items");
+    if ( $auto_barcode ) {
+        my $sth = $dbh->prepare("Select max(barcode) from items");
         $sth->execute;
         my $data = $sth->fetchrow_hashref;
         $barcode = $results[0]->{'barcode'} + 1;
         $sth->finish;
-}
+    }
 
     if ( $results[0]->{'quantityreceived'} == 0 ) {
         $results[0]->{'quantityreceived'} = '';
-}
+    }
     if ( $results[0]->{'unitprice'} == 0 ) {
         $results[0]->{'unitprice'} = '';
-}
+    }
+    $results[0]->{'copyrightdate'} =
+      format_date( $results[0]->{'copyrightdate'} );
     $template->param(
-        branchloop       => \@branchloop,
-        count            => 1,
-        biblionumber     => $results[0]->{'biblionumber'},
-        ordernumber      => $results[0]->{'ordernumber'},
-        biblioitemnumber => $results[0]->{'biblioitemnumber'},
-        supplierid       => $results[0]->{'booksellerid'},
-        freight          => $freight,
-        gst              => $gst,
-        catview          => ( $catview ne 'yes' ? 1 : 0 ),
-        name             => $booksellers[0]->{'name'},
-        date             => format_date($date),
-        title            => $results[0]->{'title'},
-        author           => $results[0]->{'author'},
-        copyrightdate    => format_date( $results[0]->{'copyrightdate'} ),
-        itemtype         => $results[0]->{'itemtype'},
-        isbn             => $results[0]->{'isbn'},
-        seriestitle      => $results[0]->{'seriestitle'},
-        barcode          => $barcode,
-        bookfund         => $results[0]->{'bookfundid'},
-        quantity         => $results[0]->{'quantity'},
-        quantityreceived => $results[0]->{'quantityreceived'},
-        rrp              => $results[0]->{'rrp'},
-        ecost            => $results[0]->{'ecost'},
-        unitprice        => $results[0]->{'unitprice'},
-        invoice          => $invoice,
-        notes            => $results[0]->{'notes'},
+        branchloop            => \@branchloop,
+        count                 => 1,
+        biblionumber          => $results[0]->{'biblionumber'},
+        ordernumber           => $results[0]->{'ordernumber'},
+        biblioitemnumber      => $results[0]->{'biblioitemnumber'},
+        supplierid            => $results[0]->{'booksellerid'},
+        freight               => $freight,
+        gst                   => $gst,
+        catview               => ( $catview ne 'yes' ? 1 : 0 ),
+        name                  => $booksellers[0]->{'name'},
+        date                  => format_date($date),
+        title                 => $results[0]->{'title'},
+        author                => $results[0]->{'author'},
+        copyrightdate         => format_date( $results[0]->{'copyrightdate'} ),
+        itemtype              => $results[0]->{'itemtype'},
+        isbn                  => $results[0]->{'isbn'},
+        seriestitle           => $results[0]->{'seriestitle'},
+        barcode               => $barcode,
+        bookfund              => $results[0]->{'bookfundid'},
+        quantity              => $results[0]->{'quantity'},
+        quantityreceivedplus1 => $results[0]->{'quantityreceived'} + 1,
+        quantityreceived      => $results[0]->{'quantityreceived'},
+        rrp                   => $results[0]->{'rrp'},
+        ecost                 => $results[0]->{'ecost'},
+        unitprice             => $results[0]->{'unitprice'},
+        invoice               => $invoice,
+        daterecieved          => $daterecieved,
+        notes                 => $results[0]->{'notes'},
+        intranetcolorstylesheet =>
+          C4::Context->preference("intranetcolorstylesheet"),
+        intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+        IntranetNav        => C4::Context->preference("IntranetNav"),
     );
 }
 else {
     my @loop;
     for ( my $i = 0 ; $i < $count ; $i++ ) {
-        my %line;
-        $line{isbn}             = $results[$i]->{'isbn'};
-        $line{basketno}         = $results[$i]->{'basketno'};
-        $line{quantity}         = $results[$i]->{'quantity'};
-        $line{quantityrecieved} = $results[$i]->{'quantityreceived'};
-        $line{ordernumber}      = $results[$i]->{'ordernumber'};
-        $line{biblionumber}     = $results[$i]->{'biblionumber'};
-        $line{invoice}          = $invoice;
-        $line{freight}          = $freight;
-        $line{gst}              = $gst;
-        $line{title}            = $results[$i]->{'title'};
-        $line{author}           = $results[$i]->{'author'};
-        $line{supplierid}       = $supplierid;
+        my %line = %{ $results[$i] };
+
+        $line{invoice}      = $invoice;
+        $line{daterecieved} = $daterecieved;
+        $line{freight}      = $freight;
+        $line{gst}          = $gst;
+        $line{title}        = $results[$i]->{'title'};
+        $line{author}       = $results[$i]->{'author'};
+        $line{supplierid}   = $supplierid;
         push @loop, \%line;
-}
+    }
     $template->param(
-        loop       => \@loop,
-        date       => format_date($date),
-        name       => $booksellers[0]->{'name'},
-        supplierid => $supplierid,
-        invoice    => $invoice,
+        loop                    => \@loop,
+        date                    => format_date($date),
+        daterecieved            => $daterecieved,
+        name                    => $booksellers[0]->{'name'},
+        supplierid              => $supplierid,
+        invoice                 => $invoice,
+        daterecieved            => $daterecieved,
+        intranetcolorstylesheet =>
+          C4::Context->preference("intranetcolorstylesheet"),
+        intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+        IntranetNav        => C4::Context->preference("IntranetNav"),
     );
 
 }
 output_html_with_http_headers $input, $cookie, $template->output;
-