3d3944cba3
When adding an order line to a basket using the 'from a suggestion' feature, the list of accepted suggestions doesn't show any information from the acquisition are of the suggestions. This patch adds new columns to the list for: - library - fund - price - quantity - total To test: - Create several suggestions with - Empty acq values - A specific library, any library - Set acq values (fund, price, quantity) - Accept your suggestions - Create a new basket/order - Add an order line from accepted suggestions - Verify the list displays nicely with the new columns - Verify filters etc. still work ok Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
158 lines
3.7 KiB
Perl
Executable file
158 lines
3.7 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2006 Biblibre
|
|
# Parts Copyright 2011 PTFS Europe
|
|
#
|
|
# 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 <http://www.gnu.org/licenses>.
|
|
|
|
=head1 NAME
|
|
|
|
newordersuggestion.pl
|
|
|
|
=head1 DESCRIPTION
|
|
|
|
this script allow to add an order from a existing suggestion.
|
|
The suggestion must have 'ACCEPTED' as status.
|
|
|
|
=head1 CGI PARAMETERS
|
|
|
|
=over 4
|
|
|
|
=item basketno
|
|
|
|
the number of this basket.
|
|
|
|
=item booksellerid
|
|
|
|
the bookseller who sells this record.
|
|
|
|
=item title
|
|
|
|
to filter on title when searching among ACCEPTED suggestion.
|
|
|
|
=item author
|
|
|
|
to filter on author when searching among ACCEPTED suggestion.
|
|
|
|
=item note
|
|
|
|
to filter on note when searching among ACCEPTED suggestion.
|
|
|
|
=item copyrightdate
|
|
|
|
=item publishercode
|
|
|
|
=item volumedesc
|
|
|
|
=item publicationyear
|
|
|
|
the publication year of this record.
|
|
|
|
=item place
|
|
|
|
=item isbn
|
|
|
|
the isbn of this suggestion.
|
|
|
|
=item duplicateNumber
|
|
|
|
is the biblionumber to put to the new suggestion.
|
|
|
|
=item suggestionid
|
|
|
|
the id of the suggestion to select.
|
|
|
|
=item op
|
|
|
|
can be equal to
|
|
* connectDuplicate :
|
|
then call to the function : ConnectSuggestionAndBiblio.
|
|
i.e set the biblionumber of this suggestion.
|
|
* else :
|
|
is the default value.
|
|
|
|
=back
|
|
|
|
=cut
|
|
|
|
use Modern::Perl;
|
|
|
|
use CGI qw ( -utf8 );
|
|
use C4::Auth; # get_template_and_user
|
|
use C4::Output;
|
|
use C4::Suggestions;
|
|
use C4::Biblio;
|
|
use C4::Budgets;
|
|
|
|
use Koha::Acquisition::Booksellers;
|
|
|
|
my $input = new CGI;
|
|
|
|
# getting the CGI params
|
|
my $basketno = $input->param('basketno');
|
|
my $booksellerid = $input->param('booksellerid');
|
|
my $author = $input->param('author');
|
|
my $title = $input->param('title');
|
|
my $publishercode = $input->param('publishercode');
|
|
my $op = $input->param('op');
|
|
my $suggestionid = $input->param('suggestionid');
|
|
my $duplicateNumber = $input->param('duplicateNumber');
|
|
my $uncertainprice = $input->param('uncertainprice');
|
|
|
|
$op = 'else' unless $op;
|
|
|
|
my $dbh = C4::Context->dbh;
|
|
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "acqui/newordersuggestion.tt",
|
|
type => "intranet",
|
|
query => $input,
|
|
flagsrequired => { acquisition => 'order_manage' },
|
|
}
|
|
);
|
|
|
|
if ( $op eq 'connectDuplicate' ) {
|
|
ConnectSuggestionAndBiblio( $suggestionid, $duplicateNumber );
|
|
}
|
|
|
|
# getting all suggestions.
|
|
my $suggestions_loop = SearchSuggestion(
|
|
{
|
|
author => $author,
|
|
title => $title,
|
|
publishercode => $publishercode,
|
|
STATUS => 'ACCEPTED'
|
|
}
|
|
);
|
|
|
|
foreach my $suggestion (@$suggestions_loop) {
|
|
if ($suggestion->{budgetid}){
|
|
my $bud = GetBudget( $suggestion->{budgetid} );
|
|
$suggestion->{budget_name} = $bud->{budget_name} if $bud;
|
|
}
|
|
}
|
|
|
|
my $vendor = Koha::Acquisition::Booksellers->find( $booksellerid );
|
|
$template->param(
|
|
suggestions_loop => $suggestions_loop,
|
|
basketno => $basketno,
|
|
booksellerid => $booksellerid,
|
|
name => $vendor->name,
|
|
loggedinuser => $borrowernumber,
|
|
"op_$op" => 1,
|
|
);
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|