Bug 21282: Sync ordered and spent values with acqui home

The order list for each fund calculates using the ecost tax excl., but
it should be tax incl.
At the moment this means that the sum on the start page table and the
order list don't match up.

Test plan:
- Create and receive orders
- Values on acqui home and ordered/spent should be the same

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 9d595e36a7844f99fa5d74aad418717d12eeae37)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/acqui/ordered.pl b/acqui/ordered.pl
index 73ecb35..3d7870e 100755 (executable)
--- a/acqui/ordered.pl
+++ b/acqui/ordered.pl
@@ -53,7 +53,7 @@ my $query = <<EOQ;
 SELECT
     aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
     quantity-quantityreceived AS tleft,
-    ecost, budgetdate, entrydate,
+    ecost_tax_included, budgetdate, entrydate,
     aqbasket.booksellerid,
     aqbooksellers.name as vendorname,
     itype,
@@ -91,7 +91,7 @@ while ( my $data = $sth->fetchrow_hashref ) {
         $left = $data->{'quantity'};
     }
     if ( $left && $left > 0 ) {
-        my $subtotal = $left * $data->{'ecost'};
+        my $subtotal = $left * $data->{'ecost_tax_included'};
         $data->{subtotal} = sprintf( "%.2f", $subtotal );
         $data->{'left'} = $left;
         push @ordered, $data;

diff --git a/acqui/spent.pl b/acqui/spent.pl
index e17d07c..e3c9096 100755 (executable)
--- a/acqui/spent.pl
+++ b/acqui/spent.pl
@@ -55,14 +55,14 @@ my $query = <<EOQ;
 SELECT
     aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
     quantity-quantityreceived AS tleft,
-    ecost, budgetdate, entrydate,
+    budgetdate, entrydate,
     aqbasket.booksellerid,
     itype,
     title,
     aqorders.invoiceid,
     aqinvoices.invoicenumber,
     quantityreceived,
-    unitprice,
+    unitprice_tax_included,
     datereceived,
     aqbooksellers.name as vendorname
 FROM (aqorders, aqbasket)
@@ -94,9 +94,9 @@ my @spent;
 while ( my $data = $sth->fetchrow_hashref ) {
     my $recv = $data->{'quantityreceived'};
     if ( $recv > 0 ) {
-        my $rowtotal = $recv * $data->{'unitprice'};
+        my $rowtotal = $recv * $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;
     }

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
index fb37c52..7b9c8b6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -1,6 +1,7 @@
 [% USE Asset %]
 [% USE KohaDates %]
 [% USE ItemTypes %]
+[% USE Price %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Ordered</title>
@@ -61,7 +62,7 @@
            [% order.left %]
        </td>
     <td class="data cell">
-           [% order.ecost %]
+        [% order.ecost_tax_included | $Price %]
        </td>
     <td class="cell">
         <span title="[% order.entrydate %]">[% order.entrydate | $KohaDates %]</span>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
index cd4c630..97893b8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -1,6 +1,7 @@
 [% USE Asset %]
 [% USE KohaDates %]
 [% USE ItemTypes %]
+[% USE Price %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Spent</title>
@@ -62,7 +63,7 @@
                 [% order.quantityreceived %]
             </td>
             <td class="cell">
-                [% order.unitprice %]
+                [% order.unitprice_tax_included | $Price %]
             </td>
             <td class="cell">
                 <span title="[% order.entrydate %]">[% order.entrydate | $KohaDates %]</span>