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

(-)a/acqui/ordered.pl (-2 / +2 lines)
Lines 53-59 my $query = <<EOQ; Link Here
53
SELECT
53
SELECT
54
    aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
54
    aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
55
    quantity-quantityreceived AS tleft,
55
    quantity-quantityreceived AS tleft,
56
    ecost, budgetdate, entrydate,
56
    ecost_tax_included, budgetdate, entrydate,
57
    aqbasket.booksellerid,
57
    aqbasket.booksellerid,
58
    itype,
58
    itype,
59
    title
59
    title
Lines 88-94 while ( my $data = $sth->fetchrow_hashref ) { Link Here
88
        $left = $data->{'quantity'};
88
        $left = $data->{'quantity'};
89
    }
89
    }
90
    if ( $left && $left > 0 ) {
90
    if ( $left && $left > 0 ) {
91
        my $subtotal = $left * $data->{'ecost'};
91
        my $subtotal = $left * $data->{'ecost_tax_included'};
92
        $data->{subtotal} = sprintf( "%.2f", $subtotal );
92
        $data->{subtotal} = sprintf( "%.2f", $subtotal );
93
        $data->{'left'} = $left;
93
        $data->{'left'} = $left;
94
        push @ordered, $data;
94
        push @ordered, $data;
(-)a/acqui/spent.pl (-4 / +4 lines)
Lines 55-68 my $query = <<EOQ; Link Here
55
SELECT
55
SELECT
56
    aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
56
    aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
57
    quantity-quantityreceived AS tleft,
57
    quantity-quantityreceived AS tleft,
58
    ecost, budgetdate, entrydate,
58
    budgetdate, entrydate,
59
    aqbasket.booksellerid,
59
    aqbasket.booksellerid,
60
    itype,
60
    itype,
61
    title,
61
    title,
62
    aqorders.invoiceid,
62
    aqorders.invoiceid,
63
    aqinvoices.invoicenumber,
63
    aqinvoices.invoicenumber,
64
    quantityreceived,
64
    quantityreceived,
65
    unitprice,
65
    unitprice_tax_included,
66
    datereceived
66
    datereceived
67
FROM (aqorders, aqbasket)
67
FROM (aqorders, aqbasket)
68
LEFT JOIN biblio ON
68
LEFT JOIN biblio ON
Lines 91-99 my @spent; Link Here
91
while ( my $data = $sth->fetchrow_hashref ) {
91
while ( my $data = $sth->fetchrow_hashref ) {
92
    my $recv = $data->{'quantityreceived'};
92
    my $recv = $data->{'quantityreceived'};
93
    if ( $recv > 0 ) {
93
    if ( $recv > 0 ) {
94
        my $rowtotal = $recv * $data->{'unitprice'};
94
        my $rowtotal = $recv * $data->{'unitprice_tax_included'};
95
        $data->{'rowtotal'}  = sprintf( "%.2f", $rowtotal );
95
        $data->{'rowtotal'}  = sprintf( "%.2f", $rowtotal );
96
        $data->{'unitprice'} = sprintf( "%.2f", $data->{'unitprice'} );
96
        $data->{'unitprice'} = sprintf( "%.2f", $data->{'unitprice_tax_included'} );
97
        $subtotal += $rowtotal;
97
        $subtotal += $rowtotal;
98
        push @spent, $data;
98
        push @spent, $data;
99
    }
99
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-2 / +1 lines)
Lines 61-67 Link Here
61
	    [% order.left %]
61
	    [% order.left %]
62
	</td>
62
	</td>
63
    <td class="data cell">
63
    <td class="data cell">
64
	    [% order.ecost %]
64
	    [% order.ecost_tax_included %]
65
	</td>
65
	</td>
66
    <td class="cell">
66
    <td class="cell">
67
        <span title="[% order.entrydate %]">[% order.entrydate | $KohaDates %]</span>
67
        <span title="[% order.entrydate %]">[% order.entrydate | $KohaDates %]</span>
68
- 

Return to bug 21282