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

(-)a/C4/Acquisition.pm (-2 lines)
Lines 2191-2198 sub GetLateOrders { Link Here
2191
    $sth->execute(@query_params);
2191
    $sth->execute(@query_params);
2192
    my @results;
2192
    my @results;
2193
    while (my $data = $sth->fetchrow_hashref) {
2193
    while (my $data = $sth->fetchrow_hashref) {
2194
        $data->{orderdate} = format_date($data->{orderdate});
2195
        $data->{claimed_date} = format_date($data->{claimed_date});
2196
        push @results, $data;
2194
        push @results, $data;
2197
    }
2195
    }
2198
    return @results;
2196
    return @results;
(-)a/acqui/parcels.pl (-1 / +1 lines)
Lines 169-175 for my $i ( $startfrom .. $last_row) { Link Here
169
        nullcode         => $p->{invoicenumber} eq 'NULL',
169
        nullcode         => $p->{invoicenumber} eq 'NULL',
170
        emptycode        => $p->{invoicenumber} eq q{},
170
        emptycode        => $p->{invoicenumber} eq q{},
171
        raw_datereceived => $p->{shipmentdate},
171
        raw_datereceived => $p->{shipmentdate},
172
        datereceived     => format_date( $p->{shipmentdate} ),
172
        datereceived     => $p->{shipmentdate},
173
        bibcount         => $p->{receivedbiblios} || 0,
173
        bibcount         => $p->{receivedbiblios} || 0,
174
        reccount         => $p->{receiveditems} || 0,
174
        reccount         => $p->{receiveditems} || 0,
175
        itemcount        => $p->{itemsexpected} || 0,
175
        itemcount        => $p->{itemsexpected} || 0,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-12 / +12 lines)
Lines 14-29 Link Here
14
<script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
14
<script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
15
<script type="text/JavaScript">
15
<script type="text/JavaScript">
16
//<![CDATA[
16
//<![CDATA[
17
    [% IF (dateformat == 'metric') %]
18
        dt_add_type_uk_date();
19
    [% END %]
20
    $(document).ready(function() {
17
    $(document).ready(function() {
21
        var srlt = $("#files").dataTable($.extend(true, {}, dataTablesDefaults, {
18
        $("#files,#recordst").dataTable($.extend(true, {}, dataTablesDefaults, {
22
            "aoColumns": [
23
                null,null,null,{ "sType": "title-string" },null,null
24
            ],
25
            "aoColumnDefs": [
19
            "aoColumnDefs": [
26
                { "aTargets": [ 5 ], "bSortable": false, "bSearchable": false },
20
                { "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
21
                { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
22
                { "sType": "title-string", "aTargets" : [ "title-string" ] }
27
            ],
23
            ],
28
            "sPaginationType": "four_button",
24
            "sPaginationType": "four_button",
29
            "aaSorting": []
25
            "aaSorting": []
Lines 58-69 Link Here
58
                  </h1>
54
                  </h1>
59
               <div>
55
               <div>
60
                   <form action="[% scriptname %]" method="post" name="import_biblios">
56
                   <form action="[% scriptname %]" method="post" name="import_biblios">
61
                     <table>
57
                     <table id="recordst">
58
                     <thead>
62
                     <tr>
59
                     <tr>
63
                         <th>Citation</th>
60
                         <th class="anti-the">Citation</th>
64
                         <th>Match?</th>
61
                         <th>Match?</th>
65
                         <th>Order</th>
62
                         <th>Order</th>
66
                       </tr>
63
                       </tr>
64
                       </thead>
65
                       <tbody>
67
                       [% FOREACH biblio_lis IN biblio_list %]
66
                       [% FOREACH biblio_lis IN biblio_list %]
68
                         <tr>
67
                         <tr>
69
                             <td>
68
                             <td>
Lines 89-94 Link Here
89
    </tr>
88
    </tr>
90
    [% END %]
89
    [% END %]
91
                      [% END %]
90
                      [% END %]
91
                      </tbody>
92
                     </table>
92
                     </table>
93
                   </form>
93
                   </form>
94
               </div>
94
               </div>
Lines 112-120 Link Here
112
                       <th>File name</th>
112
                       <th>File name</th>
113
                       <th>Comments</th>
113
                       <th>Comments</th>
114
                       <th>Status</th>
114
                       <th>Status</th>
115
                       <th>Staged</th>
115
                       <th class="title-string">Staged</th>
116
                       <th># Bibs</th>
116
                       <th># Bibs</th>
117
                       <th>&nbsp;</th>
117
                       <th class="NoSort">&nbsp;</th>
118
                     </tr>
118
                     </tr>
119
                     </thead>
119
                     </thead>
120
                     <tbody>
120
                     <tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-9 / +12 lines)
Lines 7-17 Link Here
7
[% INCLUDE 'datatables.inc' %]
7
[% INCLUDE 'datatables.inc' %]
8
<script type="text/javascript">
8
<script type="text/javascript">
9
//<![CDATA[
9
//<![CDATA[
10
[% IF (dateformat == 'metric') %]
11
    dt_add_type_uk_date();
12
[% END %]
13
 $(document).ready(function() {
10
 $(document).ready(function() {
14
    var histsearcht = $("#histsearcht").dataTable($.extend(true, {}, dataTablesDefaults, {
11
    $("#histsearcht").dataTable($.extend(true, {}, dataTablesDefaults, {
12
        "aoColumnDefs": [
13
            { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
14
            { "sType": "title-string", "aTargets" : [ "title-string" ] }
15
        ],
15
        "sPaginationType": "four_button"
16
        "sPaginationType": "four_button"
16
    } ) );
17
    } ) );
17
 });
18
 });
Lines 136-145 Link Here
136
				<th>Basket</th>
137
				<th>Basket</th>
137
				<th>Basket group</th>
138
				<th>Basket group</th>
138
                <th>Invoice number</th>
139
                <th>Invoice number</th>
139
				<th>Summary</th>
140
                <th class="anti-the">Summary</th>
140
				<th>Vendor</th>
141
				<th>Vendor</th>
141
				<th>Placed on</th>
142
                <th class="title-string">Placed on</th>
142
				<th>Received on</th>
143
                <th class="title-string">Received on</th>
143
                <th>Quantity received</th>
144
                <th>Quantity received</th>
144
                <th>Pending order</th>
145
                <th>Pending order</th>
145
				<th>Unit cost</th>
146
				<th>Unit cost</th>
Lines 181-190 Link Here
181
                        <br />[% order.author %] <br /> [% order.isbn %]
182
                        <br />[% order.author %] <br /> [% order.isbn %]
182
                    </td>
183
                    </td>
183
                    <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id %]">[% order.name %]</a></td>
184
                    <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id %]">[% order.name %]</a></td>
184
                    <td>[% order.creationdate | $KohaDates %]</td>
185
                    <td><span title="[% order.creationdate %]">[% order.creationdate | $KohaDates %]</span></td>
185
                    <td>
186
                    <td>
186
                        [% IF order.datereceived %]
187
                        [% IF order.datereceived %]
187
                            [% order.datereceived | $KohaDates %]
188
                            <span title="[% order.datereceived %]">[% order.datereceived | $KohaDates %]</span>
189
                        [% ELSE %]
190
                            <span title="0000-00-00"></span>
188
                        [% END %]
191
                        [% END %]
189
                    </td>
192
                    </td>
190
                    <td>[% order.quantityreceived %]</td>
193
                    <td>[% order.quantityreceived %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-12 / +18 lines)
Lines 9-17 Link Here
9
[% INCLUDE 'calendar.inc' %]
9
[% INCLUDE 'calendar.inc' %]
10
<script type="text/javascript">
10
<script type="text/javascript">
11
//<![CDATA[
11
//<![CDATA[
12
[% IF (dateformat == 'metric') %]
13
    dt_add_type_uk_date();
14
[% END %]
15
12
16
var late_orderst;
13
var late_orderst;
17
function check_uncheck() {
14
function check_uncheck() {
Lines 29-34 $(document).ready(function() { Link Here
29
    late_orderst = $("#late_orders").dataTable($.extend(true, {}, dataTablesDefaults, {
26
    late_orderst = $("#late_orders").dataTable($.extend(true, {}, dataTablesDefaults, {
30
        "aoColumnDefs": [
27
        "aoColumnDefs": [
31
            { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false },
28
            { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false },
29
            { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
30
            { "sType": "title-string", "aTargets" : [ "title-string" ] }
32
        ],
31
        ],
33
        "sPaginationType": "four_button",
32
        "sPaginationType": "four_button",
34
        "bAutoWidth": false,
33
        "bAutoWidth": false,
Lines 112-128 $(document).ready(function() { Link Here
112
            [% ELSE %]
111
            [% ELSE %]
113
                <th></th>
112
                <th></th>
114
            [% END %]
113
            [% END %]
115
            <th>Order date</th>
114
            <th class="title-string">Order date</th>
116
            <th>Estimated delivery date</th>
115
            <th class="title-string">Estimated delivery date</th>
117
            <th>Vendor</th>
116
            <th>Vendor</th>
118
            <th>Information</th>
117
            <th class="anti-the">Information</th>
119
            <th>Total cost</th>
118
            <th>Total cost</th>
120
            <th>Basket</th>
119
            <th>Basket</th>
121
            <th>Basket group</th>
120
            <th>Basket group</th>
122
            <th>Library</th>
121
            <th>Library</th>
123
            <th>Fund</th>
122
            <th>Fund</th>
124
            <th>Claims count</th>
123
            <th>Claims count</th>
125
            <th>Claimed date</th>
124
            <th class="title-string">Claimed date</th>
126
        </tr>
125
        </tr>
127
      </thead>
126
      </thead>
128
      <tbody>
127
      <tbody>
Lines 133-144 $(document).ready(function() { Link Here
133
                <input type="checkbox" value="[% lateorder.ordernumber %]" data-booksellerid="[% lateorder.supplierid %]" name="ordernumber">
132
                <input type="checkbox" value="[% lateorder.ordernumber %]" data-booksellerid="[% lateorder.supplierid %]" name="ordernumber">
134
            </td>
133
            </td>
135
            <td>
134
            <td>
136
                [% lateorder.orderdate %]
135
                <span title="[% lateorder.orderdate %]">[% lateorder.orderdate | $KohaDates %] ([% lateorder.latesince %] days)</span>
137
                ([% lateorder.latesince %] days)
138
            </td>
136
            </td>
139
            <td>
137
            <td>
140
                [% IF ( lateorder.estimateddeliverydate ) %]
138
                [% IF ( lateorder.estimateddeliverydate ) %]
141
                    [% lateorder.estimateddeliverydate | $KohaDates  %]
139
                    <span title="[% lateorder.estimateddeliverydate %]">[% lateorder.estimateddeliverydate | $KohaDates  %]</span>
140
                [% ELSE %]
141
                    <span title="0000-00-00"></span>
142
                [% END %]
142
                [% END %]
143
            </td>
143
            </td>
144
            <td>
144
            <td>
Lines 180-186 $(document).ready(function() { Link Here
180
            <td>[% lateorder.budget %]
180
            <td>[% lateorder.budget %]
181
            </td>
181
            </td>
182
            <td>[% lateorder.claims_count %]</td>
182
            <td>[% lateorder.claims_count %]</td>
183
            <td>[% lateorder.claimed_date %]</td>
183
            <td>
184
                [% IF ( lateorder.claimed_date ) %]
185
                    <span title="[% lateorder.claimed_date %]">[% lateorder.claimed_date | $KohaDates %]</span>
186
                [% ELSE %]
187
                    <span title="0000-00-00"></span>
188
                [% END %]
189
            </td>
184
        </tr>
190
        </tr>
185
      [% END %]
191
      [% END %]
186
      </tbody>
192
      </tbody>
Lines 226-232 $(document).ready(function() { Link Here
226
232
227
	<li><label for="booksellerid">Vendor:</label>
233
	<li><label for="booksellerid">Vendor:</label>
228
		<select id="booksellerid" size="1" tabindex="" name="booksellerid">
234
		<select id="booksellerid" size="1" tabindex="" name="booksellerid">
229
			<option value=""/>
235
            <option value=""></option>
230
			[% FOREACH SUPPLIER_LOO IN SUPPLIER_LOOP %]
236
			[% FOREACH SUPPLIER_LOO IN SUPPLIER_LOOP %]
231
                [% IF ( SUPPLIER_LOO.selected ) %]<option value="[% SUPPLIER_LOO.id %]" selected="selected">[% SUPPLIER_LOO.name %]</option>
237
                [% IF ( SUPPLIER_LOO.selected ) %]<option value="[% SUPPLIER_LOO.id %]" selected="selected">[% SUPPLIER_LOO.name %]</option>
232
                [% ELSE %]<option value="[% SUPPLIER_LOO.id %]">[% SUPPLIER_LOO.name %]</option>[% END %]
238
                [% ELSE %]<option value="[% SUPPLIER_LOO.id %]">[% SUPPLIER_LOO.name %]</option>[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-11 / +12 lines)
Lines 14-29 Link Here
14
        }
14
        }
15
    }
15
    }
16
16
17
    [% IF (dateformat == 'metric') %]
18
        dt_add_type_uk_date();
19
    [% END %]
20
    $(document).ready(function() {
17
    $(document).ready(function() {
21
        $("#srlt").dataTable($.extend(true, {}, dataTablesDefaults, {
18
        $("#srlt").dataTable($.extend(true, {}, dataTablesDefaults, {
22
            "aoColumnDefs": [
19
            "aoColumnDefs": [
23
                [% IF (dateformat == 'metric') %]
20
                { "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
24
                    { "aTargets": [ -2 ], "sType": "uk_date" },
21
                { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
25
                [% END %]
22
                { "sType": "title-string", "aTargets" : [ "title-string" ] }
26
            ],
23
            ]
27
        } ) )
24
        } ) )
28
25
29
        $("#show_only_renewed").click(function(){
26
        $("#show_only_renewed").click(function(){
Lines 58-69 Link Here
58
                        <thead>
55
                        <thead>
59
                            <tr>
56
                            <tr>
60
                                <th>ISSN</th>
57
                                <th>ISSN</th>
61
                                <th>Title</th>
58
                                <th class="anti-the">Title</th>
62
                                <th> Notes </th>
59
                                <th> Notes </th>
63
                                <th>Library</th>
60
                                <th>Library</th>
64
                                <th>Call number</th>
61
                                <th>Call number</th>
65
                                <th>Expiration date</th>
62
                                <th class="title-string">Expiration date</th>
66
                                <th></th>
63
                                <th class="NoSort"></th>
67
                            </tr>
64
                            </tr>
68
                        </thead>
65
                        </thead>
69
                        <tbody>
66
                        <tbody>
Lines 84-90 Link Here
84
                                    [% IF (sub.callnumber) %][% sub.callnumber %][% END %]
81
                                    [% IF (sub.callnumber) %][% sub.callnumber %][% END %]
85
                                </td>
82
                                </td>
86
                                <td>
83
                                <td>
87
                                    [% IF (sub.enddate) %][% sub.enddate | $KohaDates %][% END %]
84
                                    [% IF (sub.enddate) %]
85
                                        <span title="[% sub.enddate %]">[% sub.enddate | $KohaDates %]</span>
86
                                    [% ELSE %]
87
                                        <span title="0000-00-00"></span>
88
                                    [% END %]
88
                                </td>
89
                                </td>
89
                                <td>
90
                                <td>
90
                                    [% IF (sub.alreadyOnOrder) %]
91
                                    [% IF (sub.alreadyOnOrder) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-13 / +14 lines)
Lines 7-17 Link Here
7
[% INCLUDE 'datatables.inc' %]
7
[% INCLUDE 'datatables.inc' %]
8
<script type="text/javascript">
8
<script type="text/javascript">
9
//<![CDATA[
9
//<![CDATA[
10
[% IF (dateformat == 'metric') %]
11
    dt_add_type_uk_date();
12
[% END %]
13
 $(document).ready(function() {
10
 $(document).ready(function() {
14
    var spent = $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
11
    $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
12
        "aoColumnDefs": [
13
            { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
14
            { "sType": "title-string", "aTargets" : [ "title-string" ] }
15
        ],
15
        "sPaginationType": "four_button"
16
        "sPaginationType": "four_button"
16
    } ) );
17
    } ) );
17
 });
18
 });
Lines 33-48 Link Here
33
<h1>Fund: [% fund_code %]</h1>
34
<h1>Fund: [% fund_code %]</h1>
34
<h2>Ordered</h2>
35
<h2>Ordered</h2>
35
36
36
<table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
37
<table id="spent">
37
    <thead>
38
    <thead>
38
    <tr>
39
    <tr>
39
        <th> Title </th>
40
    <th class="anti-the"> Title </th>
40
	<th> Order </th>
41
	<th> Order </th>
41
	<th> Vendor </th>
42
	<th> Vendor </th>
42
	<th> Itemtype </th>
43
    <th> Item type </th>
43
    <th> Left on order </th>
44
    <th> Left on order </th>
44
	<th> Estimated cost per unit </th>
45
	<th> Estimated cost per unit </th>
45
    <th> Date ordered </th>
46
    <th class="title-string"> Date ordered </th>
46
	<th> Subtotal </th>
47
	<th> Subtotal </th>
47
    </tr>
48
    </tr>
48
    </thead>
49
    </thead>
Lines 72-84 Link Here
72
	<td class="cell">
73
	<td class="cell">
73
	    [% order.left %]
74
	    [% order.left %]
74
	</td>
75
	</td>
75
	<td class="cell" align="right">
76
    <td class="data cell">
76
	    [% order.ecost %]
77
	    [% order.ecost %]
77
	</td>
78
	</td>
78
	<td class="cell" align="right">
79
    <td class="cell">
79
	    [% order.entrydate | $KohaDates %]
80
        <span title="[% order.entrydate %]">[% order.entrydate | $KohaDates %]</span>
80
	</td>
81
	</td>
81
	<td class="cell" align="right">
82
    <td class="data cell">
82
	    [% order.subtotal %]
83
	    [% order.subtotal %]
83
	</td>
84
	</td>
84
    </tr>
85
    </tr>
Lines 93-99 Link Here
93
        <td> </td>
94
        <td> </td>
94
        <td> </td>
95
        <td> </td>
95
	<td> </td>
96
	<td> </td>
96
        <td align="right">
97
        <td class="data">
97
            [% total %]
98
            [% total %]
98
        </td>
99
        </td>
99
    </tr>
100
    </tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-5 / +5 lines)
Lines 8-17 Link Here
8
<script type="text/javascript">
8
<script type="text/javascript">
9
//<![CDATA[
9
//<![CDATA[
10
 $(document).ready(function() {
10
 $(document).ready(function() {
11
[% IF (dateformat == 'metric') %]
12
    dt_add_type_uk_date();
13
[% END %]
14
    var parcelst = $("#parcelst").dataTable($.extend(true, {}, dataTablesDefaults, {
11
    var parcelst = $("#parcelst").dataTable($.extend(true, {}, dataTablesDefaults, {
12
        "aoColumnDefs": [
13
          { "sType": "title-string", "aTargets" : [ "title-string" ] }
14
        ],
15
        "sPaginationType": "four_button"
15
        "sPaginationType": "four_button"
16
    } ) );
16
    } ) );
17
17
Lines 88-94 Link Here
88
    <thead>
88
    <thead>
89
        <tr>
89
        <tr>
90
            <th>Line</th>
90
            <th>Line</th>
91
            <th>Date received</th>
91
            <th class="title-string">Date received</th>
92
            <th>Invoice number</th>
92
            <th>Invoice number</th>
93
            <th>Item count</th>
93
            <th>Item count</th>
94
            <th>Biblio count</th>
94
            <th>Biblio count</th>
Lines 107-113 Link Here
107
                [% searchresult.number %]
107
                [% searchresult.number %]
108
            </td>
108
            </td>
109
            <td>
109
            <td>
110
                [% searchresult.datereceived %]
110
                <span title="[% searchresult.datereceived %]">[% searchresult.datereceived | $KohaDates %]</span>
111
            </td>
111
            </td>
112
            <td>
112
            <td>
113
                [% IF ( searchresult.code ) %]
113
                [% IF ( searchresult.code ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-18 / +19 lines)
Lines 8-17 Link Here
8
<script type="text/javascript">
8
<script type="text/javascript">
9
//<![CDATA[
9
//<![CDATA[
10
 $(document).ready(function() {
10
 $(document).ready(function() {
11
    [% IF (dateformat == 'metric') %]
11
    $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
12
        dt_add_type_uk_date();
12
        "aoColumnDefs": [
13
    [% END %]
13
            { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
14
    var spent = $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
14
            { "sType": "title-string", "aTargets" : [ "title-string" ] }
15
        ],
15
        "sPaginationType": "four_button"
16
        "sPaginationType": "four_button"
16
    } ) );
17
    } ) );
17
 });
18
 });
Lines 34-51 Link Here
34
<h2>Spent</h2>
35
<h2>Spent</h2>
35
36
36
37
37
<table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
38
<table id="spent">
38
    <thead>
39
    <thead>
39
    <tr>
40
    <tr>
40
        <th> Title </th>
41
        <th class="anti-the"> Title </th>
41
	<th> Order </th>
42
	<th> Order </th>
42
	<th> Vendor </th>
43
	<th> Vendor </th>
43
	<th> Invoice </th>
44
	<th> Invoice </th>
44
	<th> Itemtype </th>
45
    <th> Item type </th>
45
	<th> Received </th>
46
	<th> Received </th>
46
    <th> Unit price </th>
47
    <th> Unit price </th>
47
    <th> Date ordered </th>
48
    <th class="title-string"> Date ordered </th>
48
    <th> Date received </th>
49
    <th class="title-string"> Date received </th>
49
	<th> Subtotal </th>
50
	<th> Subtotal </th>
50
    </tr>
51
    </tr>
51
    </thead>
52
    </thead>
Lines 75-90 Link Here
75
	<td class="cell">
76
	<td class="cell">
76
	    [% order.quantityreceived %]
77
	    [% order.quantityreceived %]
77
	</td>
78
	</td>
78
	<td class="cell" align="right">
79
    <td class="cell">
79
	    [% order.unitprice %]
80
	    [% order.unitprice %]
80
	</td>
81
	</td>
81
	<td class="cell" align="right">
82
    <td class="cell">
82
	    [% order.entrydate | $KohaDates %]
83
        <span title="[% order.entrydate %]">[% order.entrydate | $KohaDates %]</span>
83
	</td>
84
	</td>
84
	<td class="cell" align="right">
85
    <td class="cell">
85
	    [% order.datereceived | $KohaDates %]
86
        <span title="[% order.datereceived %]">[% order.datereceived | $KohaDates %]</span>
86
	</td>
87
	</td>
87
	<td class="cell" align="right">
88
    <td class="data cell">
88
	    [% order.rowtotal %]
89
	    [% order.rowtotal %]
89
	</td>
90
	</td>
90
    </tr>
91
    </tr>
Lines 93-111 Link Here
93
        [% IF shipmentcosts.size %]
94
        [% IF shipmentcosts.size %]
94
            <tr valign="top">
95
            <tr valign="top">
95
                <td colspan="9"> Sub total </td>
96
                <td colspan="9"> Sub total </td>
96
                <td align="right"> [% subtotal %] </td>
97
                <td class="data"> [% subtotal %] </td>
97
            </tr>
98
            </tr>
98
            [% FOREACH shipmentcost IN shipmentcosts %]
99
            [% FOREACH shipmentcost IN shipmentcosts %]
99
                <tr>
100
                <tr>
100
                    <td></td>
101
                    <td></td>
101
                    <td colspan="8">Shipping cost for invoice [% shipmentcost.invoicenumber %]</td>
102
                    <td colspan="8">Shipping cost for invoice [% shipmentcost.invoicenumber %]</td>
102
                    <td class="total">[% shipmentcost.shipmentcost %]</td>
103
                    <td class="data total">[% shipmentcost.shipmentcost %]</td>
103
                </tr>
104
                </tr>
104
            [% END %]
105
            [% END %]
105
        [% END %]
106
        [% END %]
106
        <tr>
107
        <tr>
107
            <td colspan="9">TOTAL</td>
108
            <td colspan="9">TOTAL</td>
108
            <td class="total">[% total %]</td>
109
            <td class="data total">[% total %]</td>
109
        </tr>
110
        </tr>
110
    </tfoot>
111
    </tfoot>
111
</table>
112
</table>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-15 / +6 lines)
Lines 14-33 function confirm_deletion() { Link Here
14
}
14
}
15
15
16
 $(document).ready(function() {
16
 $(document).ready(function() {
17
    [% IF (dateformat == 'metric') %]
18
        dt_add_type_uk_date();
19
    [% END %]
20
    var contractst = $("#contractst").dataTable($.extend(true, {}, dataTablesDefaults, {
17
    var contractst = $("#contractst").dataTable($.extend(true, {}, dataTablesDefaults, {
21
        "aoColumnDefs": [
18
        "aoColumnDefs": [
22
          { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
19
          { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
23
          [% IF (dateformat == 'metric') %]
20
          { "sType": "title-string", "aTargets" : [ "title-string" ] }
24
            { "aTargets": [ 2, 3 ], "sType": "uk_date" },
25
          [% END %]
26
        ],
21
        ],
27
        'sDom': 't',
22
        'sDom': 't'
28
        'bPaginate': false,
29
        'bFilter': false,
30
        'bInfo': false,
31
    } ) );
23
    } ) );
32
 });
24
 });
33
//]]>
25
//]]>
Lines 249-256 function confirm_deletion() { Link Here
249
                    <tr>
241
                    <tr>
250
                        <th scope="col">Name</th>
242
                        <th scope="col">Name</th>
251
                        <th scope="col">Description</th>
243
                        <th scope="col">Description</th>
252
                        <th scope="col">Start date</th>
244
                        <th scope="col" class="title-string">Start date</th>
253
                        <th scope="col">End date</th>
245
                        <th scope="col" class="title-string">End date</th>
254
                        <th scope="col">&nbsp; </th>
246
                        <th scope="col">&nbsp; </th>
255
                        <th scope="col">&nbsp; </th>
247
                        <th scope="col">&nbsp; </th>
256
                    </tr>
248
                    </tr>
Lines 262-269 function confirm_deletion() { Link Here
262
                            <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">[% contract.contractname %]</a>
254
                            <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">[% contract.contractname %]</a>
263
                        </td>
255
                        </td>
264
                        <td>[% contract.contractdescription %]</td>
256
                        <td>[% contract.contractdescription %]</td>
265
                        <td>[% contract.contractstartdate | $KohaDates %]</td>
257
                        <td><span title="[% contract.contractstartdate %]">[% contract.contractstartdate | $KohaDates %]</span></td>
266
                        <td>[% contract.contractenddate | $KohaDates %]</td>
258
                        <td><span title="[% contract.contractenddate %]">[% contract.contractenddate | $KohaDates %]</span></td>
267
                        <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">Edit</a></td>
259
                        <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">Edit</a></td>
268
                        <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">Delete</a></td>
260
                        <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">Delete</a></td>
269
                        </tr>
261
                        </tr>
270
- 

Return to bug 12089