From fc8d574ceae611aacb1fb403ecab2640b2ba4000 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 5 Nov 2012 10:35:08 +0100 Subject: [PATCH] Bug 7288: Allow to display only subscriptions in the invoices table This patch adds a checkbox "Show only subscriptions" in the invoices table. If this checkbox is checked, a filter is added on the table in order to show only subscription invoices --- C4/Acquisition.pm | 1 + .../prog/en/modules/acqui/invoices.tt | 22 +++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index 83031be..32064f3 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -2189,6 +2189,7 @@ sub GetInvoices { my $dbh = C4::Context->dbh; my $query = qq{ SELECT aqinvoices.*, aqbooksellers.name AS suppliername, + aqorders.subscriptionid, COUNT( DISTINCT IF( aqorders.datereceived IS NOT NULL, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index a04204e..3c1a2bf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -11,15 +11,25 @@ @@ -39,9 +49,14 @@ $(document).ready(function() {

Invoices

[% IF ( do_search ) %] [% IF ( results_loop ) %] + + @@ -54,6 +69,7 @@ $(document).ready(function() { [% FOREACH result IN results_loop %] +
Subscriptionid Invoice no. Vendor Billing date
[% result.subscriptionid %] [% result.invoicenumber %] [% result.suppliername %] -- 1.7.10.4