8e5ee007db
This allows the tax rate for a vendor to be set to zero. Previously, a zero meant that the system default was used. Now, zero means no tax, and to have it be the default the field should simply be left empty. Additionally: * this will now show on the vendor display if the tax value is from the system default * this includes a database update that changes all the existing 0.00 tax settings to be NULL, which preserves existing behaviour. * this now saves the tax value supplied for new vendors Note: this patch applies against master Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
322 lines
11 KiB
Perl
Executable file
322 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 supplierid
|
|
|
|
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;
|
|
use C4::Biblio;
|
|
use C4::Items;
|
|
use CGI;
|
|
use C4::Output;
|
|
use C4::Dates qw/format_date format_date_in_iso/;
|
|
use JSON;
|
|
|
|
my $input=new CGI;
|
|
my $supplierid=$input->param('supplierid');
|
|
my $bookseller=GetBookSellerFromId($supplierid);
|
|
|
|
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') ? 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);
|
|
|
|
if($input->param('format') eq "json"){
|
|
my ($template, $loggedinuser, $cookie)
|
|
= get_template_and_user({template_name => "acqui/ajax.tmpl",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => {acquisition => 'order_receive'},
|
|
debug => 1,
|
|
});
|
|
|
|
my @datas;
|
|
my $search = $input->param('search') || '';
|
|
my $supplier = $input->param('supplierid') || '';
|
|
my $basketno = $input->param('basketno') || '';
|
|
my $orderno = $input->param('orderno') || '';
|
|
|
|
my $orders = SearchOrder($orderno, $search, $supplier, $basketno);
|
|
foreach my $order (@$orders){
|
|
if($order->{quantityreceived} < $order->{quantity}){
|
|
my $data = {};
|
|
|
|
$data->{basketno} = $order->{basketno};
|
|
$data->{ordernumber} = $order->{ordernumber};
|
|
$data->{title} = $order->{title};
|
|
$data->{author} = $order->{author};
|
|
$data->{isbn} = $order->{isbn};
|
|
$data->{booksellerid} = $order->{booksellerid};
|
|
$data->{biblionumber} = $order->{biblionumber};
|
|
$data->{freight} = $order->{freight};
|
|
$data->{quantity} = $order->{quantity};
|
|
$data->{ecost} = $order->{ecost};
|
|
$data->{ordertotal} = sprintf("%.2f",$order->{ecost}*$order->{quantity});
|
|
push @datas, $data;
|
|
}
|
|
}
|
|
|
|
my $json_text = to_json(\@datas);
|
|
$template->param(return => $json_text);
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
exit;
|
|
}
|
|
|
|
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 $action = $input->param('action');
|
|
my $ordernumber = $input->param('ordernumber');
|
|
my $biblionumber = $input->param('biblionumber');
|
|
|
|
# If canceling an order
|
|
if ($action eq "cancelorder") {
|
|
|
|
my $error_delitem;
|
|
my $error_delbiblio;
|
|
|
|
# We delete the order
|
|
DelOrder($biblionumber, $ordernumber);
|
|
|
|
# We delete all the items related to this order
|
|
my @itemnumbers = GetItemnumbersFromOrder($ordernumber);
|
|
foreach (@itemnumbers) {
|
|
my $delcheck = DelItemCheck(C4::Context->dbh, $biblionumber, $_);
|
|
# (should always success, as no issue should exist on item on order)
|
|
if ($delcheck != 1) { $error_delitem = 1; }
|
|
}
|
|
|
|
# We get the number of remaining items
|
|
my $itemcount = GetItemsCount($biblionumber);
|
|
|
|
# If there are no items left,
|
|
if ($itemcount eq 0) {
|
|
# We delete the record
|
|
$error_delbiblio = DelBiblio($biblionumber);
|
|
}
|
|
|
|
if ($error_delitem || $error_delbiblio) {
|
|
if ($error_delitem) { $template->param(error_delitem => 1); }
|
|
if ($error_delbiblio) { $template->param(error_delbiblio => 1); }
|
|
} else {
|
|
$template->param(success_delorder => 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($supplierid, $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{supplierid} = $supplierid;
|
|
push @loop_received, \%line;
|
|
$totalprice += $parcelitems[$i]->{'unitprice'};
|
|
$line{unitprice} = sprintf($cfstr, $parcelitems[$i]->{'unitprice'});
|
|
|
|
#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;
|
|
}
|
|
|
|
my $pendingorders = GetPendingOrders($supplierid);
|
|
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{supplierid} = $supplierid;
|
|
$ordergrandtotal += $line{ecost} * $line{quantity};
|
|
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'},
|
|
supplierid => $supplierid,
|
|
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,
|
|
);
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|