From 38d2667083417463cc15632b7f92e12870b9a44d Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Mon, 8 Jun 2015 04:28:50 +0200 Subject: [PATCH] [Signed-off] Bug 12906: Show shipment date in invoice search result list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch adds the shipment as a new separate column to the search results of the invoices search. To test: - Search for invoices in the acquisition module - Verify the results table shows the shipment date - Verify that sorting works correctly Signed-off-by: Marc VĂ©ron --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 8cd41fa..cb3d9f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -12,7 +12,7 @@ $(document).ready(function() { var resultst = $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, { bPaginate: false, aoColumnDefs: [ - { "bSortable": false, "aTargets": [1, 8] }, + { "bSortable": false, "aTargets": [1, 9] }, { "bVisible": false, "aTargets": [0] }, { "sType": "title-string", "aTargets" : [ "title-string" ] } ] @@ -106,6 +106,7 @@ $(document).ready(function() {   Invoice no. Vendor + Shipment date Billing date Received biblios Received items @@ -121,6 +122,13 @@ $(document).ready(function() { [% invoice.invoicenumber %] [% invoice.suppliername %] + [% IF invoice.shipmentdate %] + [% invoice.shipmentdate | $KohaDates %] + [% ELSE %] + + [% END %] + + [% IF invoice.billingdate %] [% invoice.billingdate | $KohaDates %] [% ELSE %] -- 1.7.10.4