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

(-)a/C4/Serials.pm (+8 lines)
Lines 550-555 The valid search fields are: Link Here
550
  callnumber
550
  callnumber
551
  location
551
  location
552
  publisher
552
  publisher
553
  barcode
553
  bookseller
554
  bookseller
554
  branch
555
  branch
555
  expiration_date
556
  expiration_date
Lines 589-594 sub SearchSubscriptions { Link Here
589
            LEFT JOIN biblio ON biblio.biblionumber = subscription.biblionumber
590
            LEFT JOIN biblio ON biblio.biblionumber = subscription.biblionumber
590
            LEFT JOIN biblioitems ON biblioitems.biblionumber = subscription.biblionumber
591
            LEFT JOIN biblioitems ON biblioitems.biblionumber = subscription.biblionumber
591
            LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
592
            LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
593
            LEFT JOIN items ON items.biblionumber = biblio.biblionumber
592
    |;
594
    |;
593
    $query .= q| WHERE 1|;
595
    $query .= q| WHERE 1|;
594
    my @where_strs;
596
    my @where_strs;
Lines 626-631 sub SearchSubscriptions { Link Here
626
        push @where_strs, "biblioitems.publishercode LIKE ?";
628
        push @where_strs, "biblioitems.publishercode LIKE ?";
627
        push @where_args, "%$args->{publisher}%";
629
        push @where_args, "%$args->{publisher}%";
628
    }
630
    }
631
   if( $args->{barcode} ){
632
        push @where_strs, "items.barcode LIKE ?";
633
        push @where_args, "%$args->{barcode}%";
634
    }
635
636
629
    if( $args->{bookseller} ){
637
    if( $args->{bookseller} ){
630
        push @where_strs, "aqbooksellers.name LIKE ?";
638
        push @where_strs, "aqbooksellers.name LIKE ?";
631
        push @where_args, "%$args->{bookseller}%";
639
        push @where_args, "%$args->{bookseller}%";
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt (-1 / +15 lines)
Lines 81-86 Link Here
81
                  <label for="publisher">Publisher:</label>
81
                  <label for="publisher">Publisher:</label>
82
                  <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter | html %]" />
82
                  <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter | html %]" />
83
                </li>
83
                </li>
84
85
                <li>
86
                  <label for="barcode">Barcode:</label>
87
                  <input type="text" id="barcode" name="barcode_filter" value="[% barcode_filter | html %]" />
88
                </li>
89
90
84
                <li>
91
                <li>
85
                  <label for="bookseller">Vendor:</label>
92
                  <label for="bookseller">Vendor:</label>
86
                  <input type="text" id="bookseller" name="bookseller_filter" value="[% bookseller_filter | html %]" />
93
                  <input type="text" id="bookseller" name="bookseller_filter" value="[% bookseller_filter | html %]" />
Lines 338-344 Link Here
338
                                    [% IF ( routing && CAN_user_serials_routing ) %]
345
                                    [% IF ( routing && CAN_user_serials_routing ) %]
339
                                        [% UNLESS ( subscription.cannotedit ) %]
346
                                        [% UNLESS ( subscription.cannotedit ) %]
340
                                            <li>
347
                                            <li>
341
                                                <a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=reopen&amp;routing=[% subscription.routing %]&amp;searched=1&amp;title_filter=[% title_filter | uri %]&amp;ISSN_filter=[% ISSN_filter | uri %]&amp;EAN_filter=[% EAN_filter | uri %]&amp;published_filter=[% publisher_filter | uri %]&amp;bookseller_filter=[% bookseller_filter | uri %]&amp;branch_filter=[% branch_filter | uri %]" id="reopensub"> <i class="fa fa-repeat"></i> Reopen</a>
