View | Details | Raw Unified | Return to bug 10725
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
[% INCLUDE 'datatables.inc' %]
6
[% INCLUDE 'datatables.inc' %]
7
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
7
[% INCLUDE 'greybox.inc' %]
8
[% INCLUDE 'greybox.inc' %]
8
<script type="text/javascript">
9
<script type="text/javascript">
9
//<![CDATA[
10
//<![CDATA[
Lines 15-21 Link Here
15
        var pendingt = $("#pendingt").dataTable($.extend(true, {}, dataTablesDefaults, {
16
        var pendingt = $("#pendingt").dataTable($.extend(true, {}, dataTablesDefaults, {
16
            "bStateSave": true,
17
            "bStateSave": true,
17
            "iCookieDuration": 60*60*24*1000, // 1000 days
18
            "iCookieDuration": 60*60*24*1000, // 1000 days
18
            "aLengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
19
            "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
19
            "aoColumnDefs": [
20
            "aoColumnDefs": [
20
                { "aTargets": [ 3, 8, 9 ], "bSortable": false, "bSearchable": false },
21
                { "aTargets": [ 3, 8, 9 ], "bSortable": false, "bSearchable": false },
21
            ],
22
            ],
Lines 31-44 Link Here
31
                null,
32
                null,
32
                null,
33
                null,
33
            ],
34
            ],
35
            'bAutoWidth': false,
34
            "sPaginationType": "four_button"
36
            "sPaginationType": "four_button"
35
        } ) );
37
        } )
38
        ).columnFilter({
39
            sPlaceHolder: "head:after",
40
            aoColumns: [
41
                { type: "text" },
42
                { type: "text" },
43
                { type: "text" },
44
                null,
45
                { type: "text" },
46
                { type: "text" },
47
                { type: "text" },
48
                { type: "text" },
49
                null,
50
                null
51
            ]
52
        });
36
      }
53
      }
54
37
      if ( $("#receivedt").length ) {
55
      if ( $("#receivedt").length ) {
38
        var receivedt = $("#receivedt").dataTable($.extend(true, {}, dataTablesDefaults, {
56
        var receivedt = $("#receivedt").dataTable($.extend(true, {}, dataTablesDefaults, {
39
            "bStateSave": true,
57
            "bStateSave": true,
40
            "iCookieDuration": 60*60*24*1000, // 1000 days
58
            "iCookieDuration": 60*60*24*1000, // 1000 days
41
            "aLengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
59
            "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
42
            "aoColumnDefs": [
60
            "aoColumnDefs": [
43
                { "aTargets": [ 3, -1 ], "bSortable": false, "bSearchable": false },
61
                { "aTargets": [ 3, -1 ], "bSortable": false, "bSearchable": false },
44
            ],
62
            ],
Lines 175-186 Link Here
175
<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>
193
<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>
176
</div>
194
</div>
177
[% UNLESS (invoiceclosedate) %]
195
[% UNLESS (invoiceclosedate) %]
178
<div id="acqui_receive_search">
196
  <div id="acqui_receive_search">
179
    <h3>Pending orders</h3>
197
    <h3>Pending orders</h3>
180
198
181
 [% IF ( loop_orders ) %]<table id="pendingt">
199
    [% IF ( loop_orders ) %]
182
    <thead>
200
      <table id="pendingt">
183
        <tr>
201
        <thead>
202
          <tr>
203
            <th>Basket search</th>
204
            <th>Order line search</th>
205
            <th>Summary search</th>
206
            <th>&nbsp;</th>
207
            <th>Quantity search</th>
208
            <th>Unit cost search</th>
209
            <th>Order cost search</th>
210
            <th>Fund search</th>
211
            <th>&nbsp;</th>
212
            <th>&nbsp;</th>
213
          </tr>
214
          <tr>
184
            <th>Basket</th>
215
            <th>Basket</th>
185
            <th>Order line</th>
216
            <th>Order line</th>
186
            <th>Summary</th>
217
            <th>Summary</th>
Lines 191-199 Link Here
191
            <th>Fund</th>
222
            <th>Fund</th>
192
            <th>&nbsp;</th>
223
            <th>&nbsp;</th>
193
            <th>&nbsp;</th>
224
            <th>&nbsp;</th>
194
        </tr>
225
          </tr>
195
    </thead>
226
        </thead>
196
    <tbody class="filterclass">
227
        <tbody class="filterclass">
197
        [% FOREACH loop_order IN loop_orders %]
228
        [% FOREACH loop_order IN loop_orders %]
198
            <tr>
229
            <tr>
199
                <td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td>
230
                <td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td>
Lines 250-260 Link Here
250
                        [% END %]
281
                        [% END %]
251
                    </td>
282
                    </td>
252
                </tr>
283
                </tr>
253
            [% END %]
284
        [% END %]
254
        </tbody>
285
        </tbody>
255
        </table>
286
      </table>
256
        [% ELSE %]There are no pending orders.[% END %]
287
    [% ELSE %]There are no pending orders.[% END %]
257
    </div>
288
  </div>
258
[% ELSE %]
289
[% ELSE %]
259
    <p>
290
    <p>
260
        Invoice is closed, so you can't receive orders anymore.
291
        Invoice is closed, so you can't receive orders anymore.
261
- 

Return to bug 10725