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

(-)a/acqui/ordered.pl (-3 / +4 lines)
Lines 56-61 SELECT Link Here
56
    quantity-quantityreceived AS tleft,
56
    quantity-quantityreceived AS tleft,
57
    ecost, budgetdate, entrydate,
57
    ecost, budgetdate, entrydate,
58
    aqbasket.booksellerid,
58
    aqbasket.booksellerid,
59
    aqbooksellers.name as vendorname,
59
    itype,
60
    itype,
60
    title
61
    title
61
FROM (aqorders, aqbasket)
62
FROM (aqorders, aqbasket)
Lines 65-70 LEFT JOIN aqorders_items ON Link Here
65
    aqorders.ordernumber=aqorders_items.ordernumber
66
    aqorders.ordernumber=aqorders_items.ordernumber
66
LEFT JOIN items ON
67
LEFT JOIN items ON
67
    items.itemnumber=aqorders_items.itemnumber
68
    items.itemnumber=aqorders_items.itemnumber
69
LEFT JOIN aqbooksellers ON
70
    aqbasket.booksellerid = aqbooksellers.id
68
WHERE
71
WHERE
69
    aqorders.basketno=aqbasket.basketno AND
72
    aqorders.basketno=aqbasket.basketno AND
70
    budget_id=? AND
73
    budget_id=? AND
Lines 90-96 while ( my $data = $sth->fetchrow_hashref ) { Link Here
90
    }
93
    }