348
                                                <a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=reopen&amp;routing=[% subscription.routing %]&amp;searched=1&amp;title_filter=[% title_filter | uri %]&amp;ISSN_filter=[% ISSN_filter | uri %]&amp;EAN_filter=[% EAN_filter | uri %]&amp;published_filter=[% publisher_filter | uri %]&amp;barcode_filter=[% barcode_filter | uri %]&amp;bookseller_filter=[% bookseller_filter | uri %]&amp;branch_filter=[% branch_filter | uri %]" id="reopensub"> <i class="fa fa-repeat"></i> Reopen</a>
342
                                            </li>
349
                                            </li>
343
                                        [% END %]
350
                                        [% END %]
344
                                    [% END # IF ( routing && CAN_user_serials_routing ) %]
351
                                    [% END # IF ( routing && CAN_user_serials_routing ) %]
Lines 401-406 Link Here
401
                  <label for="publisher">Publisher:</label>
408
                  <label for="publisher">Publisher:</label>
402
                  <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter | html %]" />
409
                  <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter | html %]" />
403
                </li>
410
                </li>
411
412
                 <li>
413
                  <label for="barcode">Vendor:</label>
414
                  <input type="text" id="barcode" name="barcode_filter" value="[% barcode_filter | html %]" />
415
                </li>
416
417
404
                <li>
418
                <li>
405
                  <label for="bookseller">Vendor:</label>
419
                  <label for="bookseller">Vendor:</label>
406
                  <input type="text" id="bookseller" name="bookseller_filter" value="[% bookseller_filter | html %]" />
420
                  <input type="text" id="bookseller" name="bookseller_filter" value="[% bookseller_filter | html %]" />
(-)a/serials/serials-search.pl (-1 / +3 lines)
Lines 46-51 my $ISSN = $query->param('ISSN_filter') || ''; Link Here
46
my $EAN           = $query->param('EAN_filter') || '';
46
my $EAN           = $query->param('EAN_filter') || '';
47
my $callnumber    = $query->param('callnumber_filter') || '';
47
my $callnumber    = $query->param('callnumber_filter') || '';
48
my $publisher     = $query->param('publisher_filter') || '';
48
my $publisher     = $query->param('publisher_filter') || '';
49
my $barcode       = $query->param('barcode_filter') || '';
49
my $bookseller    = $query->param('bookseller_filter') || '';
50
my $bookseller    = $query->param('bookseller_filter') || '';
50
my $biblionumber  = $query->param('biblionumber') || '';
51
my $biblionumber  = $query->param('biblionumber') || '';
51
my $branch        = $query->param('branch_filter') || '';
52
my $branch        = $query->param('branch_filter') || '';
Lines 104-109 if ($searched){ Link Here
104
            ean          => $EAN,
105
            ean          => $EAN,
105
            callnumber   => $callnumber,
106
            callnumber   => $callnumber,
106
            publisher    => $publisher,
107
            publisher    => $publisher,
108
            barcode      => $barcode,
107
            bookseller   => $bookseller,
109
            bookseller   => $bookseller,
108
            branch       => $branch,
110
            branch       => $branch,
109
            additional_fields => [ map{ { name => $_, value => $additional_field_filters->{$_}{value}, authorised_value_category => $additional_field_filters->{$_}{authorised_value_category} } } keys %$additional_field_filters ],
111
            additional_fields => [ map{ { name => $_, value => $additional_field_filters->{$_}{value}, authorised_value_category => $additional_field_filters->{$_}{authorised_value_category} } } keys %$additional_field_filters ],
Lines 153-158 $template->param( Link Here
153
    EAN_filter    => $EAN,
155
    EAN_filter    => $EAN,
154
    callnumber_filter => $callnumber,
156
    callnumber_filter => $callnumber,
155
    publisher_filter => $publisher,
157
    publisher_filter => $publisher,
158
    barcode_filter => $barcode,
156
    bookseller_filter  => $bookseller,
159
    bookseller_filter  => $bookseller,
157
    branch_filter => $branch,
160
    branch_filter => $branch,
158
    locations     => C4::Koha::GetAuthorisedValues('LOC', $location),
161
    locations     => C4::Koha::GetAuthorisedValues('LOC', $location),
159
- 

Return to bug 14875