@@ -, +, @@
- 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
---
.../prog/en/modules/acqui/ordered.tt | 3 +-
.../prog/en/modules/acqui/orderreceive.tt | 39 ++++++++++++-------
.../prog/en/modules/acqui/spent.tt | 3 +-
.../prog/en/modules/acqui/supplier.tt | 3 +-
4 files changed, 29 insertions(+), 19 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ a/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"
}));
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ a/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 %]
|
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ a/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"
} ) );
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ a/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'
} ) );
--
|