91
    if ( $left && $left > 0 ) {
94
    if ( $left && $left > 0 ) {
92
        my $subtotal = $left * $data->{'ecost'};
95
        my $subtotal = $left * $data->{'ecost'};
93
        $data->{subtotal} = sprintf( "%.2f", $subtotal );
96
        $data->{subtotal} = $subtotal;
94
        $data->{'left'} = $left;
97
        $data->{'left'} = $left;
95
        push @ordered, $data;
98
        push @ordered, $data;
96
        $total += $subtotal;
99
        $total += $subtotal;
Lines 102-109 while ( my $adj = $adjustments->next ){ Link Here
102
    $total += $adj->adjustment;
105
    $total += $adj->adjustment;
103
}
106
}
104
107
105
$total = sprintf( "%.2f", $total );
106
107
$template->{VARS}->{'fund'}    = $fund_id;
108
$template->{VARS}->{'fund'}    = $fund_id;
108
$template->{VARS}->{'ordered'} = \@ordered;
109
$template->{VARS}->{'ordered'} = \@ordered;
109
$template->{VARS}->{'total'}   = $total;
110
$template->{VARS}->{'total'}   = $total;
(-)a/acqui/spent.pl (-6 / +6 lines)
Lines 64-70 SELECT Link Here
64
    aqinvoices.invoicenumber,
64
    aqinvoices.invoicenumber,
65
    quantityreceived,
65
    quantityreceived,
66
    unitprice,
66
    unitprice,
67
    datereceived
67
    datereceived,
68
    aqbooksellers.name as vendorname
68
FROM (aqorders, aqbasket)
69
FROM (aqorders, aqbasket)
69
LEFT JOIN biblio ON
70
LEFT JOIN biblio ON
70
    biblio.biblionumber=aqorders.biblionumber
71
    biblio.biblionumber=aqorders.biblionumber
Lines 74-79 LEFT JOIN items ON Link Here
74
    aqorders_items.itemnumber = items.itemnumber
75
    aqorders_items.itemnumber = items.itemnumber
75
LEFT JOIN aqinvoices ON
76
LEFT JOIN aqinvoices ON
76
    aqorders.invoiceid = aqinvoices.invoiceid
77
    aqorders.invoiceid = aqinvoices.invoiceid
78
LEFT JOIN aqbooksellers ON
79
    aqbasket.booksellerid = aqbooksellers.id
77
WHERE
80
WHERE
78
    aqorders.basketno=aqbasket.basketno AND
81
    aqorders.basketno=aqbasket.basketno AND
79
    budget_id=? AND
82
    budget_id=? AND
Lines 93-100 while ( my $data = $sth->fetchrow_hashref ) { Link Here
93
    my $recv = $data->{'quantityreceived'};
96
    my $recv = $data->{'quantityreceived'};
94
    if ( $recv > 0 ) {
97
    if ( $recv > 0 ) {
95
        my $rowtotal = $recv * $data->{'unitprice'};
98
        my $rowtotal = $recv * $data->{'unitprice'};
96
        $data->{'rowtotal'}  = sprintf( "%.2f", $rowtotal );
99
        $data->{'rowtotal'}  = $rowtotal;
97
        $data->{'unitprice'} = sprintf( "%.2f", $data->{'unitprice'} );
98
        $subtotal += $rowtotal;
100
        $subtotal += $rowtotal;
99
        push @spent, $data;
101
        push @spent, $data;
100
    }
102
    }
Lines 112-118 $sth->execute($bookfund); Link Here
112
my @shipmentcosts;
114
my @shipmentcosts;
113
while (my $data = $sth->fetchrow_hashref) {
115
while (my $data = $sth->fetchrow_hashref) {
114
    push @shipmentcosts, {
116
    push @shipmentcosts, {
115
        shipmentcost => sprintf("%.2f", $data->{shipmentcost}),
117
        shipmentcost => $data->{shipmentcost},
116
        invoicenumber => $data->{invoicenumber}
118
        invoicenumber => $data->{invoicenumber}
117
    };
119
    };
118
    $total += $data->{shipmentcost};
120
    $total += $data->{shipmentcost};
Lines 124-131 while ( my $adj = $adjustments->next ){ Link Here
124
    $total += $adj->adjustment;
126
    $total += $adj->adjustment;
125
}
127
}
126
128
127
$total = sprintf( "%.2f", $total );
128
129
$template->param(
129
$template->param(
130
    fund => $bookfund,
130
    fund => $bookfund,
131
    spent => \@spent,
131
    spent => \@spent,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-4 / +5 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 52-58 Link Here
52
        [% END %]
53
        [% END %]
53
	</td>
54
	</td>
54
	<td class="cell">
55
	<td class="cell">
55
	    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | html %]">[% order.booksellerid | html %]</a>
56
	    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | html %]">[% order.vendorname | html %]</a>
56
	</td>
57
	</td>
57
	<td class="cell">
58
	<td class="cell">
58
        [% ItemTypes.GetDescription( order.itype ) | html %]
59
        [% ItemTypes.GetDescription( order.itype ) | html %]
Lines 61-73 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 | $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>
68
	</td>
69
	</td>
69
    <td class="data cell">
70
    <td class="data cell">
70
	    [% order.subtotal | html %]
71
	    [% order.subtotal | $Price %]
71
	</td>
72
	</td>
72
    </tr>
73
    </tr>
73
[% END %]
74
[% END %]
Lines 92-98 Link Here
92
        <td> </td>
93
        <td> </td>
93
	<td> </td>
94
	<td> </td>
94
        <td class="data">
95
        <td class="data">
95
            [% total | html %]
96
            [% total | $Price %]
96
        </td>
97
        </td>
97
    </tr>
98
    </tr>
98
    </tfoot>
99
    </tfoot>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-5 / +5 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 50-56 Link Here
50
                [% order.ordernumber | html %]
51
                [% order.ordernumber | html %]
51
            </td>
52
            </td>
52
            <td class="cell">
53
            <td class="cell">
53
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | html %]">[% order.booksellerid | html %]</a>
54
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | html %]">[% order.vendorname | html %]</a>
54
            </td>
55
            </td>
55
            <td class="cell">
56
            <td class="cell">
56
                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | html %]">[% order.invoicenumber | html %]</a>
57
                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | html %]">[% order.invoicenumber | html %]</a>
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 | $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>
Lines 71-77 Link Here
71
                <span title="[% order.datereceived | html %]">[% order.datereceived | $KohaDates %]</span>
72
                <span title="[% order.datereceived | html %]">[% order.datereceived | $KohaDates %]</span>
72
            </td>
73
            </td>
73
            <td class="data cell">
74
            <td class="data cell">
74
                [% order.rowtotal | html %]
75
                [% order.rowtotal | $Price %]
75
            </td>
76
            </td>
76
        </tr>
77
        </tr>
77
    [% END %]
78
    [% END %]
Lines 103-109 Link Here
103
        [% END %]
104
        [% END %]
104
        <tr>
105
        <tr>
105
            <td colspan="9">TOTAL</td>
106
            <td colspan="9">TOTAL</td>
106
            <td class="data total">[% total | html %]</td>
107
            <td class="data total">[% total | $Price %]</td>
107
        </tr>
108
        </tr>
108
    </tfoot>
109
    </tfoot>
109
</table>
110
</table>
110
- 

Return to bug 19271