Nick Clemens
3c2ce5df6f
To test: 1 - Find a vendor in acquisitions 2 - Click 'receive shipment' 3 - Create an invoice 4 - Click 'Finish receiving' 5 - Add an adjustment that encumbers while open and update adjustments 6 - Go to acqui-home and click on the ordered total for the fund with the adjustment 7 - Note the invoice adjustment shows the invoice id and does not link 8 - Add another invoice and another adjustment, but close the invoice this time 9 - Go to acqui-home and click on the spent total for the fund with the adjustment 10 - Note the invoice adjustment shows the invoice id and does not link 11 - Apply patch 12 - Visit the spent and ordered pages and note the adjustments show invoicenumber and are links 13 - prove -v t/db_dependent/Koha/Acquisition/Invoice/Adjustments.t Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
125 lines
3.6 KiB
Perl
Executable file
125 lines
3.6 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2008 - 2009 BibLibre SARL
|
|
# Copyright 2010,2011 Catalyst IT Limited
|
|
# 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
|
|
|
|
ordered.pl
|
|
|
|
=head1 DESCRIPTION
|
|
|
|
this script is to show orders ordered but not yet received
|
|
|
|
=cut
|
|
|
|
use C4::Context;
|
|
use Modern::Perl;
|
|
use CGI qw ( -utf8 );
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use Koha::Acquisition::Invoice::Adjustments;
|
|
use C4::Acquisition;
|
|
|
|
my $dbh = C4::Context->dbh;
|
|
my $input = new CGI;
|
|
my $fund_id = $input->param('fund');
|
|
my $fund_code = $input->param('fund_code');
|
|
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "acqui/ordered.tt",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { acquisition => '*' },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
my $query = <<EOQ;
|
|
SELECT
|
|
aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
|
|
quantity-quantityreceived AS tleft,
|
|
ecost_tax_included, budgetdate, entrydate,
|
|
aqbasket.booksellerid,
|
|
aqbooksellers.name as vendorname,
|
|
itype,
|
|
title
|
|
FROM (aqorders, aqbasket)
|
|
LEFT JOIN biblio ON
|
|
biblio.biblionumber=aqorders.biblionumber
|
|
LEFT JOIN aqorders_items ON
|
|
aqorders.ordernumber=aqorders_items.ordernumber
|
|
LEFT JOIN items ON
|
|
items.itemnumber=aqorders_items.itemnumber
|
|
LEFT JOIN aqbooksellers ON
|
|
aqbasket.booksellerid = aqbooksellers.id
|
|
WHERE
|
|
aqorders.basketno=aqbasket.basketno AND
|
|
budget_id=? AND
|
|
(datecancellationprinted IS NULL OR
|
|
datecancellationprinted='0000-00-00') AND
|
|
(quantity > quantityreceived OR quantityreceived IS NULL)
|
|
GROUP BY aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
|
|
tleft,
|
|
ecost_tax_included, budgetdate, entrydate,
|
|
aqbasket.booksellerid,
|
|
aqbooksellers.name,
|
|
itype,
|
|
title
|
|
EOQ
|
|
|
|
my $sth = $dbh->prepare($query);
|
|
|
|
$sth->execute($fund_id);
|
|
if ( $sth->err ) {
|
|
die "Error occurred fetching records: " . $sth->errstr;
|
|
}
|
|
my @ordered;
|
|
|
|
my $total = 0;
|
|
while ( my $data = $sth->fetchrow_hashref ) {
|
|
my $left = $data->{'tleft'};
|
|
if ( !$left || $left eq '' ) {
|
|
$left = $data->{'quantity'};
|
|
}
|
|
if ( $left && $left > 0 ) {
|
|
my $subtotal = get_rounded_price( $left * $data->{'ecost_tax_included'} );
|
|
$data->{subtotal} = sprintf( "%.2f", $subtotal );
|
|
$data->{'left'} = $left;
|
|
push @ordered, $data;
|
|
$total += $subtotal;
|
|
}
|
|
}
|
|
|
|
my $adjustments = Koha::Acquisition::Invoice::Adjustments->search({budget_id => $fund_id, closedate => undef, encumber_open => 1 }, { prefetch => 'invoiceid' } );
|
|
while ( my $adj = $adjustments->next ){
|
|
$total += $adj->adjustment;
|
|
}
|
|
|
|
$total = sprintf( "%.2f", $total );
|
|
|
|
$template->{VARS}->{'fund'} = $fund_id;
|
|
$template->{VARS}->{'ordered'} = \@ordered;
|
|
$template->{VARS}->{'total'} = $total;
|
|
$template->{VARS}->{'fund_code'} = $fund_code;
|
|
$template->{VARS}->{'adjustments'} = $adjustments;
|
|
|
|
$sth->finish;
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|