Attachment #118782 for bug #27983

View | Details | Raw Unified | Return to bug 27983
Collapse All | Expand All

Lines 124-131 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-2 / +1 lines)
124	$(document).ready(function() {	124	$(document).ready(function() {
125	$("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {	125	$("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
126	"aoColumnDefs": [	126	"aoColumnDefs": [
127	{ "sType": "anti-the", "aTargets" : [ "anti-the" ] },	127	{ "sType": "anti-the", "aTargets" : [ "anti-the" ] }
128	{ "sType": "title-string", "aTargets" : [ "title-string" ] }
129	],	128	],
130	"sPaginationType": "full"	129	"sPaginationType": "full"
131	}));	130	}));




                    <tr>
                        <th>Invoice</th>
                        <th>Order number</th>
                        <th>Creation date</th>
                        <th>Receive date</th>
                        <th>Quantity received</th>
                        <th>Status</th>
                        <th title="Actual cost tax exc. / Actual cost tax inc.">Spent</th>
                        <th>Internal note</th>
                    </tr>

                        [% END %]
                        </td>
                        <td>[% suborder.ordernumber | html %]</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>
                        [% 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>

Lines 137-144 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-2 / +1 lines)
137	$(document).ready(function() {	137	$(document).ready(function() {
138	$("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {	138	$("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
139	"aoColumnDefs": [	139	"aoColumnDefs": [
140	{ "sType": "anti-the", "aTargets" : [ "anti-the" ] },	140	{ "sType": "anti-the", "aTargets" : [ "anti-the" ] }
141	{ "sType": "title-string", "aTargets" : [ "title-string" ] }
142	],	141	],
143	"sPaginationType": "full"	142	"sPaginationType": "full"
144	} ) );	143	} ) );

Lines 436-443 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-3 / +1 lines)
436	$(document).ready(function() {	436	$(document).ready(function() {
437	var contractst = $("#contractst").dataTable($.extend(true, {}, dataTablesDefaults, {	437	var contractst = $("#contractst").dataTable($.extend(true, {}, dataTablesDefaults, {
438	"aoColumnDefs": [	438	"aoColumnDefs": [
439	{ "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },	439	{ "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] }
440	{ "sType": "title-string", "aTargets" : [ "title-string" ] }
441	],	440	],
442	'sDom': 't'	441	'sDom': 't'
443	} ) );	442	} ) );
444	-

Return to bug 27983

Lines 96-105 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-13 / +26 lines)
96	<tr>	96	<tr>
97	<th>Invoice</th>	97	<th>Invoice</th>
98	<th>Order number</th>	98	<th>Order number</th>
99	<th class="title-string">Creation date</th>	99	<th>Creation date</th>
100	<th class="title-string">Receive date</th>	100	<th>Receive date</th>
101	<th>Quantity received</th>	101	<th>Quantity received</th>
102	<th class="title-string">Status</th>	102	<th>Status</th>
103	<th title="Actual cost tax exc. / Actual cost tax inc.">Spent</th>	103	<th title="Actual cost tax exc. / Actual cost tax inc.">Spent</th>
104	<th>Internal note</th>	104	<th>Internal note</th>
105	</tr>	105	</tr>
Lines 118-134 Link Here
118	[% END %]	118	[% END %]
119	</td>	119	</td>
120	<td>[% suborder.ordernumber \| html %]</td>	120	<td>[% suborder.ordernumber \| html %]</td>
121	<td><span title="[% suborder.basket.creationdate \| uri %]">[% suborder.basket.creationdate \| $KohaDates%]</span></td>	121	<td data-order="[% suborder.basket.creationdate \| uri %]">[% suborder.basket.creationdate \| $KohaDates%]</td>
122	<td>[% IF suborder.datereceived %]<span title="[% suborder.datereceived \| uri %]">[% suborder.datereceived \| $KohaDates %]</span>[% END %]</td>	122	<td data-order="[% suborder.datereceived \| uri %]">
		123	[% IF suborder.datereceived %]
		124	[% suborder.datereceived \| $KohaDates %]
		125	[% END %]
		126	</td>
123	<td>[% suborder.quantityreceived \| html %]</td>	127	<td>[% suborder.quantityreceived \| html %]</td>
124	<td>	128	[% SWITCH suborder.orderstatus %]
125	[% SWITCH suborder.orderstatus %]	129	[%# FIXME We should only see/display Complete here, right? %]
126	[%# FIXME We should only see/display Complete here, right? %]	130	[% CASE 'new' %]
127	[% CASE 'new' %]<span title="status_1">New</span>	131	<td data-order="status_1">
128	[% CASE 'ordered' %]<span title="status_2">Ordered</span>	132	New
129	[% CASE 'partial' %]<span title="status_3">Partial</span>	133	[% CASE 'ordered' %]
130	[% CASE 'complete' %]<span title="status_4">Complete</span>	134	<td data-order="status_2">
131	[% CASE 'cancelled' %]<span title="status_5">Cancelled</span>	135	Ordered
		136	[% CASE 'partial' %]
		137	<td data-order="status_3">
		138	Partial
		139	[% CASE 'complete' %]
		140	<td data-order="status_4">
		141	Complete
		142	[% CASE 'cancelled' %]
		143	<td data-order="status_5">
		144	Cancelled
132	[% END %]	145	[% END %]
133	</td>	146	</td>
134	<td>	147	<td>