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

(-)a/acqui/spent.pl (-1 / +2 lines)
Lines 57-63 my $query = <<EOQ; Link Here
57
SELECT
57
SELECT
58
    aqorders.basketno, aqorders.ordernumber, 
58
    aqorders.basketno, aqorders.ordernumber, 
59
    quantity-quantityreceived AS tleft,
59
    quantity-quantityreceived AS tleft,
60
    ecost, budgetdate,
60
    ecost, budgetdate, entrydate,
61
    aqbasket.booksellerid,
61
    aqbasket.booksellerid,
62
    itype,
62
    itype,
63
    title,
63
    title,
Lines 115-120 $template->param( Link Here
115
    spent       => \@spent,
115
    spent       => \@spent,
116
    total       => $total
116
    total       => $total
117
);
117
);
118
$template->{VARS}->{'fund'} = $bookfund;
118
$sth->finish;
119
$sth->finish;
119
120
120
$dbh->disconnect;
121
$dbh->disconnect;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-6 / +10 lines)
Lines 6-12 Link Here
6
[% INCLUDE 'header.inc' %]
6
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'acquisitions-search.inc' %]
7
[% INCLUDE 'acquisitions-search.inc' %]
8
8
9
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Spent </div>
9
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Spent [% fund %]</div>
10
10
11
<div id="doc3" class="yui-t2">
11
<div id="doc3" class="yui-t2">
12
12
Lines 14-20 Link Here
14
    <div id="yui-main">
14
    <div id="yui-main">
15
        <div class="yui-b">
15
        <div class="yui-b">
16
16
17
<h1>Budgets &amp; Bookfunds</h1>
17
<h1>Bookfund [% fund %]</h1>
18
<h2>Spent</h2>
18
<h2>Spent</h2>
19
19
20
20
Lines 23-34 Link Here
23
    <tr>
23
    <tr>
24
        <th> Title </th>
24
        <th> Title </th>
25
	<th> Order </th>
25
	<th> Order </th>
26
	<th> Supplier </th>
26
	<th> Vendor </th>
27
	<th> Invoice </th>
27
	<th> Invoice </th>
28
	<th> Itemtype </th>
28
	<th> Itemtype </th>
29
	<th> Receieved </th>
29
	<th> Received </th>
30
	<th> Unit Price </th>
30
	<th> Unit Price </th>
31
	<th> Freight per Item </th>
31
	<th> Freight per Item </th>
32
	<th> Date Ordered </th>
32
	<th> Date Received </th>
33
	<th> Date Received </th>
33
	<th> Subtotal </th>
34
	<th> Subtotal </th>
34
    </tr>
35
    </tr>
Lines 48-54 Link Here
48
            <a href="/cgi-bin/koha/acqui/orderreceive.pl?ordernumber=[% order.ordernumber %]&biblio=[% order.biblionumber %]&invoice=[% order.booksellerinvoicenumber %]&supplierid=[% order.booksellerid %]&catview=yes">[% order.ordernumber %]</a>
49
            <a href="/cgi-bin/koha/acqui/orderreceive.pl?ordernumber=[% order.ordernumber %]&biblio=[% order.biblionumber %]&invoice=[% order.booksellerinvoicenumber %]&supplierid=[% order.booksellerid %]&catview=yes">[% order.ordernumber %]</a>
49
	</td>
50
	</td>
50
	<td class="cell">
51
	<td class="cell">
51
	    [% order.booksellerid %]	
52
	    <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% order.booksellerid %]">[% order.booksellerid %]</a>
52
	</td>
53
	</td>
53
	<td class="cell">
54
	<td class="cell">
54
	    <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=[% order.booksellerinvoicenumber %]&supplierid=[% order.booksellerid %]&datereceived=[% order.datereceived %]">[% order.booksellerinvoicenumber %]</a>
55
	    <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=[% order.booksellerinvoicenumber %]&supplierid=[% order.booksellerid %]&datereceived=[% order.datereceived %]">[% order.booksellerinvoicenumber %]</a>
Lines 66-71 Link Here
66
	    [% order.freight %]		
67
	    [% order.freight %]		
67
	</td>
68
	</td>
68
	<td class="cell">
69
	<td class="cell">
70
	    [% order.entrydate %]
71
	</td>
72
	<td class="cell">
69
	    [% order.datereceived %]		
73
	    [% order.datereceived %]		
70
	</td>
74
	</td>
71
	<td class="cell" align="right">
75
	<td class="cell" align="right">
Lines 84-89 Link Here
84
        <td> </td>
88
        <td> </td>
85
        <td> </td>
89
        <td> </td>
86
	<td> </td>
90
	<td> </td>
91
	<td> </td>
87
        <td align="right">
92
        <td align="right">
88
		[% total %]
93
		[% total %]
89
	</td>
94
	</td>
90
- 

Return to bug 929