From 56c73320677f51f3663a3b2495acb95f87103f14 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Mon, 5 Nov 2012 10:35:08 +0100
Subject: [PATCH] Bug 7288: add filter on subscriptions in the invoices table

This patch adds a checkbox "Show only subscriptions" in the invoices
table.

If this checkbox is checked, only invoices that contain at least one
order linked to a subscription are displayed.

To test:
- Test in a database with multiple existing invoices
- Create an order from a subscription, close basket, receive
- Test that the result table of the invoice search shows
  the new checkbox and that it works correctly

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 C4/Acquisition.pm                             |  1 +
 .../prog/en/modules/acqui/invoices.tt         | 21 +++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 4b69825a9f..c7d0951e06 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -2579,6 +2579,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 b7d9399009..21625a5a21 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -9,7 +9,7 @@
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function() {
-    $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, {
+    var resultst = $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, {
         sDom: "t",
         bPaginate: false,
         bFilter: false,
@@ -18,10 +18,21 @@ $(document).ready(function() {
             null,null,null,{ "sType": "title-string" },null,null,null,null
         ],
         aoColumnDefs: [
-            { "bSortable": false, "aTargets": [0, 7] }
+            { "bSortable": false, "aTargets": [1, 8] },
+            { "bVisible": false, "aTargets": [0] }
         ]
     }));
 
+    $("#show_only_subscription").attr("checked", false);
+
+    $("#show_only_subscription").click(function(){
+        if ( $(this).attr("checked") ) {
+            resultst.fnFilter( "[0-9]+", 0, true );
+        } else {
+            resultst.fnFilter( '', 0 );
+        }
+    });
+
     $('#merge').click(function (ev) {
         var booksellerid;
         var mismatch;
@@ -89,9 +100,14 @@ $(document).ready(function() {
       <h1>Invoices</h1>
       [% IF ( do_search ) %]
         [% IF invoices %]
+          <label for="show_only_subscription">
+            <input type="checkbox" style="vertical-align: middle;" id="show_only_subscription" />
+            Show only subscriptions
+          </label>
           <table id="resultst">
             <thead>
               <tr>
+                <th>&nbsp;</th>
                 <th>&nbsp;</th>
                 <th>Invoice no.</th>
                 <th>Vendor</th>
@@ -105,6 +121,7 @@ $(document).ready(function() {
             <tbody>
               [% FOREACH invoice IN invoices %]
                 <tr data-invoiceid="[% invoice.invoiceid %]" data-booksellerid="[% invoice.booksellerid %]" data-shipmentdate="[% invoice.shipmentdate | $KohaDates %]" data-billingdate="[% invoice.billingdate | $KohaDates %]" data-shipmentcost="[% invoice.shipmentcost %]" data-shipment_budgetid="[% invoice.shipmentcost_budgetid %]" data-closedate="[% invoice.closedate | $KohaDates %]">
+                  <td>[% invoice.subscriptionid %]</td>
                   <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid %]"></input></td>
                   <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid %]">[% invoice.invoicenumber %]</a></td>
                   <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid %]">[% invoice.suppliername %]</a></td>
-- 
2.39.5