From 9f6c7cea32b0c74671d45ba983a24d11514e8dd8 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 | 23 +++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index ed9c215..31c7959 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -2285,6 +2285,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 965fec5..1fa81fb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -9,15 +9,26 @@ @@ -37,9 +48,14 @@ $(document).ready(function() {

Invoices

[% IF ( do_search ) %] [% IF invoices %] + + @@ -52,6 +68,7 @@ $(document).ready(function() { [% FOREACH invoice IN invoices %] +
Subscriptionid Invoice no. Vendor Billing date
[% invoice.subscriptionid %] [% invoice.invoicenumber %] [% invoice.suppliername %] -- 1.7.10.4