View | Details | Raw Unified | Return to bug 21282
Collapse All | Expand All

(-)a/acqui/ordered.pl (-2 / +2 lines)
Lines 54-60 my $query = <<EOQ; Link Here
54
SELECT
54
SELECT
55
    aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
55
    aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
56
    quantity-quantityreceived AS tleft,
56
    quantity-quantityreceived AS tleft,
57
    ecost, budgetdate, entrydate,
57
    ecost_tax_included, budgetdate, entrydate,
58
    aqbasket.booksellerid,
58
    aqbasket.booksellerid,
59
    aqbooksellers.name as vendorname,
59
    aqbooksellers.name as vendorname,
60
    itype,
60
    itype,
Lines 92-98 while ( my $data = $sth->fetchrow_hashref ) { Link Here
92
        $left = $data->{'quantity'};
92
        $left = $data->{'quantity'};
93
    }
93
    }
94
    if ( $left && $left > 0 ) {
94
    if ( $left && $left > 0 ) {
95
        my $subtotal = $left * $data->{'ecost'};
95
        my $subtotal = $left * $data->{'ecost_tax_included'};
96
        $data->{subtotal} = sprintf( "%.2f", $subtotal );
96
        $data->{subtotal} = sprintf( "%.2f", $subtotal );
97
        $data->{'left'} = $left;
97
        $data->{'left'} = $left;
98
        push @ordered, $data;
98
        push @ordered, $data;
(-)a/acqui/spent.pl (-4 / +4 lines)
Lines 56-69 my $query = <<EOQ; Link Here
56
SELECT
56
SELECT
57
    aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
57
    aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
58
    quantity-quantityreceived AS tleft,
58
    quantity-quantityreceived AS tleft,
59
    ecost, budgetdate, entrydate,
59
    budgetdate, entrydate,
60
    aqbasket.booksellerid,
60
    aqbasket.booksellerid,
61
    itype,
61
    itype,
62
    title,
62
    title,
63
    aqorders.invoiceid,
63
    aqorders.invoiceid,
64
    aqinvoices.invoicenumber,
64
    aqinvoices.invoicenumber,
65
    quantityreceived,
65
    quantityreceived,
66
    unitprice,
66
    unitprice_tax_included,
67
    datereceived,
67
    datereceived,
68
    aqbooksellers.name as vendorname
68
    aqbooksellers.name as vendorname
69
FROM (aqorders, aqbasket)
69
FROM (aqorders, aqbasket)
Lines 95-103 my @spent; Link Here
95
while ( my $data = $sth->fetchrow_hashref ) {
95
while ( my $data = $sth->fetchrow_hashref ) {
96
    my $recv = $data->{'quantityreceived'};
96
    my $recv = $data->{'quantityreceived'};
97
    if ( $recv > 0 ) {
97
    if ( $recv > 0 ) {
98
        my $rowtotal = $recv * $data->{'unitprice'};
98
        my $rowtotal = $recv * $data->{'unitprice_tax_included'};
99
        $data->{'rowtotal'}  = sprintf( "%.2f", $rowtotal );
99
        $data->{'rowtotal'}  = sprintf( "%.2f", $rowtotal );
100
        $data->{'unitprice'} = sprintf( "%.2f", $data->{'unitprice'} );
100
        $data->{'unitprice_tax_included'} = sprintf( "%.2f", $data->{'unitprice_tax_included'} );
101
        $subtotal += $rowtotal;
101
        $subtotal += $rowtotal;
102
        push @spent, $data;
102
        push @spent, $data;
103
    }
103
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-1 / +2 lines)
Lines 2-7 Link Here
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE ItemTypes %]
4
[% USE ItemTypes %]
5
[% USE Price %]
5
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
6
[% INCLUDE 'doc-head-open.inc' %]
7
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Koha &rsaquo; Acquisitions &rsaquo; Ordered</title>
8
<title>Koha &rsaquo; Acquisitions &rsaquo; Ordered</title>
Lines 61-67 Link Here
61
	    [% order.left | html %]
62
	    [% order.left | html %]
62
	</td>
63
	</td>
63
    <td class="data cell">
64
    <td class="data cell">
64
	    [% order.ecost | html %]
65
        [% order.ecost_tax_included | $Price %]
65
	</td>
66
	</td>
66
    <td class="cell">
67
    <td class="cell">
67
        <span title="[% order.entrydate | html %]">[% order.entrydate | $KohaDates %]</span>
68
        <span title="[% order.entrydate | html %]">[% order.entrydate | $KohaDates %]</span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-2 / +2 lines)
Lines 2-7 Link Here
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE ItemTypes %]
4
[% USE ItemTypes %]
5
[% USE Price %]
5
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
6
[% INCLUDE 'doc-head-open.inc' %]
7
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Koha &rsaquo; Acquisitions &rsaquo; Spent</title>
8
<title>Koha &rsaquo; Acquisitions &rsaquo; Spent</title>
Lines 62-68 Link Here
62
                [% order.quantityreceived | html %]
63
                [% order.quantityreceived | html %]
63
            </td>
64
            </td>
64
            <td class="cell">
65
            <td class="cell">
65
                [% order.unitprice | html %]
66
                [% order.unitprice_tax_included | $Price %]
66
            </td>
67
            </td>
67
            <td class="cell">
68
            <td class="cell">
68
                <span title="[% order.entrydate | html %]">[% order.entrydate | $KohaDates %]</span>
69
                <span title="[% order.entrydate | html %]">[% order.entrydate | $KohaDates %]</span>
69
- 

Return to bug 21282