b6433ee60a
Because in parcel.pl page the filter (on the left) makes a table using jscript and a very different workflow, the "cancel" link does nothing just asking for cancelling. Principaly due to the use of the "filter" js function that call the parcel.pl page and does all the job in a separate block with a separate perl function (SearchOrder) that sends all to js, that constructs html to finally append it to table. So I have decided to rebuild entirely the filter. I have choosen to overload the function "GetPendingOrders" to enable it to accept new arguments. To test : when you are in "parcel.pl" ready to receive orders, simply select a filter on the left and on the filtered page try to cancel a line. You'll have the warning message but no more, the line will be not canceled. Signed-off-by: wajasu <matted-34813@mypacks.net> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
296 lines
11 KiB
Perl
Executable file
296 lines
11 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 freight
|
|
|
|
|
|
=item gst
|
|
|
|
|
|
=item datereceived
|
|
|
|
To filter the results list on this given date.
|
|
|
|
=back
|
|
|
|
=cut
|
|
|
|
use strict;
|
|
#use warnings; FIXME - Bug 2505
|
|
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;
|
|
my $booksellerid=$input->param('booksellerid');
|
|
my $bookseller=GetBookSellerFromId($booksellerid);
|
|
|
|
my $invoice=$input->param('invoice') || '';
|
|
my $freight=$input->param('freight');
|
|
my $input_gst = ($input->param('gst') eq '' ? undef : $input->param('gst'));
|
|
my $gst= $input_gst // $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
|
|
my $datereceived = ($input->param('op') eq ('new' or "search")) ? C4::Dates->new($input->param('datereceived'))
|
|
: C4::Dates->new($input->param('datereceived'), 'iso');
|
|
$datereceived = C4::Dates->new() unless $datereceived;
|
|
my $code = $input->param('code');
|
|
my @rcv_err = $input->param('error');
|
|
my @rcv_err_barcode = $input->param('error_bc');
|
|
my $startfrom=$input->param('startfrom');
|
|
my $resultsperpage = $input->param('resultsperpage');
|
|
$resultsperpage = 20 unless ($resultsperpage);
|
|
$startfrom=0 unless ($startfrom);
|
|
|
|
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,
|
|
});
|
|
|
|
# If receiving error, report the error (coming from finishrecieve.pl(sic)).
|
|
if( scalar(@rcv_err) ) {
|
|
my $cnt=0;
|
|
my $error_loop;
|
|
for my $err (@rcv_err) {
|
|
push @$error_loop, { "error_$err" => 1 , barcode => $rcv_err_barcode[$cnt] };
|
|
$cnt++;
|
|
}
|
|
$template->param( receive_error => 1 ,
|
|
error_loop => $error_loop,
|
|
);
|
|
}
|
|
|
|
my $cfstr = "%.2f"; # currency format string -- could get this from currency table.
|
|
my @parcelitems = GetParcel($booksellerid, $invoice, $datereceived->output('iso'));
|
|
my $countlines = scalar @parcelitems;
|
|
my $totalprice = 0;
|
|
my $totalfreight = 0;
|
|
my $totalquantity = 0;
|
|
my $total;
|
|
my $tototal;
|
|
my @loop_received = ();
|
|
|
|
for (my $i = 0 ; $i < $countlines ; $i++) {
|
|
|
|
#$total=($parcelitems[$i]->{'unitprice'} + $parcelitems[$i]->{'freight'}) * $parcelitems[$i]->{'quantityreceived'}; #weird, are the freight fees counted by book? (pierre)
|
|
$total = ($parcelitems[$i]->{'unitprice'}) * $parcelitems[$i]->{'quantityreceived'}; #weird, are the freight fees counted by book? (pierre)
|
|
$parcelitems[$i]->{'unitprice'} += 0;
|
|
my %line;
|
|
%line = %{ $parcelitems[$i] };
|
|
$line{invoice} = $invoice;
|
|
$line{gst} = $gst;
|
|
$line{total} = sprintf($cfstr, $total);
|
|
$line{booksellerid} = $booksellerid;
|
|
push @loop_received, \%line;
|
|
$totalprice += $parcelitems[$i]->{'unitprice'};
|
|
$line{unitprice} = sprintf($cfstr, $parcelitems[$i]->{'unitprice'});
|
|
|
|
my $suggestion = GetSuggestionInfoFromBiblionumber($line{biblionumber});
|
|
$line{suggestionid} = $suggestion->{suggestionid};
|
|
$line{surnamesuggestedby} = $suggestion->{surnamesuggestedby};
|
|
$line{firstnamesuggestedby} = $suggestion->{firstnamesuggestedby};
|
|
|
|
#double FIXME - totalfreight is redefined later.
|
|
|
|
# FIXME - each order in a parcel holds the freight for the whole parcel. This means if you receive a parcel with items from multiple budgets, you'll see the freight charge in each budget..
|
|
if ($i > 0 && $totalfreight != $parcelitems[$i]->{'freight'}) {
|
|
warn "FREIGHT CHARGE MISMATCH!!";
|
|
}
|
|
$totalfreight = $parcelitems[$i]->{'freight'};
|
|
$totalquantity += $parcelitems[$i]->{'quantityreceived'};
|
|
$tototal += $total;
|
|
}
|
|
|
|
# We get the pending orders either all or filtered
|
|
my $pendingorders;
|
|
if($input->param('op') eq "search"){
|
|
my $search = $input->param('summaryfilter') || '';
|
|
my $ean = $input->param('eanfilter') || '';
|
|
my $basketno = $input->param('basketfilter') || '';
|
|
my $orderno = $input->param('orderfilter') || '';
|
|
my $grouped;
|
|
my $owner;
|
|
$pendingorders = GetPendingOrders($booksellerid,$grouped,$owner,$basketno,$orderno,$search,$ean);
|
|
}else{
|
|
$pendingorders = GetPendingOrders($booksellerid);
|
|
}
|
|
my $countpendings = scalar @$pendingorders;
|
|
|
|
# pending orders totals
|
|
my ($totalPunitprice, $totalPquantity, $totalPecost, $totalPqtyrcvd);
|
|
my $ordergrandtotal;
|
|
my @loop_orders = ();
|
|
for (my $i = 0 ; $i < $countpendings ; $i++) {
|
|
my %line;
|
|
%line = %{$pendingorders->[$i]};
|
|
|
|
$line{quantity}+=0;
|
|
$line{quantityreceived}+=0;
|
|
$line{unitprice}+=0;
|
|
$totalPunitprice += $line{unitprice};
|
|
$totalPquantity +=$line{quantity};
|
|
$totalPqtyrcvd +=$line{quantityreceived};
|
|
$totalPecost += $line{ecost};
|
|
$line{ecost} = sprintf("%.2f",$line{ecost});
|
|
$line{ordertotal} = sprintf("%.2f",$line{ecost}*$line{quantity});
|
|
$line{unitprice} = sprintf("%.2f",$line{unitprice});
|
|
$line{invoice} = $invoice;
|
|
$line{gst} = $gst;
|
|
$line{total} = $total;
|
|
$line{booksellerid} = $booksellerid;
|
|
$ordergrandtotal += $line{ecost} * $line{quantity};
|
|
|
|
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} = 1 if $holds >= 1;
|
|
$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};
|
|
|
|
|
|
push @loop_orders, \%line if ($i >= $startfrom and $i < $startfrom + $resultsperpage);
|
|
}
|
|
$freight = $totalfreight unless $freight;
|
|
my $count = $countpendings;
|
|
|
|
if ($count>$resultsperpage){
|
|
my $displaynext=0;
|
|
my $displayprev=$startfrom;
|
|
if(($count - ($startfrom+$resultsperpage)) > 0 ) {
|
|
$displaynext = 1;
|
|
}
|
|
|
|
my @numbers = ();
|
|
for (my $i=1; $i<$count/$resultsperpage+1; $i++) {
|
|
my $highlight=0;
|
|
($startfrom/$resultsperpage==($i-1)) && ($highlight=1);
|
|
push @numbers, { number => $i,
|
|
highlight => $highlight ,
|
|
startfrom => ($i-1)*$resultsperpage};
|
|
}
|
|
|
|
my $from = $startfrom*$resultsperpage+1;
|
|
my $to;
|
|
if($count < (($startfrom+1)*$resultsperpage)){
|
|
$to = $count;
|
|
} else {
|
|
$to = (($startfrom+1)*$resultsperpage);
|
|
}
|
|
$template->param(numbers=>\@numbers,
|
|
displaynext=>$displaynext,
|
|
displayprev=>$displayprev,
|
|
nextstartfrom=>(($startfrom+$resultsperpage<$count)?$startfrom+$resultsperpage:$count),
|
|
prevstartfrom=>(($startfrom-$resultsperpage>0)?$startfrom-$resultsperpage:0)
|
|
);
|
|
}
|
|
|
|
#$totalfreight=$freight;
|
|
$tototal = $tototal + $freight;
|
|
|
|
$template->param(
|
|
invoice => $invoice,
|
|
datereceived => $datereceived->output('iso'),
|
|
invoicedatereceived => $datereceived->output('iso'),
|
|
formatteddatereceived => $datereceived->output(),
|
|
name => $bookseller->{'name'},
|
|
booksellerid => $booksellerid,
|
|
gst => $gst,
|
|
freight => $freight,
|
|
invoice => $invoice,
|
|
countreceived => $countlines,
|
|
loop_received => \@loop_received,
|
|
countpending => $countpendings,
|
|
loop_orders => \@loop_orders,
|
|
totalprice => sprintf($cfstr, $totalprice),
|
|
totalfreight => $totalfreight,
|
|
totalquantity => $totalquantity,
|
|
tototal => sprintf($cfstr, $tototal),
|
|
ordergrandtotal => sprintf($cfstr, $ordergrandtotal),
|
|
gst => $gst,
|
|
grandtot => sprintf($cfstr, $tototal + $gst),
|
|
totalPunitprice => sprintf("%.2f", $totalPunitprice),
|
|
totalPquantity => $totalPquantity,
|
|
totalPqtyrcvd => $totalPqtyrcvd,
|
|
totalPecost => sprintf("%.2f", $totalPecost),
|
|
resultsperpage => $resultsperpage,
|
|
(uc(C4::Context->preference("marcflavour"))) => 1
|
|
);
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
|