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

(-)a/acqui/finishreceive.pl (-1 / +1 lines)
Lines 165-168 ModItem( Link Here
165
    $_
165
    $_
166
) foreach GetItemnumbersFromOrder($new_ordernumber);
166
) foreach GetItemnumbersFromOrder($new_ordernumber);
167
167
168
print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid");
168
print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid&sticky_filters=1");
(-)a/acqui/parcel.pl (-6 / +17 lines)
Lines 71-76 use C4::Reserves qw/GetReservesFromBiblionumber/; Link Here
71
use JSON;
71
use JSON;
72
72
73
my $input=new CGI;
73
my $input=new CGI;
74
my $sticky_filters = $input->param('sticky_filters') || 0;
74
75
75
sub get_value_with_gst_params {
76
sub get_value_with_gst_params {
76
    my $value = shift;
77
    my $value = shift;
Lines 214-225 push @book_foot_loop, map { $_ } values %foot; Link Here
214
my @loop_orders = ();
215
my @loop_orders = ();
215
unless( defined $invoice->{closedate} ) {
216
unless( defined $invoice->{closedate} ) {
216
    my $pendingorders;
217
    my $pendingorders;
217
    if($op eq "search"){
218
    if ( $op eq "search" or $sticky_filters ) {
218
        my $search   = $input->param('summaryfilter') || '';
219
        my ( $search, $ean, $basketname, $orderno, $basketgroupname );
219
        my $ean      = $input->param('eanfilter') || '';
220
        if ( $sticky_filters ) {
220
        my $basketname = $input->param('basketfilter') || '';
221
            $search = $input->cookie("filter_parcel_summary");
221
        my $orderno  = $input->param('orderfilter') || '';
222
            $ean = $input->cookie("filter_parcel_ean");
222
        my $basketgroupname = $input->param('basketgroupnamefilter') || '';
223
            $basketname = $input->cookie("filter_parcel_basketname");
224
            $orderno = $input->cookie("filter_parcel_orderno");
225
            $basketgroupname = $input->cookie("filter_parcel_basketgroupname");
226
        } else {
227
            $search   = $input->param('summaryfilter') || '';
228
            $ean      = $input->param('eanfilter') || '';
229
            $basketname = $input->param('basketfilter') || '';
230
            $orderno  = $input->param('orderfilter') || '';
231
            $basketgroupname = $input->param('basketgroupnamefilter') || '';
232
        }
223
        $pendingorders = SearchOrders({
233
        $pendingorders = SearchOrders({
224
            booksellerid => $booksellerid,
234
            booksellerid => $booksellerid,
225
            basketname => $basketname,
235
            basketname => $basketname,
Lines 324-328 $template->param( Link Here
324
    total_quantity       => $total_quantity,
334
    total_quantity       => $total_quantity,
325
    total_gste           => sprintf( "%.2f", $total_gste ),
335
    total_gste           => sprintf( "%.2f", $total_gste ),
326
    total_gsti           => sprintf( "%.2f", $total_gsti ),
336
    total_gsti           => sprintf( "%.2f", $total_gsti ),
337
    sticky_filters       => $sticky_filters,
327
);
338
);
328
output_html_with_http_headers $input, $cookie, $template->output;
339
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-1 / +18 lines)
Lines 6-17 Link Here
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
7
[% INCLUDE 'datatables.inc' %]
7
[% INCLUDE 'datatables.inc' %]
8
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
8
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
9
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.cookie.min.js"></script>
9
[% INCLUDE 'greybox.inc' %]
10
[% INCLUDE 'greybox.inc' %]
10
<script type="text/javascript">
11
<script type="text/javascript">
11
//<![CDATA[
12
//<![CDATA[
12
13
13
    dt_overwrite_html_sorting_localeCompare();
14
    dt_overwrite_html_sorting_localeCompare();
14
15
16
    var sticky_filters = [% sticky_filters %];
17
15
    $(document).ready(function(){
18
    $(document).ready(function(){
16
      if ( $("#pendingt").length ) {
19
      if ( $("#pendingt").length ) {
17
        var pendingt = $("#pendingt").dataTable($.extend(true, {}, dataTablesDefaults, {
20
        var pendingt = $("#pendingt").dataTable($.extend(true, {}, dataTablesDefaults, {
Lines 81-86 Link Here
81
        } ) );
84
        } ) );
82
      }
85
      }
83
86
87
      // Keep filters from finishreceive.pl to parcel.pl
88
      $.cookie("filter_parcel_summary", $("#summaryfilter").val());
89
      $.cookie("filter_parcel_basketname", $("#basketfilter").val());
90
      $.cookie("filter_parcel_orderno", $("#orderfilter").val());
91
      $.cookie("filter_parcel_basketgroupname", $("#basketgroupnamefilter").val());
92
      $.cookie("filter_parcel_ean", $("#eanfilter").val());
93
94
      $("#filterform").on('submit', function(){
95
        $.cookie("filter_parcel_summary", $("#summaryfilter").val());
96
        $.cookie("filter_parcel_basketname", $("#basketfilter").val());
97
        $.cookie("filter_parcel_orderno", $("#orderfilter").val());
98
        $.cookie("filter_parcel_basketgroupname", $("#basketgroupnamefilter").val());
99
        $.cookie("filter_parcel_ean", $("#eanfilter").val());
100
      });
101
84
    });
102
    });
85
103
86
     // Case-insensitive version of jquery's contains function
104
     // Case-insensitive version of jquery's contains function
87
- 

Return to bug 11141