X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Forderreceive.pl;h=2b59698a71c5f11b9fbfca75beb436f449afbc75;hb=32c5ef613d8805304c1b7f97e597116226b7bbe8;hp=98ba544246117386b3a0383cd4154fcc6eb24704;hpb=ce037a96eb173e300a564ca96415d8c8bbe304b9;p=koha.git

diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
index 98ba544246..2b59698a71 100755
--- a/acqui/orderreceive.pl
+++ b/acqui/orderreceive.pl
@@ -34,7 +34,7 @@ It permit to write a new order as 'received'.
 
 =over 4
 
-=item supplierid
+=item booksellerid
 
 to know on what supplier this script has to display receive order.
 
@@ -70,16 +70,18 @@ use C4::Auth;
 use C4::Output;
 use C4::Dates qw/format_date/;
 use C4::Bookseller qw/ GetBookSellerFromId /;
+use C4::Budgets qw/ GetBudget /;
 use C4::Members;
 use C4::Branch;    # GetBranches
 use C4::Items;
 use C4::Biblio;
+use C4::Suggestions;
 
 
 my $input      = new CGI;
 
 my $dbh          = C4::Context->dbh;
-my $supplierid   = $input->param('supplierid');
+my $booksellerid   = $input->param('booksellerid');
 my $ordernumber       = $input->param('ordernumber');
 my $search       = $input->param('receive');
 my $invoice      = $input->param('invoice');
@@ -89,7 +91,7 @@ my $datereceived = $input->param('datereceived');
 
 $datereceived = $datereceived ? C4::Dates->new($datereceived, 'iso') : C4::Dates->new();
 
-my $bookseller = GetBookSellerFromId($supplierid);
+my $bookseller = GetBookSellerFromId($booksellerid);
 my $input_gst = ($input->param('gst') eq '' ? undef : $input->param('gst'));
 my $gst= $input_gst // $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
 my $results = SearchOrder($ordernumber,$search);
@@ -115,16 +117,15 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 # prepare the form for receiving
 if ( $count == 1 ) {
     if (C4::Context->preference('AcqCreateItem') eq 'receiving') {
-        # prepare empty item form
-        my $cell = PrepareItemrecordDisplay('','','','ACQ');
-        unless ($cell) {
-            $cell = PrepareItemrecordDisplay('','','','');
+        # Check if ACQ framework exists
+        my $marc = GetMarcStructure(1, 'ACQ');
+        unless($marc) {
             $template->param('NoACQframework' => 1);
         }
-        my @itemloop;
-        push @itemloop,$cell;
-        
-        $template->param(items => \@itemloop);
+        $template->param(
+            AcqCreateItemReceiving => 1,
+            UniqueItemFields => C4::Context->preference('UniqueItemFields'),
+        );
     }
 
     if ( @$results[0]->{'quantityreceived'} == 0 ) {
@@ -133,12 +134,20 @@ if ( $count == 1 ) {
     if ( @$results[0]->{'unitprice'} == 0 ) {
         @$results[0]->{'unitprice'} = '';
     }
+
+    my $suggestion   = GetSuggestionInfoFromBiblionumber(@$results[0]->{'biblionumber'});
+
+    my $authorisedby = @$results[0]->{'authorisedby'};
+    my $member = GetMember( borrowernumber => $authorisedby );
+
+    my $budget = GetBudget( @$results[0]->{'budget_id'} );
+
     $template->param(
         count                 => 1,
         biblionumber          => @$results[0]->{'biblionumber'},
         ordernumber           => @$results[0]->{'ordernumber'},
         biblioitemnumber      => @$results[0]->{'biblioitemnumber'},
-        supplierid            => @$results[0]->{'booksellerid'},
+        booksellerid            => @$results[0]->{'booksellerid'},
         freight               => $freight,
         gst                   => $gst,
         name                  => $bookseller->{'name'},
@@ -148,17 +157,22 @@ if ( $count == 1 ) {
         copyrightdate         => @$results[0]->{'copyrightdate'},
         isbn                  => @$results[0]->{'isbn'},
         seriestitle           => @$results[0]->{'seriestitle'},
-        bookfund              => @$results[0]->{'bookfundid'},
+        bookfund              => $budget->{budget_name},
         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'},
+        memberfirstname       => $member->{firstname} || "",
+        membersurname         => $member->{surname} || "",
         invoice               => $invoice,
         datereceived          => $datereceived->output(),
-        datereceived_iso          => $datereceived->output('iso'),
-        notes                       =>              $order->{notes}
+        datereceived_iso      => $datereceived->output('iso'),
+        notes                 => $order->{notes},
+        suggestionid          => $suggestion->{suggestionid},
+        surnamesuggestedby    => $suggestion->{surnamesuggestedby},
+        firstnamesuggestedby  => $suggestion->{firstnamesuggestedby},
     );
 }
 else {
@@ -172,13 +186,13 @@ else {
         $line{gst}          = $gst;
         $line{title}        = @$results[$i]->{'title'};
         $line{author}       = @$results[$i]->{'author'};
-        $line{supplierid}   = $supplierid;
+        $line{booksellerid}   = $booksellerid;
         push @loop, \%line;
     }
 
     $template->param(
         loop         => \@loop,
-        supplierid   => $supplierid,
+        booksellerid   => $booksellerid,
     );
 }
 my $op = $input->param('op');