X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;ds=sidebyside;f=acqui%2Fspent.pl;h=b8269d08df3e3944247b2f19acf4af76f7c91406;hb=c748a0ccfc0b5f8ea36e7ddbf91b58b462323eae;hp=2d555f9a765a6815924f18d50dbaf39ff92f573e;hpb=81ee945a580189e79a268f60d9e7638e92e85f26;p=koha-ffzg.git

diff --git a/acqui/spent.pl b/acqui/spent.pl
index 2d555f9a76..b8269d08df 100755
--- a/acqui/spent.pl
+++ b/acqui/spent.pl
@@ -6,18 +6,18 @@
 # 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 2 of the License, or (at your option) any later
-# version.
+# 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.
+# 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.
+# 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
 
@@ -30,14 +30,15 @@ this script is designed to show the spent amount in budgets
 =cut
 
 use C4::Context;
-use C4::Auth;
-use C4::Output;
-use strict;
-use warnings;
-use CGI;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
+use Modern::Perl;
+use CGI qw ( -utf8 );
+use C4::Acquisition qw( get_rounded_price );
+use Koha::Acquisition::Invoice::Adjustments;
 
 my $dbh      = C4::Context->dbh;
-my $input    = new CGI;
+my $input    = CGI->new;
 my $bookfund = $input->param('fund');
 my $fund_code = $input->param('fund_code');
 
@@ -46,41 +47,52 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "acqui/spent.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => '*' },
-        debug           => 1,
     }
 );
 
 my $query = <<EOQ;
 SELECT
-    aqorders.basketno, aqorders.ordernumber,
+    aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
     quantity-quantityreceived AS tleft,
-    ecost, budgetdate, entrydate,
+    budgetdate, entrydate,
     aqbasket.booksellerid,
-    itype,
+    GROUP_CONCAT(DISTINCT itype SEPARATOR '|') as itypes,
     title,
     aqorders.invoiceid,
     aqinvoices.invoicenumber,
     quantityreceived,
-    unitprice,
+    unitprice_tax_included,
     datereceived,
-    aqorders.biblionumber
+    aqbooksellers.name as vendorname
 FROM (aqorders, aqbasket)
-LEFT JOIN items ON
-    items.biblioitemnumber=aqorders.biblioitemnumber
 LEFT JOIN biblio ON
     biblio.biblionumber=aqorders.biblionumber
 LEFT JOIN aqorders_items ON
-    aqorders.ordernumber=aqorders_items.ordernumber
+    aqorders.ordernumber = aqorders_items.ordernumber
+LEFT JOIN items ON
+    aqorders_items.itemnumber = items.itemnumber
 LEFT JOIN aqinvoices ON
     aqorders.invoiceid = aqinvoices.invoiceid
+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')
-    GROUP BY aqorders.ordernumber
+    datecancellationprinted IS NULL AND
+    datereceived IS NOT NULL
+    GROUP BY aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
+             tleft,
+             budgetdate, entrydate,
+             aqbasket.booksellerid,
+             title,
+             aqorders.invoiceid,
+             aqinvoices.invoicenumber,
+             quantityreceived,
+             unitprice_tax_included,
+             datereceived,
+             aqbooksellers.name
+
 EOQ
 my $sth = $dbh->prepare($query);
 $sth->execute($bookfund);
@@ -88,14 +100,14 @@ if ( $sth->err ) {
     die "An error occurred fetching records: " . $sth->errstr;
 }
 my $subtotal = 0;
-my $toggle;
 my @spent;
 while ( my $data = $sth->fetchrow_hashref ) {
     my $recv = $data->{'quantityreceived'};
+    $data->{'itemtypes'} = [split('\|', $data->{itypes})];
     if ( $recv > 0 ) {
-        my $rowtotal = $recv * $data->{'unitprice'};
+        my $rowtotal = $recv * get_rounded_price($data->{'unitprice_tax_included'});
         $data->{'rowtotal'}  = sprintf( "%.2f", $rowtotal );
-        $data->{'unitprice'} = sprintf( "%.2f", $data->{'unitprice'} );
+        $data->{'unitprice_tax_included'} = sprintf( "%.2f", $data->{'unitprice_tax_included'} );
         $subtotal += $rowtotal;
         push @spent, $data;
     }
@@ -104,7 +116,7 @@ while ( my $data = $sth->fetchrow_hashref ) {
 
 my $total = $subtotal;
 $query = qq{
-    SELECT invoicenumber, shipmentcost
+    SELECT invoiceid, invoicenumber, shipmentcost
     FROM aqinvoices
     WHERE shipmentcost_budgetid = ?
 };
@@ -114,12 +126,18 @@ my @shipmentcosts;
 while (my $data = $sth->fetchrow_hashref) {
     push @shipmentcosts, {
         shipmentcost => sprintf("%.2f", $data->{shipmentcost}),
+        invoiceid => $data->{invoiceid},
         invoicenumber => $data->{invoicenumber}
     };
     $total += $data->{shipmentcost};
 }
 $sth->finish;
 
+my $adjustments = Koha::Acquisition::Invoice::Adjustments->search({budget_id => $bookfund, closedate => { '!=' => undef } }, { prefetch => 'invoiceid' },  );
+while ( my $adj = $adjustments->next ){
+    $total += $adj->adjustment;
+}
+
 $total = sprintf( "%.2f", $total );
 
 $template->param(
@@ -127,6 +145,7 @@ $template->param(
     spent => \@spent,
     subtotal => $subtotal,
     shipmentcosts => \@shipmentcosts,
+    adjustments => $adjustments,
     total => $total,
     fund_code => $fund_code
 );