454bef0b79
This patch fixes the following QA issue: FAIL acqui/invoice.pl FAIL valid Useless use of private variable in void context Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Patch passes all tests and QA script. Specifically checked the t/db_depenedent/Acq* tests. A test plan could be: 0) Add a value in the gist pref (0.1 or 0.25 or something else easy). 1) a) Create a supplier "10613 0 0" with List item price includes tax: No Invoice item price includes tax: No Tax: 10% b) Create a supplier "10613 0 1" with List item price includes tax: No Invoice item price includes tax: Yes Tax: 10% c) Create a supplier "10613 1 0" with List item price includes tax: Yes Invoice item price includes tax: No Tax: 10% d) Create a supplier "10613 1 1" with List item price includes tax: Yes Invoice item price includes tax: Yes Tax: 10% 2) Create a basket for each supplier a) 00 List price: 10.00 (11.00 with 10% taxes) b) 01 List price: 10.00 (11.00 with 10% taxes) c) 10 List price: 10.00 (9.09 without taxes) d) 11 List price: 10.00 (9.09 without taxes) Note: Information on the basket page is shown correctly. If you look at the list of ordered items for the fund, the list price is used. 3) Create 1+ order(s) with 1+ item(s) for each basket with a discount and a gst value. 4) Close the baskets 5) Receive the items Left actual price as suggested: a) 00 Actual cost: 10.00 b) 01 Actual cost: 11.00 c) 10 Actual cost: 9.09 d) 11 Actual cost: 10.00 Calculations on the invoice page now all appear to be correct. Note: When you take a look at the 'ordered' list for the fund, the actual price is used as entered. 6) Go on acqui/invoice.pl?invoiceid=XX acqui/basket.pl?basketno=YY for each basket/invoice, click on the "Show all details" checkbox and verify that the values are all correct. Calculations are exactly the same for tax registered yes and no. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
218 lines
7.5 KiB
Perl
Executable file
218 lines
7.5 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2011 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
|
|
|
|
invoice.pl
|
|
|
|
=head1 DESCRIPTION
|
|
|
|
Invoice details
|
|
|
|
=cut
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use CGI;
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use C4::Acquisition;
|
|
use C4::Bookseller qw/GetBookSellerFromId/;
|
|
use C4::Budgets;
|
|
|
|
my $input = new CGI;
|
|
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
|
|
{
|
|
template_name => 'acqui/invoice.tmpl',
|
|
query => $input,
|
|
type => 'intranet',
|
|
authnotrequired => 0,
|
|
flagsrequired => { 'acquisition' => '*' },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
my $invoiceid = $input->param('invoiceid');
|
|
my $op = $input->param('op');
|
|
|
|
if ( $op && $op eq 'close' ) {
|
|
CloseInvoice($invoiceid);
|
|
my $referer = $input->param('referer');
|
|
if ($referer) {
|
|
print $input->redirect($referer);
|
|
exit 0;
|
|
}
|
|
}
|
|
elsif ( $op && $op eq 'reopen' ) {
|
|
ReopenInvoice($invoiceid);
|
|
my $referer = $input->param('referer');
|
|
if ($referer) {
|
|
print $input->redirect($referer);
|
|
exit 0;
|
|
}
|
|
}
|
|
elsif ( $op && $op eq 'mod' ) {
|
|
my $shipmentdate = $input->param('shipmentdate');
|
|
my $billingdate = $input->param('billingdate');
|
|
my $shipmentcost = $input->param('shipmentcost');
|
|
my $shipment_budget_id = $input->param('shipment_budget_id');
|
|
ModInvoice(
|
|
invoiceid => $invoiceid,
|
|
shipmentdate => C4::Dates->new($shipmentdate)->output("iso"),
|
|
billingdate => C4::Dates->new($billingdate)->output("iso"),
|
|
shipmentcost => $shipmentcost,
|
|
shipmentcost_budgetid => $shipment_budget_id
|
|
);
|
|
if ($input->param('reopen')) {
|
|
ReopenInvoice($invoiceid);
|
|
} elsif ($input->param('close')) {
|
|
CloseInvoice($invoiceid);
|
|
} elsif ($input->param('merge')) {
|
|
my @sources = $input->param('merge');
|
|
MergeInvoices($invoiceid, \@sources);
|
|
}
|
|
$template->param( modified => 1 );
|
|
}
|
|
elsif ( $op && $op eq 'delete' ) {
|
|
DelInvoice($invoiceid);
|
|
my $referer = $input->param('referer') || 'invoices.pl';
|
|
if ($referer) {
|
|
print $input->redirect($referer);
|
|
exit 0;
|
|
}
|
|
}
|
|
|
|
|
|
my $details = GetInvoiceDetails($invoiceid);
|
|
my $bookseller = GetBookSellerFromId($details->{booksellerid});
|
|
my @orders_loop = ();
|
|
my $orders = $details->{'orders'};
|
|
my $qty_total;
|
|
my @foot_loop;
|
|
my %foot;
|
|
my $total_quantity = 0;
|
|
my $total_gste = 0;
|
|
my $total_gsti = 0;
|
|
my $total_gstvalue = 0;
|
|
foreach my $order (@$orders) {
|
|
my $line = get_infos( $order, $bookseller);
|
|
|
|
$foot{$$line{gstgsti}}{gstgsti} = $$line{gstgsti};
|
|
$foot{$$line{gstgsti}}{gstvalue} += $$line{gstvalue};
|
|
$total_gstvalue += $$line{gstvalue};
|
|
$foot{$$line{gstgsti}}{quantity} += $$line{quantity};
|
|
$total_quantity += $$line{quantity};
|
|
$foot{$$line{gstgsti}}{totalgste} += $$line{totalgste};
|
|
$total_gste += $$line{totalgste};
|
|
$foot{$$line{gstgsti}}{totalgsti} += $$line{totalgsti};
|
|
$total_gsti += $$line{totalgsti};
|
|
|
|
$line->{orderline} = $line->{parent_ordernumber};
|
|
push @orders_loop, $line;
|
|
}
|
|
|
|
push @foot_loop, map {$_} values %foot;
|
|
|
|
my $format = "%.2f";
|
|
my $budgets = GetBudgets();
|
|
my @budgets_loop;
|
|
my $shipmentcost_budgetid = $details->{shipmentcost_budgetid};
|
|
foreach my $budget (@$budgets) {
|
|
next unless CanUserUseBudget( $loggedinuser, $budget, $flags );
|
|
my %line = %{$budget};
|
|
if ( $shipmentcost_budgetid
|
|
and $budget->{budget_id} == $shipmentcost_budgetid )
|
|
{
|
|
$line{selected} = 1;
|
|
}
|
|
push @budgets_loop, \%line;
|
|
}
|
|
|
|
$template->param(
|
|
invoiceid => $details->{'invoiceid'},
|
|
invoicenumber => $details->{'invoicenumber'},
|
|
suppliername => $details->{'suppliername'},
|
|
booksellerid => $details->{'booksellerid'},
|
|
datereceived => $details->{'datereceived'},
|
|
billingdate => C4::Dates->new($details->{'billingdate'}, "iso")->output(),
|
|
invoiceclosedate => $details->{'invoiceclosedate'},
|
|
shipmentcost => $details->{'shipmentcost'},
|
|
orders_loop => \@orders_loop,
|
|
foot_loop => \@foot_loop,
|
|
total_quantity => $total_quantity,
|
|
total_gste => sprintf( $format, $total_gste ),
|
|
total_gsti => sprintf( $format, $total_gsti ),
|
|
total_gstvalue => sprintf( $format, $total_gstvalue ),
|
|
total_gste_shipment => sprintf( $format, $total_gste + $details->{shipmentcost}),
|
|
total_gsti_shipment => sprintf( $format, $total_gsti + $details->{shipmentcost}),
|
|
invoiceincgst => $bookseller->{invoiceincgst},
|
|
currency => GetCurrency()->{currency},
|
|
budgets_loop => \@budgets_loop,
|
|
);
|
|
|
|
# FIXME
|
|
# Fonction dupplicated from basket.pl
|
|
# Code must to be exported. Where ??
|
|
sub get_infos {
|
|
my $order = shift;
|
|
my $bookseller = shift;
|
|
my $qty = $order->{'quantity'} || 0;
|
|
if ( !defined $order->{quantityreceived} ) {
|
|
$order->{quantityreceived} = 0;
|
|
}
|
|
my $budget = GetBudget( $order->{'budget_id'} );
|
|
|
|
my %line = %{ $order };
|
|
$line{order_received} = ( $qty == $order->{'quantityreceived'} );
|
|
$line{budget_name} = $budget->{budget_name};
|
|
if ( $bookseller->{'listincgst'} ) {
|
|
$line{gstgsti} = sprintf( "%.2f", $line{gstrate} * 100 );
|
|
$line{gstgste} = sprintf( "%.2f", $line{gstgsti} / ( 1 + ( $line{gstgsti} / 100 ) ) );
|
|
$line{actualcostgsti} = sprintf( "%.2f", $line{unitprice} );
|
|
$line{actualcostgste} = sprintf( "%.2f", $line{unitprice} / ( 1 + ( $line{gstgsti} / 100 ) ) );
|
|
$line{gstvalue} = sprintf( "%.2f", ( $line{actualcostgsti} - $line{actualcostgste} ) * $line{quantity});
|
|
$line{totalgste} = sprintf( "%.2f", $order->{quantity} * $line{actualcostgste} );
|
|
$line{totalgsti} = sprintf( "%.2f", $order->{quantity} * $line{actualcostgsti} );
|
|
} else {
|
|
$line{gstgsti} = sprintf( "%.2f", $line{gstrate} * 100 );
|
|
$line{gstgste} = sprintf( "%.2f", $line{gstrate} * 100 );
|
|
$line{actualcostgsti} = sprintf( "%.2f", $line{unitprice} * ( 1 + ( $line{gstrate} ) ) );
|
|
$line{actualcostgste} = sprintf( "%.2f", $line{unitprice} );
|
|
$line{gstvalue} = sprintf( "%.2f", ( $line{actualcostgsti} - $line{actualcostgste} ) * $line{quantity});
|
|
$line{totalgste} = sprintf( "%.2f", $order->{quantity} * $line{actualcostgste} );
|
|
$line{totalgsti} = sprintf( "%.2f", $order->{quantity} * $line{actualcostgsti} );
|
|
}
|
|
|
|
if ( $line{uncertainprice} ) {
|
|
$template->param( uncertainprices => 1 );
|
|
$line{rrp} .= ' (Uncertain)';
|
|
}
|
|
if ( $line{'title'} ) {
|
|
my $volume = $order->{'volume'};
|
|
my $seriestitle = $order->{'seriestitle'};
|
|
$line{'title'} .= " / $seriestitle" if $seriestitle;
|
|
$line{'title'} .= " / $volume" if $volume;
|
|
} else {
|
|
$line{'title'} = "Deleted bibliographic notice, can't find title.";
|
|
}
|
|
|
|
return \%line;
|
|
}
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|