X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Fneworderbiblio.pl;h=0e0706699b02c32ea72572443db8b97ea70d55db;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=09709d7aa88f1b0884556de170ae9e11b12ffbc9;hpb=c9ba8c899d854d4190df783f3f1aec2989d2cb10;p=koha_fer

diff --git a/acqui/neworderbiblio.pl b/acqui/neworderbiblio.pl
index 09709d7aa8..0e0706699b 100755
--- a/acqui/neworderbiblio.pl
+++ b/acqui/neworderbiblio.pl
@@ -60,11 +60,13 @@ use strict;
 
 use C4::Search;
 use CGI;
-use C4::Bookseller;
+use C4::Bookseller qw/ GetBookSellerFromId /;
 use C4::Biblio;
 use C4::Auth;
 use C4::Output;
 use C4::Koha;
+use C4::Members qw/ GetMember /;
+use C4::Budgets qw/ GetBudgetHierarchy /;
 
 my $input = new CGI;
 
@@ -91,10 +93,11 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 );
 
 # Searching the catalog.
-my ($error, $marcresults, $total_hits) = SimpleSearch($query, $results_per_page * ($page - 1), $results_per_page);
+
+    # find results
+my ( $error, $marcresults, $total_hits ) = SimpleSearch( $query, $results_per_page * ( $page - 1 ), $results_per_page );
 
 if (defined $error) {
-    warn "error: ".$error;
     $template->param(
         query_error => $error,
         basketno             => $basketno,
@@ -107,20 +110,31 @@ if (defined $error) {
 
 my @results;
 
-if ($marcresults) {
-    foreach my $result ( @{$marcresults} ) {
-        my $marcrecord = MARC::File::USMARC::decode( $result );
-        my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
+foreach my $result ( @{$marcresults} ) {
+    my $marcrecord = C4::Search::new_record_from_zebra( 'biblioserver', $result );
+    my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
+
+    $biblio->{booksellerid} = $booksellerid;
+    push @results, $biblio;
 
-        $biblio->{booksellerid} = $booksellerid;
-        push @results, $biblio;
+}
 
+my $borrower= GetMember('borrowernumber' => $loggedinuser);
+my $budgets = GetBudgetHierarchy(q{},$borrower->{branchcode},$borrower->{borrowernumber});
+my $has_budgets = 0;
+foreach my $r (@{$budgets}) {
+    if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) {
+        next;
     }
+    $has_budgets = 1;
+    last;
 }
+
 $template->param(
+    has_budgets          => $has_budgets,
     basketno             => $basketno,
-    booksellerid     => $bookseller->{'id'},
-    name             => $bookseller->{'name'},
+    booksellerid         => $bookseller->{'id'},
+    name                 => $bookseller->{'name'},
     resultsloop          => \@results,
     total                => $total_hits,
     query                => $query,