Bugzilla – Attachment 6941 Details for
Bug 929
See details of a budget
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 929 : Follow up, making some improvements to the spent page More to come
Bug-929--Follow-up-making-some-improvements-to-the.patch (text/plain), 3.16 KB, created by
Chris Cormack
on 2011-12-28 02:45:29 UTC
(
hide
)
Description:
Bug 929 : Follow up, making some improvements to the spent page More to come
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2011-12-28 02:45:29 UTC
Size:
3.16 KB
patch
obsolete
>From 34b25419d9dd85922b8402ca2e5a2fee59533363 Mon Sep 17 00:00:00 2001 >From: Chris Cormack <chrisc@catalyst.net.nz> >Date: Wed, 28 Dec 2011 15:43:47 +1300 >Subject: [PATCH] Bug 929 : Follow up, making some improvements to the spent > page More to come > >--- > acqui/spent.pl | 3 ++- > .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 15 ++++++++++----- > 2 files changed, 12 insertions(+), 6 deletions(-) > >diff --git a/acqui/spent.pl b/acqui/spent.pl >index f252386..8108401 100755 >--- a/acqui/spent.pl >+++ b/acqui/spent.pl >@@ -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; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >index f5f2bdf..bb71cd4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >@@ -6,7 +6,7 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'acquisitions-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › Spent </div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › Spent [% fund %]</div> > > <div id="doc3" class="yui-t2"> > >@@ -14,7 +14,7 @@ > <div id="yui-main"> > <div class="yui-b"> > >-<h1>Budgets & 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> >@@ -66,6 +67,9 @@ > [% order.freight %] > </td> > <td class="cell"> >+ [% order.entrydate %] >+ </td> >+ <td class="cell"> > [% order.datereceived %] > </td> > <td class="cell" align="right"> >@@ -84,6 +88,7 @@ > <td> </td> > <td> </td> > <td> </td> >+ <td> </td> > <td align="right"> > [% total %] > </td> >-- >1.7.5.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 929
:
6936
|
6941
|
6947
|
6948
|
6949
|
6950
|
6951
|
6952
|
6953
|
6958
|
7109
|
7110
|
7142
|
7143
|
7393