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

(-)a/acqui/parcel.pl (-1 / +1 lines)
Lines 201-207 for my $item ( @parcelitems ) { Link Here
201
push @book_foot_loop, map { $_ } values %foot;
201
push @book_foot_loop, map { $_ } values %foot;
202
202
203
my @loop_orders = ();
203
my @loop_orders = ();
204
if(!defined $invoice->{closedate}) {
204
unless( defined $invoice->{closedate} ) {
205
    my $pendingorders;
205
    my $pendingorders;
206
    if($input->param('op') eq "search"){
206
    if($input->param('op') eq "search"){
207
        my $search   = $input->param('summaryfilter') || '';
207
        my $search   = $input->param('summaryfilter') || '';
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-15 / +45 lines)
Lines 4-9 Link Here
4
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
4
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
5
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
6
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
6
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
7
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
7
[% INCLUDE 'datatables-strings.inc' %]
8
[% INCLUDE 'datatables-strings.inc' %]
8
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
9
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
9
[% INCLUDE 'greybox.inc' %]
10
[% INCLUDE 'greybox.inc' %]
Lines 18-24 Link Here
18
        var pendingt = $("#pendingt").dataTable($.extend(true, {}, dataTablesDefaults, {
19
        var pendingt = $("#pendingt").dataTable($.extend(true, {}, dataTablesDefaults, {
19
            "bStateSave": true,
20
            "bStateSave": true,
20
            "iCookieDuration": 60*60*24*1000, // 1000 days
21
            "iCookieDuration": 60*60*24*1000, // 1000 days
21
            "aLengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
22
            "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
22
            "aoColumnDefs": [
23
            "aoColumnDefs": [
23
                { "aTargets": [ 3, 8, 9 ], "bSortable": false, "bSearchable": false },
24
                { "aTargets": [ 3, 8, 9 ], "bSortable": false, "bSearchable": false },
24
            ],
25
            ],
Lines 34-47 Link Here
34
                null,
35
                null,
35
                null,
36
                null,
36
            ],
37
            ],
38
            'bAutoWidth': false,
37
            "sPaginationType": "four_button"
39
            "sPaginationType": "four_button"
38
        } ) );
40
        } )
41
        ).columnFilter({
42
            sPlaceHolder: "head:after",
43
            aoColumns: [
44
                { type: "text" },
45
                { type: "text" },
46
                { type: "text" },
47
                null,
48
                { type: "text" },
49
                { type: "text" },
50
                { type: "text" },
51
                { type: "text" },
52
                null,
53
                null
54
            ]
55
        });
39
      }
56
      }
57
40
      if ( $("#receivedt").length ) {
58
      if ( $("#receivedt").length ) {
41
        var receivedt = $("#receivedt").dataTable($.extend(true, {}, dataTablesDefaults, {
59
        var receivedt = $("#receivedt").dataTable($.extend(true, {}, dataTablesDefaults, {
42
            "bStateSave": true,
60
            "bStateSave": true,
43
            "iCookieDuration": 60*60*24*1000, // 1000 days
61
            "iCookieDuration": 60*60*24*1000, // 1000 days
44
            "aLengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
62
            "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
45
            "aoColumnDefs": [
63
            "aoColumnDefs": [
46
                { "aTargets": [ 3, -1 ], "bSortable": false, "bSearchable": false },
64
                { "aTargets": [ 3, -1 ], "bSortable": false, "bSearchable": false },
47
            ],
65
            ],
Lines 171-182 Link Here
171
<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>
189
<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>
172
</div>
190
</div>
173
[% UNLESS (invoiceclosedate) %]
191
[% UNLESS (invoiceclosedate) %]
174
<div id="acqui_receive_search">
192
  <div id="acqui_receive_search">
175
    <h3>Pending orders</h3>
193
    <h3>Pending orders</h3>
176
194
177
 [% IF ( loop_orders ) %]<table id="pendingt">
195
    [% IF ( loop_orders ) %]
178
    <thead>
196
      <table id="pendingt">
179
        <tr>
197
        <thead>
198
          <tr>
199
            <th>Basket search</th>
200
            <th>Order line search</th>
201
            <th>Summary search</th>
202
            <th>&nbsp;</th>
203
            <th>Quantity search</th>
204
            <th>Unit cost search</th>
205
            <th>Order cost search</th>
206
            <th>Fund search</th>
207
            <th>&nbsp;</th>
208
            <th>&nbsp;</th>
209
          </tr>
210
          <tr>
180
            <th>Basket</th>
211
            <th>Basket</th>
181
            <th>Order line</th>
212
            <th>Order line</th>
182
            <th>Summary</th>
213
            <th>Summary</th>
Lines 187-195 Link Here
187
            <th>Fund</th>
218
            <th>Fund</th>
188
            <th>&nbsp;</th>
219
            <th>&nbsp;</th>
189
            <th>&nbsp;</th>
220
            <th>&nbsp;</th>
190
        </tr>
221
          </tr>
191
    </thead>
222
        </thead>
192
    <tbody class="filterclass">
223
        <tbody class="filterclass">
193
        [% FOREACH loop_order IN loop_orders %]
224
        [% FOREACH loop_order IN loop_orders %]
194
            <tr>
225
            <tr>
195
                <td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td>
226
                <td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td>
Lines 244-254 Link Here
244
                        [% END %]
275
                        [% END %]
245
                    </td>
276
                    </td>
246
                </tr>
277
                </tr>
247
            [% END %]
278
        [% END %]
248
        </tbody>
279
        </tbody>
249
        </table>
280
      </table>
250
        [% ELSE %]There are no pending orders.[% END %]
281
    [% ELSE %]There are no pending orders.[% END %]
251
    </div>
282
  </div>
252
[% ELSE %]
283
[% ELSE %]
253
    <p>
284
    <p>
254
        Invoice is closed, so you can't receive orders anymore.
285
        Invoice is closed, so you can't receive orders anymore.
255
- 

Return to bug 10124