From 7315f1fa54a0d70172dc4fe3660748b8ff9b6db4 Mon Sep 17 00:00:00 2001 From: Matthias Meusburger Date: Mon, 3 Aug 2009 10:32:48 +0200 Subject: [PATCH] MT 1486 : Results filtering, table collapsing / expanding, multiple display enhancements --- C4/Acquisition.pm | 3 +- .../prog/en/modules/acqui/parcel.tmpl | 329 +++++++++++++----- .../prog/en/modules/acqui/parcels.tmpl | 46 ++- 3 files changed, 262 insertions(+), 116 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index 8bd9965afb..59cc2a59a2 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -655,12 +655,13 @@ sub GetPendingOrders { my $dbh = C4::Context->dbh; my $strsth = " SELECT ".($grouped?"count(*),":"")."aqbasket.basketno, - surname,firstname,aqorders.*,biblio.*, + surname,firstname,aqorders.*,biblio.*,biblioitems.isbn, aqbasket.closedate, aqbasket.creationdate, aqbasket.basketname FROM aqorders LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber + LEFT JOIN biblioitems ON biblioitems.biblionumber=biblio.biblionumber WHERE booksellerid=? AND (quantity > quantityreceived OR quantityreceived is NULL) AND datecancellationprinted IS NULL diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl index 5b562e97e6..c624f5b39d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl @@ -1,8 +1,114 @@ Koha › Acquisitions › <!-- TMPL_IF name="date" --> Receipt Summary for <!-- TMPL_VAR NAME="name" --> <!--TMPL_IF Name="invoice"-->Invoice <!-- TMPL_VAR NAME="invoice" --><!--/TMPL_IF --> on <!-- TMPL_VAR NAME="formatteddatereceived" --><!-- TMPL_ELSE -->Receive Orders from <!-- TMPL_VAR NAME="name" --><!-- /TMPL_IF --> - + + + @@ -42,83 +148,87 @@

On:

-
+ -
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl index ce089f8d85..01a56a09b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl @@ -17,24 +17,7 @@

Receive shipment from vendor ">

-

shipments found

- - +

shipments

@@ -42,9 +25,9 @@ - - + +
" />" />" /> -

" />

" id="filter" />" />
+ " />
&datereceived=&invoice="> - - + - + n/a @@ -100,6 +82,22 @@
+
-- 2.39.5