481c062fe9
This patch adds a new filter "basket group name" for pending orders searches. Test plan: Try different filters and check that results are consistent. Try to filter by basket group name. Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Applied on top of patches for bug 10723. Passes all tests and QA script. Note: It's a bit irritating that the basket name is not shown in the list of pending orders, so there is no way to check the results are correct without checking from another page. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
317 lines
10 KiB
Perl
Executable file
317 lines
10 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
#script to recieve orders
|
|
|
|
|
|
# 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 2 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, write to the Free Software Foundation, Inc.,
|
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
=head1 NAME
|
|
|
|
parcel.pl
|
|
|
|
=head1 DESCRIPTION
|
|
|
|
This script shows all orders receipt or pending for a given supplier.
|
|
It allows to write an order as 'received' when he arrives.
|
|
|
|
=head1 CGI PARAMETERS
|
|
|
|
=over 4
|
|
|
|
=item booksellerid
|
|
|
|
To know the supplier this script has to show orders.
|
|
|
|
=item code
|
|
|
|
is the bookseller invoice number.
|
|
|
|
|
|
=item gst
|
|
|
|
|
|
=item datereceived
|
|
|
|
To filter the results list on this given date.
|
|
|
|
=back
|
|
|
|
=cut
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use C4::Auth;
|
|
use C4::Acquisition;
|
|
use C4::Budgets;
|
|
use C4::Bookseller qw/ GetBookSellerFromId /;
|
|
use C4::Biblio;
|
|
use C4::Items;
|
|
use CGI;
|
|
use C4::Output;
|
|
use C4::Dates qw/format_date format_date_in_iso/;
|
|
use C4::Suggestions;
|
|
use JSON;
|
|
|
|
my $input=new CGI;
|
|
|
|
sub get_value_with_gst_params {
|
|
my $value = shift;
|
|
my $gstrate = shift;
|
|
my $bookseller = shift;
|
|
if ( $bookseller->{listincgst} ) {
|
|
if ( $bookseller->{invoiceincgst} ) {
|
|
return $value;
|
|
} else {
|
|
return $value / ( 1 + $gstrate );
|
|
}
|
|
} else {
|
|
if ( $bookseller->{invoiceincgst} ) {
|
|
return $value * ( 1 + $gstrate );
|
|
} else {
|
|
return $value;
|
|
}
|
|
}
|
|
}
|
|
|
|
sub get_gste {
|
|
my $value = shift;
|
|
my $gstrate = shift;
|
|
my $bookseller = shift;
|
|
return $bookseller->{invoiceincgst}
|
|
? $value / ( 1 + $gstrate )
|
|
: $value;
|
|
}
|
|
|
|
sub get_gst {
|
|
my $value = shift;
|
|
my $gstrate = shift;
|
|
my $bookseller = shift;
|
|
return $bookseller->{invoiceincgst}
|
|
? $value / ( 1 + $gstrate ) * $gstrate
|
|
: $value * ( 1 + $gstrate ) - $value;
|
|
}
|
|
|
|
my ($template, $loggedinuser, $cookie)
|
|
= get_template_and_user({template_name => "acqui/parcel.tmpl",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => {acquisition => 'order_receive'},
|
|
debug => 1,
|
|
});
|
|
|
|
my $invoiceid = $input->param('invoiceid');
|
|
my $invoice;
|
|
$invoice = GetInvoiceDetails($invoiceid) if $invoiceid;
|
|
|
|
unless( $invoiceid and $invoice->{invoiceid} ) {
|
|
$template->param(
|
|
error_invoice_not_known => 1,
|
|
no_orders_to_display => 1
|
|
);
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
exit;
|
|
}
|
|
|
|
my $op = $input->param('op') // '';
|
|
|
|
if ($op eq 'cancelreceipt') {
|
|
my $ordernumber = $input->param('ordernumber');
|
|
my $parent_ordernumber = CancelReceipt($ordernumber);
|
|
unless($parent_ordernumber) {
|
|
$template->param(error_cancelling_receipt => 1);
|
|
}
|
|
}
|
|
|
|
my $booksellerid = $invoice->{booksellerid};
|
|
my $bookseller = GetBookSellerFromId($booksellerid);
|
|
my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
|
|
my $datereceived = C4::Dates->new();
|
|
|
|
my $cfstr = "%.2f"; # currency format string -- could get this from currency table.
|
|
my @parcelitems = @{ $invoice->{orders} };
|
|
my $countlines = scalar @parcelitems;
|
|
my $totalprice = 0;
|
|
my $totalquantity = 0;
|
|
my $total;
|
|
my @loop_received = ();
|
|
my @book_foot_loop;
|
|
my %foot;
|
|
my $total_quantity = 0;
|
|
my $total_gste = 0;
|
|
my $total_gsti = 0;
|
|
|
|
for my $item ( @parcelitems ) {
|
|
$item->{unitprice} = get_value_with_gst_params( $item->{unitprice}, $item->{gstrate}, $bookseller );
|
|
$total = ( $item->{'unitprice'} ) * $item->{'quantityreceived'};
|
|
$item->{'unitprice'} += 0;
|
|
my %line = %{ $item };
|
|
my $ecost = get_value_with_gst_params( $line{ecost}, $line{gstrate}, $bookseller );
|
|
$line{ecost} = sprintf( "%.2f", $ecost );
|
|
$line{invoice} = $invoice->{invoicenumber};
|
|
$line{total} = sprintf($cfstr, $total);
|
|
$line{booksellerid} = $invoice->{booksellerid};
|
|
$totalprice += $item->{'unitprice'};
|
|
$line{unitprice} = sprintf( $cfstr, $item->{'unitprice'} );
|
|
my $gste = get_gste( $line{total}, $line{gstrate}, $bookseller );
|
|
my $gst = get_gst( $line{total}, $line{gstrate}, $bookseller );
|
|
$foot{$line{gstrate}}{gstrate} = $line{gstrate};
|
|
$foot{$line{gstrate}}{value} += sprintf( "%.2f", $gst );
|
|
$total_quantity += $line{quantity};
|
|
$total_gste += $gste;
|
|
$total_gsti += $gste + $gst;
|
|
|
|
my $suggestion = GetSuggestionInfoFromBiblionumber($line{biblionumber});
|
|
$line{suggestionid} = $suggestion->{suggestionid};
|
|
$line{surnamesuggestedby} = $suggestion->{surnamesuggestedby};
|
|
$line{firstnamesuggestedby} = $suggestion->{firstnamesuggestedby};
|
|
|
|
if ( $line{parent_ordernumber} != $line{ordernumber} ) {
|
|
if ( grep { $_->{ordernumber} == $line{parent_ordernumber} }
|
|
@parcelitems )
|
|
{
|
|
$line{cannot_cancel} = 1;
|
|
}
|
|
}
|
|
|
|
my $budget = GetBudget( $line{budget_id} );
|
|
$line{budget_name} = $budget->{'budget_name'};
|
|
|
|
push @loop_received, \%line;
|
|
$totalquantity += $item->{'quantityreceived'};
|
|
|
|
}
|
|
push @book_foot_loop, map { $_ } values %foot;
|
|
|
|
my @loop_orders = ();
|
|
if(!defined $invoice->{closedate}) {
|
|
my $pendingorders;
|
|
if($input->param('op') eq "search"){
|
|
my $search = $input->param('summaryfilter') || '';
|
|
my $ean = $input->param('eanfilter') || '';
|
|
my $basketname = $input->param('basketfilter') || '';
|
|
my $orderno = $input->param('orderfilter') || '';
|
|
my $basketgroupname = $input->param('basketgroupnamefilter') || '';
|
|
$pendingorders = SearchOrders({
|
|
booksellerid => $booksellerid,
|
|
basketname => $basketname,
|
|
ordernumber => $orderno,
|
|
search => $search,
|
|
ean => $ean,
|
|
basketgroupname => $basketgroupname,
|
|
pending => 1,
|
|
});
|
|
$template->param(
|
|
summaryfilter => $search,
|
|
eanfilter => $ean,
|
|
basketfilter => $basketname,
|
|
orderfilter => $orderno,
|
|
basketgroupnamefilter => $basketgroupname,
|
|
);
|
|
}else{
|
|
$pendingorders = SearchOrders({
|
|
booksellerid => $booksellerid,
|
|
pending => 1
|
|
});
|
|
}
|
|
my $countpendings = scalar @$pendingorders;
|
|
|
|
for (my $i = 0 ; $i < $countpendings ; $i++) {
|
|
my %line;
|
|
%line = %{$pendingorders->[$i]};
|
|
|
|
my $ecost = get_value_with_gst_params( $line{ecost}, $line{gstrate}, $bookseller );
|
|
$line{unitprice} = get_value_with_gst_params( $line{unitprice}, $line{gstrate}, $bookseller );
|
|
$line{quantity} += 0;
|
|
$line{quantityreceived} += 0;
|
|
$line{unitprice}+=0;
|
|
$line{ecost} = sprintf( "%.2f", $ecost );
|
|
$line{ordertotal} = sprintf( "%.2f", $ecost * $line{quantity} );
|
|
$line{unitprice} = sprintf("%.2f",$line{unitprice});
|
|
$line{invoice} = $invoice;
|
|
$line{booksellerid} = $booksellerid;
|
|
|
|
|
|
|
|
my $biblionumber = $line{'biblionumber'};
|
|
my $countbiblio = CountBiblioInOrders($biblionumber);
|
|
my $ordernumber = $line{'ordernumber'};
|
|
my @subscriptions = GetSubscriptionsId ($biblionumber);
|
|
my $itemcount = GetItemsCount($biblionumber);
|
|
my $holds = GetHolds ($biblionumber);
|
|
my @items = GetItemnumbersFromOrder( $ordernumber );
|
|
my $itemholds;
|
|
foreach my $item (@items){
|
|
my $nb = GetItemHolds($biblionumber, $item);
|
|
if ($nb){
|
|
$itemholds += $nb;
|
|
}
|
|
}
|
|
|
|
my $suggestion = GetSuggestionInfoFromBiblionumber($line{biblionumber});
|
|
$line{suggestionid} = $suggestion->{suggestionid};
|
|
$line{surnamesuggestedby} = $suggestion->{surnamesuggestedby};
|
|
$line{firstnamesuggestedby} = $suggestion->{firstnamesuggestedby};
|
|
|
|
# if the biblio is not in other orders and if there is no items elsewhere and no subscriptions and no holds we can then show the link "Delete order and Biblio" see bug 5680
|
|
$line{can_del_bib} = 1 if $countbiblio <= 1 && $itemcount == scalar @items && !(@subscriptions) && !($holds);
|
|
$line{items} = ($itemcount) - (scalar @items);
|
|
$line{left_item} = 1 if $line{items} >= 1;
|
|
$line{left_biblio} = 1 if $countbiblio > 1;
|
|
$line{biblios} = $countbiblio - 1;
|
|
$line{left_subscription} = 1 if scalar @subscriptions >= 1;
|
|
$line{subscriptions} = scalar @subscriptions;
|
|
$line{left_holds} = ($holds >= 1) ? 1 : 0;
|
|
$line{left_holds_on_order} = 1 if $line{left_holds}==1 && ($line{items} == 0 || $itemholds );
|
|
$line{holds} = $holds;
|
|
$line{holds_on_order} = $itemholds?$itemholds:$holds if $line{left_holds_on_order};
|
|
|
|
my $budget = GetBudget( $line{budget_id} );
|
|
$line{budget_name} = $budget->{'budget_name'};
|
|
|
|
push @loop_orders, \%line;
|
|
}
|
|
|
|
$template->param(
|
|
loop_orders => \@loop_orders,
|
|
);
|
|
}
|
|
|
|
$template->param(
|
|
invoiceid => $invoice->{invoiceid},
|
|
invoice => $invoice->{invoicenumber},
|
|
invoiceclosedate => $invoice->{closedate},
|
|
datereceived => $datereceived->output('iso'),
|
|
invoicedatereceived => $datereceived->output('iso'),
|
|
formatteddatereceived => $datereceived->output(),
|
|
name => $bookseller->{'name'},
|
|
booksellerid => $bookseller->{id},
|
|
countreceived => $countlines,
|
|
loop_received => \@loop_received,
|
|
loop_orders => \@loop_orders,
|
|
book_foot_loop => \@book_foot_loop,
|
|
totalprice => sprintf($cfstr, $totalprice),
|
|
totalquantity => $totalquantity,
|
|
(uc(C4::Context->preference("marcflavour"))) => 1,
|
|
total_quantity => $total_quantity,
|
|
total_gste => sprintf( "%.2f", $total_gste ),
|
|
total_gsti => sprintf( "%.2f", $total_gsti ),
|
|
);
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|