@@ -, +, @@ acquisitions --- acqui/addorder.pl | 4 +- acqui/neworderbiblio.pl | 163 --------------------- .../prog/en/modules/acqui/neworderbiblio.tt | 138 ----------------- 3 files changed, 1 insertion(+), 304 deletions(-) delete mode 100755 acqui/neworderbiblio.pl delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt --- a/acqui/addorder.pl +++ a/acqui/addorder.pl @@ -32,9 +32,7 @@ It is called by : =over -=item neworderbiblio.pl to add an order from nothing. - -=item neworderempty.pl to add an order from an existing biblio. +=item neworderempty.pl to add an order from an existing record or from nothing. =item newordersuggestion.pl to add an order from an existing suggestion. --- a/acqui/neworderbiblio.pl +++ a/acqui/neworderbiblio.pl @@ -1,163 +0,0 @@ -#!/usr/bin/perl - -#origninally script to provide intranet (librarian) advanced search facility -#now script to do searching for acquisitions - -# Copyright 2000-2002 Katipo Communications -# Copyright 2008-2009 BibLibre SARL -# -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Koha is distributed in the hope that it will be useful, but -# WITHOUT ANY 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, see . - -=head1 NAME - -neworderbiblio.pl - -=head1 DESCRIPTION - -this script allows to perform a new order from an existing record. - -=head1 CGI PARAMETERS - -=over 4 - -=item search -the title the librarian has typed to search an existing record. - -=item q -the keyword the librarian has typed to search an existing record. - -=item author -the author of the new record. - -=item num -the number of result per page to display - -=item booksellerid -the id of the bookseller this script has to add an order. - -=item basketno -the basket number to know on which basket this script have to add a new order. - -=back - -=cut - -use Modern::Perl; - -use C4::Search; -use CGI qw ( -utf8 ); -use C4::Biblio; -use C4::Auth; -use C4::Output; -use C4::Koha; -use C4::Budgets qw/ GetBudgetHierarchy /; -use C4::Languages qw(getlanguage); - -use Koha::Acquisition::Booksellers; -use Koha::SearchEngine; -use Koha::SearchEngine::Search; -use Koha::SearchEngine::QueryBuilder; -use Koha::Patrons; - -my $input = new CGI; - -#getting all CGI params into a hash. -my $params = $input->Vars; - -my $page = $params->{'page'} || 1; -my $query = $params->{'q'}; -my $results_per_page = $params->{'num'} || 20; -my $booksellerid = $params->{'booksellerid'}; -my $basketno = $params->{'basketno'}; -my $sub = $params->{'sub'}; -my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid ); -my $lang = C4::Languages::getlanguage($input); - -# getting the template -my ( $template, $loggedinuser, $cookie ) = get_template_and_user( - { - template_name => "acqui/neworderbiblio.tt", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => { acquisition => 'order_manage' }, - } -); - -output_and_exit( $input, $cookie, $template, 'unknown_vendor') unless $bookseller; - -# Searching the catalog. - -my @operands = $query; -my $QParser; -$QParser = C4::Context->queryparser if (C4::Context->preference('UseQueryParser')); -my $builtquery; -my $builder = Koha::SearchEngine::QueryBuilder->new({index => $Koha::SearchEngine::BIBLIOS_INDEX}); -my $searcher = Koha::SearchEngine::Search->new({index => $Koha::SearchEngine::BIBLIOS_INDEX}); -if ($QParser) { - $builtquery = $query; -} else { - ( undef, $builtquery, undef, undef, undef, undef, undef, undef, undef, undef ) = - $builder->build_query_compat( undef, \@operands, undef, undef, undef, 0, $lang ); -} -my ( $error, $marcresults, $total_hits ) = $searcher->simple_search_compat($builtquery, $results_per_page * ($page - 1), $results_per_page); - -if (defined $error) { - $template->param( - query_error => $error, - basketno => $basketno, - booksellerid => $bookseller->id, - name => $bookseller->name, - ); - output_html_with_http_headers $input, $cookie, $template->output; - exit; -} - -my @results; - -foreach my $result ( @{$marcresults} ) { - my $marcrecord = C4::Search::new_record_from_zebra( 'biblioserver', $result ); - my $biblio = TransformMarcToKoha( $marcrecord, '' ); - - $biblio->{booksellerid} = $booksellerid; - push @results, $biblio; - -} - -my $patron = Koha::Patrons->find( $loggedinuser ); -my $budgets = GetBudgetHierarchy(q{},$patron->branchcode,$patron->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, - resultsloop => \@results, - total => $total_hits, - query => $query, - pagination_bar => pagination_bar( "/cgi-bin/koha/acqui/neworderbiblio.pl?q=$query&booksellerid=$booksellerid&basketno=$basketno&", getnbpages( $total_hits, $results_per_page ), $page, 'page' ), -); - -# BUILD THE TEMPLATE -output_html_with_http_headers $input, $cookie, $template->output; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt @@ -1,138 +0,0 @@ -[% USE raw %] -[% USE Asset %] -[% PROCESS 'i18n.inc' %] -[% SET footerjs = 1 %] -[% INCLUDE 'doc-head-open.inc' %] -Koha › Acquisitions › Search existing records -[% INCLUDE 'doc-head-close.inc' %] - - - -[% INCLUDE 'header.inc' %] -[% INCLUDE 'acquisitions-search.inc' %] - - - -[% INCLUDE 'blocking_errors.inc' %] - -
-
-
-
- -

Search existing records

- - -[% IF ( total ) %] -[% total | html %] results found -
[% pagination_bar | $raw %]
-[% ELSE %] -

No results found

-

- No results match your search for “[% query | html %]” in [% LibraryName | html %] -

-[% END %] - -[% IF ( query_error ) %] -

Error: [% query_error | html %]

-[% END %] - -[% IF ( total ) %] -
- - - - - - - - - - - [% FOREACH biblio IN resultsloop %] - - - - - - - [% END %] - -
SummaryPublisherCopyrightActions
-

[% INCLUDE 'biblio-title.inc' %] - [% IF ( biblio.author ) %] by [% biblio.author | html %],[% END %]

-

[% IF ( biblio.isbn ) %] [% biblio.isbn | html %][% END %] - [% IF ( biblio.pages ) %] - [% biblio.pages | html %][% END %] - [% IF ( biblio.notes ) %] : [% biblio.notes | html %][% END %] - [% IF ( biblio.size ) %] ; [% biblio.size | html %][% END %] -

-
- [% biblio.publishercode | html %] - [% IF ( biblio.place ) %] ; [% biblio.place | html %][% END %] - - [% biblio.copyrightdate | html %] - - View MARC - [% tp('verb', 'Order') | html %] -
- -
-[% END %] - -[% INCLUDE 'acquisitions-add-to-basket.inc' %] - -
-
- -
- -
-
- -[% MACRO jsinclude BLOCK %] - [% Asset.js("js/acquisitions-menu.js") | $raw %] - [% INCLUDE 'datatables.inc' %] - [% Asset.js("js/acq.js") | $raw %] - -[% END %] - -[% INCLUDE 'intranet-bottom.inc' %] --