From 0a634d3af4011877265741cb2bf1c88998223ef3 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 25 Mar 2021 11:41:16 +0000 Subject: [PATCH] Bug 27983: (follow-up) Address missing instances This patch cleans up some instances I missed on the first round: - Acquisitions -> Vendor -> Receive shipments - Acquisitions -> "All available funds" table -> Click an "Ordered" value -> Click a "Spent" value - Acquisitions -> Vendor -> test sorting of contracts in the "Contracts" table --- .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 3 +- .../prog/en/modules/acqui/orderreceive.tt | 39 ++++++++++++++-------- .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 3 +- .../prog/en/modules/acqui/supplier.tt | 3 +- 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt index ec75acdf95..87b4a646d4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -124,8 +124,7 @@ $(document).ready(function() { $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, { "aoColumnDefs": [ - { "sType": "anti-the", "aTargets" : [ "anti-the" ] }, - { "sType": "title-string", "aTargets" : [ "title-string" ] } + { "sType": "anti-the", "aTargets" : [ "anti-the" ] } ], "sPaginationType": "full" })); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index de7522c5af..81fce0b5b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -96,10 +96,10 @@ Invoice Order number - Creation date - Receive date + Creation date + Receive date Quantity received - Status + Status Spent Internal note @@ -118,17 +118,30 @@ [% END %] [% suborder.ordernumber | html %] - [% suborder.basket.creationdate | $KohaDates%] - [% IF suborder.datereceived %][% suborder.datereceived | $KohaDates %][% END %] + [% suborder.basket.creationdate | $KohaDates%] + + [% IF suborder.datereceived %] + [% suborder.datereceived | $KohaDates %] + [% END %] + [% suborder.quantityreceived | html %] - - [% SWITCH suborder.orderstatus %] - [%# FIXME We should only see/display Complete here, right? %] - [% CASE 'new' %]New - [% CASE 'ordered' %]Ordered - [% CASE 'partial' %]Partial - [% CASE 'complete' %]Complete - [% CASE 'cancelled' %]Cancelled + [% SWITCH suborder.orderstatus %] + [%# FIXME We should only see/display Complete here, right? %] + [% CASE 'new' %] + + New + [% CASE 'ordered' %] + + Ordered + [% CASE 'partial' %] + + Partial + [% CASE 'complete' %] + + Complete + [% CASE 'cancelled' %] + + Cancelled [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt index 48b0029b11..cce83c7cde 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt @@ -137,8 +137,7 @@ $(document).ready(function() { $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, { "aoColumnDefs": [ - { "sType": "anti-the", "aTargets" : [ "anti-the" ] }, - { "sType": "title-string", "aTargets" : [ "title-string" ] } + { "sType": "anti-the", "aTargets" : [ "anti-the" ] } ], "sPaginationType": "full" } ) ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index cb67dc7505..0b8cb91932 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -436,8 +436,7 @@ $(document).ready(function() { var contractst = $("#contractst").dataTable($.extend(true, {}, dataTablesDefaults, { "aoColumnDefs": [ - { "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] }, - { "sType": "title-string", "aTargets" : [ "title-string" ] } + { "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] } ], 'sDom': 't' } ) ); -- 2.11.0