gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Owen Leonard 2021-03-25 11:41:16 +00:00 committed by Jonathan Druart
parent 71fcfa9521
commit 3937fcb143
4 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
View File

@ -139,8 +139,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"
}));

39
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
View File

@ -115,10 +115,10 @@
<tr>
<th>Invoice</th>
<th>Order number</th>
<th class="title-string">Creation date</th>
<th class="title-string">Receive date</th>
<th>Creation date</th>
<th>Receive date</th>
<th>Quantity received</th>
<th class="title-string">Status</th>
<th>Status</th>
<th title="Actual cost tax exc. / Actual cost tax inc.">Spent</th>
<th>Internal note</th>
</tr>
@ -137,17 +137,30 @@
[% END %]
</td>
<td>[% suborder.ordernumber | html %]</td>
<td><span title="[% suborder.basket.creationdate | uri %]">[% suborder.basket.creationdate | $KohaDates%]</span></td>
<td>[% IF suborder.datereceived %]<span title="[% suborder.datereceived | uri %]">[% suborder.datereceived | $KohaDates %]</span>[% END %]</td>
<td data-order="[% suborder.basket.creationdate | uri %]">[% suborder.basket.creationdate | $KohaDates%]</td>
<td data-order="[% suborder.datereceived | uri %]">
[% IF suborder.datereceived %]
[% suborder.datereceived | $KohaDates %]
[% END %]
</td>
<td>[% suborder.quantityreceived | html %]</td>
<td>
[% SWITCH suborder.orderstatus %]
[%# FIXME We should only see/display Complete here, right? %]
[% CASE 'new' %]<span title="status_1">New</span>
[% CASE 'ordered' %]<span title="status_2">Ordered</span>
[% CASE 'partial' %]<span title="status_3">Partial</span>
[% CASE 'complete' %]<span title="status_4">Complete</span>
[% CASE 'cancelled' %]<span title="status_5">Cancelled</span>
[% SWITCH suborder.orderstatus %]
[%# FIXME We should only see/display Complete here, right? %]
[% CASE 'new' %]
<td data-order="status_1">
New
[% CASE 'ordered' %]
<td data-order="status_2">
Ordered
[% CASE 'partial' %]
<td data-order="status_3">
Partial
[% CASE 'complete' %]
<td data-order="status_4">
Complete
[% CASE 'cancelled' %]
<td data-order="status_5">
Cancelled
[% END %]
</td>
<td>

3
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
View File

@ -152,8 +152,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"
} ) );

3
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
View File

@ -469,8 +469,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'
} ) );