Attachment #20327 for bug #10725

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

Lines 201-207 for my $item ( @parcelitems ) { Link Here

(-)a/acqui/parcel.pl (-1 / +1 lines)
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') \|\| '';




<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
[% INCLUDE 'doc-head-close.inc' %]
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
[% INCLUDE 'datatables-strings.inc' %]
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
[% INCLUDE 'greybox.inc' %]

        var pendingt = $("#pendingt").dataTable($.extend(true, {}, dataTablesDefaults, {
            "bStateSave": true,
            "iCookieDuration": 60*60*24*1000, // 1000 days
            "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
            "aoColumnDefs": [
                { "aTargets": [ 3, 8, 9 ], "bSortable": false, "bSearchable": false },
            ],

                null,
                null,
            ],
            'bAutoWidth': false,
            "sPaginationType": "four_button"
        } )
        ).columnFilter({
            sPlaceHolder: "head:after",
            aoColumns: [
                { type: "text" },
                { type: "text" },
                { type: "text" },
                null,
                { type: "text" },
                { type: "text" },
                { type: "text" },
                { type: "text" },
                null,
                null
            ]
        });
      }

      if ( $("#receivedt").length ) {
        var receivedt = $("#receivedt").dataTable($.extend(true, {}, dataTablesDefaults, {
            "bStateSave": true,
            "iCookieDuration": 60*60*24*1000, // 1000 days
            "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
            "aoColumnDefs": [
                { "aTargets": [ 3, -1 ], "bSortable": false, "bSearchable": false },
            ],

<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>
</div>
[% UNLESS (invoiceclosedate) %]
  <div id="acqui_receive_search">
    <h3>Pending orders</h3>

    [% IF ( loop_orders ) %]
      <table id="pendingt">
        <thead>
          <tr>
            <th>Basket search</th>
            <th>Order line search</th>
            <th>Summary search</th>
            <th>&nbsp;</th>
            <th>Quantity search</th>
            <th>Unit cost search</th>
            <th>Order cost search</th>
            <th>Fund search</th>
            <th>&nbsp;</th>
            <th>&nbsp;</th>
          </tr>
          <tr>
            <th>Basket</th>
            <th>Order line</th>
            <th>Summary</th>

            <th>Fund</th>
            <th>&nbsp;</th>
            <th>&nbsp;</th>
          </tr>
        </thead>
        <tbody class="filterclass">
        [% FOREACH loop_order IN loop_orders %]
            <tr>
                <td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td>

                        [% END %]
                    </td>
                </tr>
        [% END %]
        </tbody>
      </table>
    [% ELSE %]There are no pending orders.[% END %]
  </div>
[% ELSE %]
    <p>
        Invoice is closed, so you can't receive orders anymore.
- 

Return to bug 10725

Lines 4-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-15 / +45 lines)
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 17-23 Link Here
17	var pendingt = $("#pendingt").dataTable($.extend(true, {}, dataTablesDefaults, {	18	var pendingt = $("#pendingt").dataTable($.extend(true, {}, dataTablesDefaults, {
18	"bStateSave": true,	19	"bStateSave": true,
19	"iCookieDuration": 606024*1000, // 1000 days	20	"iCookieDuration": 606024*1000, // 1000 days
20	"aLengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],	21	"aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
21	"aoColumnDefs": [	22	"aoColumnDefs": [
22	{ "aTargets": [ 3, 8, 9 ], "bSortable": false, "bSearchable": false },	23	{ "aTargets": [ 3, 8, 9 ], "bSortable": false, "bSearchable": false },
23	],	24	],
Lines 33-46 Link Here
33	null,	34	null,
34	null,	35	null,
35	],	36	],
		37	'bAutoWidth': false,
36	"sPaginationType": "four_button"	38	"sPaginationType": "four_button"
37	} ) );	39	} )
		40	).columnFilter({
		41	sPlaceHolder: "head:after",
		42	aoColumns: [
		43	{ type: "text" },
		44	{ type: "text" },
		45	{ type: "text" },
		46	null,
		47	{ type: "text" },
		48	{ type: "text" },
		49	{ type: "text" },
		50	{ type: "text" },
		51	null,
		52	null
		53	]
		54	});
38	}	55	}
		56
39	if ( $("#receivedt").length ) {	57	if ( $("#receivedt").length ) {
40	var receivedt = $("#receivedt").dataTable($.extend(true, {}, dataTablesDefaults, {	58	var receivedt = $("#receivedt").dataTable($.extend(true, {}, dataTablesDefaults, {
41	"bStateSave": true,	59	"bStateSave": true,
42	"iCookieDuration": 606024*1000, // 1000 days	60	"iCookieDuration": 606024*1000, // 1000 days
43	"aLengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],	61	"aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
44	"aoColumnDefs": [	62	"aoColumnDefs": [
45	{ "aTargets": [ 3, -1 ], "bSortable": false, "bSearchable": false },	63	{ "aTargets": [ 3, -1 ], "bSortable": false, "bSearchable": false },
46	],	64	],
Lines 170-181 Link Here
170	<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>	188	<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>
171	</div>	189	</div>
172	[% UNLESS (invoiceclosedate) %]	190	[% UNLESS (invoiceclosedate) %]
173	<div id="acqui_receive_search">	191	<div id="acqui_receive_search">
174	<h3>Pending orders</h3>	192	<h3>Pending orders</h3>
175		193
176	[% IF ( loop_orders ) %]<table id="pendingt">	194	[% IF ( loop_orders ) %]
177	<thead>	195	<table id="pendingt">
178	<tr>	196	<thead>
		197	<tr>
		198	<th>Basket search</th>
		199	<th>Order line search</th>
		200	<th>Summary search</th>
		201	<th> </th>
		202	<th>Quantity search</th>
		203	<th>Unit cost search</th>
		204	<th>Order cost search</th>
		205	<th>Fund search</th>
		206	<th> </th>
		207	<th> </th>
		208	</tr>
		209	<tr>
179	<th>Basket</th>	210	<th>Basket</th>
180	<th>Order line</th>	211	<th>Order line</th>
181	<th>Summary</th>	212	<th>Summary</th>
Lines 186-194 Link Here
186	<th>Fund</th>	217	<th>Fund</th>
187	<th> </th>	218	<th> </th>
188	<th> </th>	219	<th> </th>
189	</tr>	220	</tr>
190	</thead>	221	</thead>
191	<tbody class="filterclass">	222	<tbody class="filterclass">
192	[% FOREACH loop_order IN loop_orders %]	223	[% FOREACH loop_order IN loop_orders %]
193	<tr>	224	<tr>
194	<td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td>	225	<td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td>
Lines 243-253 Link Here
243	[% END %]	274	[% END %]
244	</td>	275	</td>
245	</tr>	276	</tr>
246	[% END %]	277	[% END %]
247	</tbody>	278	</tbody>
248	</table>	279	</table>
249	[% ELSE %]There are no pending orders.[% END %]	280	[% ELSE %]There are no pending orders.[% END %]
250	</div>	281	</div>
251	[% ELSE %]	282	[% ELSE %]
252	<p>	283	<p>
253	Invoice is closed, so you can't receive orders anymore.	284	Invoice is closed, so you can't receive orders anymore.
254	-