gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 929 : Follow up, making some improvements to the spent page More to come 

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit c64322e48d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This commit is contained in:
Chris Cormack 2011-12-28 15:43:47 +13:00 committed by Chris Nighswonger
parent 95a44070fd
commit fa6b504e4c
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
acqui/spent.pl
View File

@ -57,7 +57,7 @@ my $query = <<EOQ;
SELECT
aqorders.basketno, aqorders.ordernumber,
quantity-quantityreceived AS tleft,
ecost, budgetdate,
ecost, budgetdate, entrydate,
aqbasket.booksellerid,
itype,
title,
@ -115,6 +115,7 @@ $template->param(
spent => \@spent,
total => $total
);
$template->{VARS}->{'fund'} = $bookfund;
$sth->finish;
$dbh->disconnect;

15
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
View File

@ -6,7 +6,7 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
<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>
<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>
<div id="doc3" class="yui-t2">
@ -14,7 +14,7 @@
<div id="yui-main">
<div class="yui-b">
<h1>Budgets &amp; Bookfunds</h1>
<h1>Bookfund [% fund %]</h1>
<h2>Spent</h2>
@ -23,12 +23,13 @@
<tr>
<th> Title </th>
<th> Order </th>
<th> Supplier </th>
<th> Vendor </th>
<th> Invoice </th>
<th> Itemtype </th>
<th> Receieved </th>
<th> Received </th>
<th> Unit Price </th>
<th> Freight per Item </th>
<th> Date Ordered </th>
<th> Date Received </th>
<th> Subtotal </th>
</tr>
@ -48,7 +49,7 @@
<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>
</td>
<td class="cell">
[% order.booksellerid %]
<a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% order.booksellerid %]">[% order.booksellerid %]</a>
</td>
<td class="cell">
<a href="/cgi-bin/koha/acqui/parcel.pl?invoice=[% order.booksellerinvoicenumber %]&supplierid=[% order.booksellerid %]&datereceived=[% order.datereceived %]">[% order.booksellerinvoicenumber %]</a>
@ -65,6 +66,9 @@
<td class="cell" align="right">
[% order.freight %]
</td>
<td class="cell">
[% order.entrydate %]
</td>
<td class="cell">
[% order.datereceived %]
</td>
@ -84,6 +88,7 @@
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td align="right">
[% total %]
</td>