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

(-)a/C4/Acquisition.pm (-9 / +17 lines)
Lines 1268-1274 C<@results> is an array of references-to-hash with the following keys: Link Here
1268
1268
1269
sub SearchOrder {
1269
sub SearchOrder {
1270
#### -------- SearchOrder-------------------------------
1270
#### -------- SearchOrder-------------------------------
1271
    my ($ordernumber, $search, $supplierid, $basket) = @_;
1271
    my ( $ordernumber, $search, $ean, $supplierid, $basket ) = @_;
1272
1272
1273
    my $dbh = C4::Context->dbh;
1273
    my $dbh = C4::Context->dbh;
1274
    my @args = ();
1274
    my @args = ();
Lines 1288-1294 sub SearchOrder { Link Here
1288
        $query .= " AND (biblio.title like ? OR biblio.author LIKE ? OR biblioitems.isbn like ?)";
1288
        $query .= " AND (biblio.title like ? OR biblio.author LIKE ? OR biblioitems.isbn like ?)";
1289
        push @args, ("%$search%","%$search%","%$search%");
1289
        push @args, ("%$search%","%$search%","%$search%");
1290
    }
1290
    }
1291
    if($supplierid){
1291
    if ($ean) {
1292
        $query .= " AND biblioitems.ean = ?";
1293
        push @args, $ean;
1294
    }
1295
    if ($supplierid) {
1292
        $query .= "AND aqbasket.booksellerid = ?";
1296
        $query .= "AND aqbasket.booksellerid = ?";
1293
        push @args, $supplierid;
1297
        push @args, $supplierid;
1294
    }
1298
    }
Lines 1668-1679 sub GetHistory { Link Here
1668
    my $title = $params{title};
1672
    my $title = $params{title};
1669
    my $author = $params{author};
1673
    my $author = $params{author};
1670
    my $isbn   = $params{isbn};
1674
    my $isbn   = $params{isbn};
1675
    my $ean    = $params{ean};
1671
    my $name = $params{name};
1676
    my $name = $params{name};
1672
    my $from_placed_on = $params{from_placed_on};
1677
    my $from_placed_on = $params{from_placed_on};
1673
    my $to_placed_on = $params{to_placed_on};
1678
    my $to_placed_on = $params{to_placed_on};
1674
    my $basket = $params{basket};
1679
    my $basket = $params{basket};
1675
    my $booksellerinvoicenumber = $params{booksellerinvoicenumber};
1680
    my $booksellerinvoicenumber = $params{booksellerinvoicenumber};
1676
1677
    my @order_loop;
1681
    my @order_loop;
1678
    my $total_qty         = 0;
1682
    my $total_qty         = 0;
1679
    my $total_qtyreceived = 0;
1683
    my $total_qtyreceived = 0;
Lines 1685-1696 sub GetHistory { Link Here
1685
            biblio.title,
1689
            biblio.title,
1686
            biblio.author,
1690
            biblio.author,
1687
	    biblioitems.isbn,
1691
	    biblioitems.isbn,
1692
	    biblioitems.ean,
1688
            aqorders.basketno,
1693
            aqorders.basketno,
1689
    aqbasket.basketname,
1694
            aqbasket.basketname,
1690
    aqbasket.basketgroupid,
1695
            aqbasket.basketgroupid,
1691
    aqbasketgroups.name as groupname,
1696
            aqbasketgroups.name as groupname,
1692
            aqbooksellers.name,
1697
            aqbooksellers.name,
1693
    aqbasket.creationdate,
1698
            aqbasket.creationdate,
1694
            aqorders.datereceived,
1699
            aqorders.datereceived,
1695
            aqorders.quantity,
1700
            aqorders.quantity,
1696
            aqorders.quantityreceived,
1701
            aqorders.quantityreceived,
Lines 1701-1707 sub GetHistory { Link Here
1701
            aqorders.biblionumber
1706
            aqorders.biblionumber
1702
        FROM aqorders
1707
        FROM aqorders
1703
        LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
1708
        LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
1704
    LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id
1709
        LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id
1705
        LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
1710
        LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
1706
	LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber
1711
	LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber
1707
        LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber";
1712
        LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber";
Lines 1728-1734 sub GetHistory { Link Here
1728
        $query .= " AND biblioitems.isbn LIKE ? ";
1733
        $query .= " AND biblioitems.isbn LIKE ? ";
1729
        push @query_params, "%$isbn%";
1734
        push @query_params, "%$isbn%";
1730
    }
1735
    }
1731
1736
    if ( defined $ean and $ean ) {
1737
        $query .= " AND biblioitems.ean = ? ";
1738
        push @query_params, "$ean";
1739
    }
1732
    if ( $name ) {
1740
    if ( $name ) {
1733
        $query .= " AND aqbooksellers.name LIKE ? ";
1741
        $query .= " AND aqbooksellers.name LIKE ? ";
1734
        push @query_params, "%$name%";
1742
        push @query_params, "%$name%";
(-)a/C4/Biblio.pm (-3 / +6 lines)
Lines 3316-3322 sub _koha_modify_biblioitem_nonmarc { Link Here
3316
        cn_item         = ?,
3316
        cn_item         = ?,
3317
        cn_suffix       = ?,
3317
        cn_suffix       = ?,
3318
        cn_sort         = ?,
3318
        cn_sort         = ?,
3319
        totalissues     = ?
3319
        totalissues     = ?,
3320
	ean             = ?
3320
        where biblioitemnumber = ?
3321
        where biblioitemnumber = ?
3321
        ";
3322
        ";
3322
    my $sth = $dbh->prepare($query);
3323
    my $sth = $dbh->prepare($query);
Lines 3328-3333 sub _koha_modify_biblioitem_nonmarc { Link Here
3328
        $biblioitem->{'pages'},            $biblioitem->{'bnotes'},           $biblioitem->{'size'},                  $biblioitem->{'place'},
3329
        $biblioitem->{'pages'},            $biblioitem->{'bnotes'},           $biblioitem->{'size'},                  $biblioitem->{'place'},
3329
        $biblioitem->{'lccn'},             $biblioitem->{'url'},              $biblioitem->{'biblioitems.cn_source'}, $biblioitem->{'cn_class'},
3330
        $biblioitem->{'lccn'},             $biblioitem->{'url'},              $biblioitem->{'biblioitems.cn_source'}, $biblioitem->{'cn_class'},
3330
        $biblioitem->{'cn_item'},          $biblioitem->{'cn_suffix'},        $cn_sort,                               $biblioitem->{'totalissues'},
3331
        $biblioitem->{'cn_item'},          $biblioitem->{'cn_suffix'},        $cn_sort,                               $biblioitem->{'totalissues'},
3332
	$biblioitem->{'ean'},
3331
        $biblioitem->{'biblioitemnumber'}
3333
        $biblioitem->{'biblioitemnumber'}
3332
    );
3334
    );
3333
    if ( $dbh->errstr ) {
3335
    if ( $dbh->errstr ) {
Lines 3379-3385 sub _koha_add_biblioitem { Link Here
3379
        cn_item         = ?,
3381
        cn_item         = ?,
3380
        cn_suffix       = ?,
3382
        cn_suffix       = ?,
3381
        cn_sort         = ?,
3383
        cn_sort         = ?,
3382
        totalissues     = ?
3384
        totalissues     = ?,
3385
	ean             = ?
3383
        ";
3386
        ";
3384
    my $sth = $dbh->prepare($query);
3387
    my $sth = $dbh->prepare($query);
3385
    $sth->execute(
3388
    $sth->execute(
Lines 3390-3396 sub _koha_add_biblioitem { Link Here
3390
        $biblioitem->{'pages'},            $biblioitem->{'bnotes'},           $biblioitem->{'size'},                  $biblioitem->{'place'},
3393
        $biblioitem->{'pages'},            $biblioitem->{'bnotes'},           $biblioitem->{'size'},                  $biblioitem->{'place'},
3391
        $biblioitem->{'lccn'},             $biblioitem->{'marc'},             $biblioitem->{'url'},                   $biblioitem->{'biblioitems.cn_source'},
3394
        $biblioitem->{'lccn'},             $biblioitem->{'marc'},             $biblioitem->{'url'},                   $biblioitem->{'biblioitems.cn_source'},
3392
        $biblioitem->{'cn_class'},         $biblioitem->{'cn_item'},          $biblioitem->{'cn_suffix'},             $cn_sort,
3395
        $biblioitem->{'cn_class'},         $biblioitem->{'cn_item'},          $biblioitem->{'cn_suffix'},             $cn_sort,
3393
        $biblioitem->{'totalissues'}
3396
        $biblioitem->{'totalissues'},      $biblioitem->{'ean'}
3394
    );
3397
    );
3395
    my $bibitemnum = $dbh->{'mysql_insertid'};
3398
    my $bibitemnum = $dbh->{'mysql_insertid'};
3396
3399
(-)a/C4/Serials.pm (-3 / +17 lines)
Lines 545-559 sub GetFullSubscriptionsFromBiblionumber { Link Here
545
545
546
=head2 GetSubscriptions
546
=head2 GetSubscriptions
547
547
548
@results = GetSubscriptions($title,$ISSN,$biblionumber);
548
@results = GetSubscriptions($title,$ISSN,$ean,$biblionumber);
549
this function gets all subscriptions which have title like $title,ISSN like $ISSN and biblionumber like $biblionumber.
549
this function gets all subscriptions which have title like $title,ISSN like $ISSN,EAN like $ean and biblionumber like $biblionumber.
550
return:
550
return:
551
a table of hashref. Each hash containt the subscription.
551
a table of hashref. Each hash containt the subscription.
552
552
553
=cut
553
=cut
554
554
555
sub GetSubscriptions {
555
sub GetSubscriptions {
556
    my ( $string, $issn, $biblionumber ) = @_;
556
    my ( $string, $issn, $ean, $biblionumber ) = @_;
557
557
558
    #return unless $title or $ISSN or $biblionumber;
558
    #return unless $title or $ISSN or $biblionumber;
559
    my $dbh = C4::Context->dbh;
559
    my $dbh = C4::Context->dbh;
Lines 597-602 sub GetSubscriptions { Link Here
597
        }
597
        }
598
        $sqlwhere .= ( $sqlwhere ? " AND " : " WHERE " ) . "((" . join( ") OR (", @sqlstrings ) . "))";
598
        $sqlwhere .= ( $sqlwhere ? " AND " : " WHERE " ) . "((" . join( ") OR (", @sqlstrings ) . "))";
599
    }
599
    }
600
    if ($ean) {
601
        my @sqlstrings;
602
        my @strings_to_search;
603
        @strings_to_search = map { "$_" } split( / /, $ean );
604
        foreach my $index qw(biblioitems.ean) {
605
            push @bind_params, @strings_to_search;
606
            my $tmpstring = "OR $index = ? " x scalar(@strings_to_search);
607
            $debug && warn "$tmpstring";
608
            $tmpstring =~ s/^OR //;
609
            push @sqlstrings, $tmpstring;
610
        }
611
        $sqlwhere .= ( $sqlwhere ? " AND " : " WHERE " ) . "((" . join( ") OR (", @sqlstrings ) . "))";
612
    }
613
600
    $sql .= "$sqlwhere ORDER BY title";
614
    $sql .= "$sqlwhere ORDER BY title";
601
    $debug and warn "GetSubscriptions query: $sql params : ", join( " ", @bind_params );
615
    $debug and warn "GetSubscriptions query: $sql params : ", join( " ", @bind_params );
602
    $sth = $dbh->prepare($sql);
616
    $sth = $dbh->prepare($sql);
(-)a/acqui/addorder.pl (+1 lines)
Lines 202-207 if ( $orderinfo->{quantity} ne '0' ) { Link Here
202
                "biblio.author"               => $$orderinfo{author}          ? $$orderinfo{author}        : "",
202
                "biblio.author"               => $$orderinfo{author}          ? $$orderinfo{author}        : "",
203
                "biblio.seriestitle"          => $$orderinfo{series}          ? $$orderinfo{series}        : "",
203
                "biblio.seriestitle"          => $$orderinfo{series}          ? $$orderinfo{series}        : "",
204
                "biblioitems.isbn"            => $$orderinfo{isbn}            ? $$orderinfo{isbn}          : "",
204
                "biblioitems.isbn"            => $$orderinfo{isbn}            ? $$orderinfo{isbn}          : "",
205
                "biblioitems.ean"             => $$orderinfo{ean}             ? $$orderinfo{ean}           : "",
205
                "biblioitems.publishercode"   => $$orderinfo{publishercode}   ? $$orderinfo{publishercode} : "",
206
                "biblioitems.publishercode"   => $$orderinfo{publishercode}   ? $$orderinfo{publishercode} : "",
206
                "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
207
                "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
207
                "biblio.copyrightdate"        => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
208
                "biblio.copyrightdate"        => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
(-)a/acqui/histsearch.pl (-1 / +5 lines)
Lines 63-68 my $title = $input->param( 'title'); Link Here
63
my $author                  = $input->param('author');
63
my $author                  = $input->param('author');
64
my $isbn                    = $input->param('isbn');
64
my $isbn                    = $input->param('isbn');
65
my $name                    = $input->param( 'name' );
65
my $name                    = $input->param( 'name' );
66
my $ean                     = $input->param('ean');
66
my $basket                  = $input->param( 'basket' );
67
my $basket                  = $input->param( 'basket' );
67
my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' );
68
my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' );
68
my $do_search               = $input->param('do_search') || 0;
69
my $do_search               = $input->param('do_search') || 0;
Lines 101-106 if ($do_search) { Link Here
101
        title => $title,
102
        title => $title,
102
        author => $author,
103
        author => $author,
103
        isbn   => $isbn,
104
        isbn   => $isbn,
105
        ean   => $ean,
104
        name => $name,
106
        name => $name,
105
        from_placed_on => $from_iso,
107
        from_placed_on => $from_iso,
106
        to_placed_on => $to_iso,
108
        to_placed_on => $to_iso,
Lines 120-126 $template->param( Link Here
120
    numresults              => $order_loop ? scalar(@$order_loop) : undef,
122
    numresults              => $order_loop ? scalar(@$order_loop) : undef,
121
    title                   => $title,
123
    title                   => $title,
122
    author                  => $author,
124
    author                  => $author,
123
    isbn                    => $isbn,
125
    isbn		    => $isbn,
126
    ean                     => $ean,
124
    name                    => $name,
127
    name                    => $name,
125
    basket                  => $basket,
128
    basket                  => $basket,
126
    booksellerinvoicenumber => $booksellerinvoicenumber,
129
    booksellerinvoicenumber => $booksellerinvoicenumber,
Lines 129-134 $template->param( Link Here
129
    DHTMLcalendar_dateformat=> C4::Dates->DHTMLcalendar(),
132
    DHTMLcalendar_dateformat=> C4::Dates->DHTMLcalendar(),
130
    dateformat              => C4::Dates->new()->format(),
133
    dateformat              => C4::Dates->new()->format(),
131
    debug                   => $debug || $input->param('debug') || 0,
134
    debug                   => $debug || $input->param('debug') || 0,
135
    uc(C4::Context->preference("marcflavour")) => 1
132
);
136
);
133
137
134
output_html_with_http_headers $input, $cookie, $template->output;
138
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/acqui/neworderempty.pl (+3 lines)
Lines 372-377 $template->param( Link Here
372
    editionstatement => $data->{'editionstatement'},
372
    editionstatement => $data->{'editionstatement'},
373
    budget_loop      => $budget_loop,
373
    budget_loop      => $budget_loop,
374
    isbn             => $data->{'isbn'},
374
    isbn             => $data->{'isbn'},
375
    ean              => $data->{'ean'},
375
    seriestitle      => $data->{'seriestitle'},
376
    seriestitle      => $data->{'seriestitle'},
376
    itemtypeloop     => \@itemtypes,
377
    itemtypeloop     => \@itemtypes,
377
    quantity         => $data->{'quantity'},
378
    quantity         => $data->{'quantity'},
Lines 390-395 $template->param( Link Here
390
# CHECKME: gst-stuff needs verifing, mason.
391
# CHECKME: gst-stuff needs verifing, mason.
391
    gstrate          => $bookseller->{'gstrate'} // C4::Context->preference("gist") // 0,
392
    gstrate          => $bookseller->{'gstrate'} // C4::Context->preference("gist") // 0,
392
    gstreg           => $bookseller->{'gstreg'},
393
    gstreg           => $bookseller->{'gstreg'},
394
    (uc(C4::Context->preference("marcflavour"))) => 1
393
);
395
);
394
396
395
output_html_with_http_headers $input, $cookie, $template->output;
397
output_html_with_http_headers $input, $cookie, $template->output;
Lines 521-526 sub Load_Duplicate { Link Here
521
    booksellerid        => $basket->{'booksellerid'},
523
    booksellerid        => $basket->{'booksellerid'},
522
    breedingid          => $params->{'breedingid'},
524
    breedingid          => $params->{'breedingid'},
523
    duplicatetitle      => $duplicatetitle,
525
    duplicatetitle      => $duplicatetitle,
526
    (uc(C4::Context->preference("marcflavour"))) => 1
524
  );
527
  );
525
528
526
  output_html_with_http_headers $input, $cookie, $template->output;
529
  output_html_with_http_headers $input, $cookie, $template->output;
(-)a/acqui/parcel.pl (-4 / +6 lines)
Lines 101-114 if($input->param('format') eq "json"){ Link Here
101
    });
101
    });
102
       
102
       
103
    my @datas;
103
    my @datas;
104
    my $search   = $input->param('search') || '';
104
    my $search   = $input->param('search')     || '';
105
    my $ean      = $input->param('ean')        || '';
105
    my $supplier = $input->param('booksellerid') || '';
106
    my $supplier = $input->param('booksellerid') || '';
106
    my $basketno = $input->param('basketno') || '';
107
    my $basketno = $input->param('basketno') || '';
107
    my $orderno  = $input->param('orderno') || '';
108
    my $orderno  = $input->param('orderno') || '';
108
109
109
    my $orders = SearchOrder($orderno, $search, $supplier, $basketno);
110
    my $orders = SearchOrder($orderno, $search, $ean, $supplier, $basketno);
110
    foreach my $order (@$orders){
111
    foreach my $order (@$orders) {
111
        if($order->{quantityreceived} < $order->{quantity}){
112
        if ( $order->{quantityreceived} < $order->{quantity} ) {
112
            my $data = {};
113
            my $data = {};
113
            
114
            
114
            $data->{basketno} = $order->{basketno};
115
            $data->{basketno} = $order->{basketno};
Lines 322-327 $template->param( Link Here
322
    totalPqtyrcvd         => $totalPqtyrcvd,
323
    totalPqtyrcvd         => $totalPqtyrcvd,
323
    totalPecost           => sprintf("%.2f", $totalPecost),
324
    totalPecost           => sprintf("%.2f", $totalPecost),
324
    resultsperpage        => $resultsperpage,
325
    resultsperpage        => $resultsperpage,
326
    (uc(C4::Context->preference("marcflavour"))) => 1
325
);
327
);
326
output_html_with_http_headers $input, $cookie, $template->output;
328
output_html_with_http_headers $input, $cookie, $template->output;
327
 
329
 
(-)a/catalogue/detail.pl (-1 / +1 lines)
Lines 142-148 my ( $holdcount, $holds ) = GetReservesFromBiblionumber($biblionumber,1); Link Here
142
142
143
#coping with subscriptions
143
#coping with subscriptions
144
my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
144
my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
145
my @subscriptions       = GetSubscriptions( $dat->{title}, $dat->{issn}, $biblionumber );
145
my @subscriptions       = GetSubscriptions( $dat->{title}, $dat->{issn}, undef, $biblionumber );
146
my @subs;
146
my @subs;
147
147
148
foreach my $subscription (@subscriptions) {
148
foreach my $subscription (@subscriptions) {
(-)a/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql (+2 lines)
Lines 166-171 INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeat Link Here
166
		('022', 'Government Publication Number', 'Government Publication Number', 0, 0, '', ''),
166
		('022', 'Government Publication Number', 'Government Publication Number', 0, 0, '', ''),
167
		('040', 'CODEN (Serials)', 'CODEN (Serials)', 0, 0, '', ''),
167
		('040', 'CODEN (Serials)', 'CODEN (Serials)', 0, 0, '', ''),
168
		('071', 'Publisher\'s Number (Sound Recordings and Music)', '', 0, 0, '', ''),
168
		('071', 'Publisher\'s Number (Sound Recordings and Music)', '', 0, 0, '', ''),
169
		('073', 'EAN', 'EAN', 1, 0, '', ''),
169
		('100', 'General Processing Data', 'General Processing Data', 1, 0, '', ''),
170
		('100', 'General Processing Data', 'General Processing Data', 1, 0, '', ''),
170
		('101', 'Language of the Item', 'Language of the Item', 1, 0, '', ''),
171
		('101', 'Language of the Item', 'Language of the Item', 1, 0, '', ''),
171
		('102', 'Country of Publication or Production', 'Country of Publication or Production', 0, 0, '', ''),
172
		('102', 'Country of Publication or Production', 'Country of Publication or Production', 0, 0, '', ''),
Lines 356-361 INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` Link Here
356
		('040', 'z', 'Erroneous CODEN', 'Erroneous CODEN', 1, 0, '', 0, '', '', '', 0, -5, '', '', '', NULL),
357
		('040', 'z', 'Erroneous CODEN', 'Erroneous CODEN', 1, 0, '', 0, '', '', '', 0, -5, '', '', '', NULL),
357
		('071', 'a', 'Publisher\'s Number (Sound Recordings and Music)', 'Publisher\'s Number (Sound Recordings and Music)', 0, 0, '', 0, '', '', '', 0, -5, '', '', '', NULL),
358
		('071', 'a', 'Publisher\'s Number (Sound Recordings and Music)', 'Publisher\'s Number (Sound Recordings and Music)', 0, 0, '', 0, '', '', '', 0, -5, '', '', '', NULL),
358
		('071', 'b', 'Source', 'Source', 0, 0, '', 0, '', '', '', 0, -5, '', '', '', NULL),
359
		('071', 'b', 'Source', 'Source', 0, 0, '', 0, '', '', '', 0, -5, '', '', '', NULL),
360
		('073', 'a', 'EAN', 'EAN', 0, 0, 'biblioitems.ean', 0, '', '', '', 0, 0, '', '', '', NULL),
359
		('100', 'a', 'General Processing Data', 'General Processing Data', 0, 0, '', 1, '', '', 'unimarc_field_100.pl', 0, 0, '', '', '', NULL),
361
		('100', 'a', 'General Processing Data', 'General Processing Data', 0, 0, '', 1, '', '', 'unimarc_field_100.pl', 0, 0, '', '', '', NULL),
360
		('101', 'a', 'Language of the Text, Soundtrack, etc.', 'Language of the Text, Soundtrack, etc.', 1, 0, '', 1, 'LAN', '', '', 0, 0, '', '', '', NULL),
362
		('101', 'a', 'Language of the Text, Soundtrack, etc.', 'Language of the Text, Soundtrack, etc.', 1, 0, '', 1, 'LAN', '', '', 0, 0, '', '', '', NULL),
361
		('101', 'b', 'Language of Intermediate Text when Item is Not Translated from Original', 'Language of Intermediate Text when Item is Not Translated from Original', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL),
363
		('101', 'b', 'Language of Intermediate Text when Item is Not Translated from Original', 'Language of Intermediate Text when Item is Not Translated from Original', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL),
(-)a/installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/framework_DEFAULT.sql (-2 / +2 lines)
Lines 318-324 INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` Link Here
318
('072', 'c', 'Numéro additionnels suivant le code normalisé', '', 0, 0, '', 0, '', '', '', 0, 0, '', NULL, '', ''),
318
('072', 'c', 'Numéro additionnels suivant le code normalisé', '', 0, 0, '', 0, '', '', '', 0, 0, '', NULL, '', ''),
319
('072', 'd', 'Mention de disponibilité et/ou de prix', '', 0, 0, '', 0, '', '', '', 0, 0, '', NULL, '', ''),
319
('072', 'd', 'Mention de disponibilité et/ou de prix', '', 0, 0, '', 0, '', '', '', 0, 0, '', NULL, '', ''),
320
('072', 'z', 'Numéro ou code erroné', '', 0, 0, '', 0, '', '', '', 0, 0, '', NULL, '', ''),
320
('072', 'z', 'Numéro ou code erroné', '', 0, 0, '', 0, '', '', '', 0, 0, '', NULL, '', ''),
321
('073', 'a', 'Numéro', '', 0, 0, '', 0, '', '', '', NULL, 0, '', '', NULL, ''),
321
('073', 'a', 'Numéro', '', 0, 0, 'biblioitems.ean', 0, '', '', '', NULL, 0, '', '', NULL, ''),
322
('073', 'b', 'Qualificatif', '', 0, 0, '', 0, '', '', '', NULL, 0, '', '', NULL, ''),
322
('073', 'b', 'Qualificatif', '', 0, 0, '', 0, '', '', '', NULL, 0, '', '', NULL, ''),
323
('073', 'c', 'Numéros additionnels', '', 0, 0, '', 0, '', '', '', NULL, 0, '', '', NULL, ''),
323
('073', 'c', 'Numéros additionnels', '', 0, 0, '', 0, '', '', '', NULL, 0, '', '', NULL, ''),
324
('073', 'd', 'Prix et disponibilité', '', 0, 0, '', 0, '', '', '', NULL, 0, '', '', NULL, ''),
324
('073', 'd', 'Prix et disponibilité', '', 0, 0, '', 0, '', '', '', NULL, 0, '', '', NULL, ''),
Lines 2034-2037 INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` Link Here
2034
('995', 'u', 'note', '', 0, 0, 'items.itemnotes', 10, '', '', '', NULL, 0, '', NULL, NULL, '');
2034
('995', 'u', 'note', '', 0, 0, 'items.itemnotes', 10, '', '', '', NULL, 0, '', NULL, NULL, '');
2035
2035
2036
UPDATE `marc_subfield_structure` SET maxlength=24 WHERE tagfield='000';
2036
UPDATE `marc_subfield_structure` SET maxlength=24 WHERE tagfield='000';
2037
UPDATE `marc_subfield_structure` SET maxlength=36 WHERE tagfield='100';
2037
UPDATE `marc_subfield_structure` SET maxlength=36 WHERE tagfield='100';
(-)a/installer/data/mysql/kohastructure.sql (+2 lines)
Lines 154-159 CREATE TABLE `biblioitems` ( -- information related to bibliographic records in Link Here
154
  `itemtype` varchar(10) default NULL, -- biblio level item type (MARC21 942$c)
154
  `itemtype` varchar(10) default NULL, -- biblio level item type (MARC21 942$c)
155
  `isbn` varchar(30) default NULL, -- ISBN (MARC21 020$a)
155
  `isbn` varchar(30) default NULL, -- ISBN (MARC21 020$a)
156
  `issn` varchar(9) default NULL, -- ISSN (MARC21 022$a)
156
  `issn` varchar(9) default NULL, -- ISSN (MARC21 022$a)
157
  `ean` varchar(13) default NULL,
157
  `publicationyear` text,
158
  `publicationyear` text,
158
  `publishercode` varchar(255) default NULL, -- publisher (MARC21 260$b)
159
  `publishercode` varchar(255) default NULL, -- publisher (MARC21 260$b)
159
  `volumedate` date default NULL,
160
  `volumedate` date default NULL,
Lines 625-630 CREATE TABLE `deletedbiblioitems` ( -- information about bibliographic records t Link Here
625
  `itemtype` varchar(10) default NULL, -- biblio level item type (MARC21 942$c)
626
  `itemtype` varchar(10) default NULL, -- biblio level item type (MARC21 942$c)
626
  `isbn` varchar(30) default NULL, -- ISBN (MARC21 020$a)
627
  `isbn` varchar(30) default NULL, -- ISBN (MARC21 020$a)
627
  `issn` varchar(9) default NULL, -- ISSN (MARC21 022$a)
628
  `issn` varchar(9) default NULL, -- ISSN (MARC21 022$a)
629
  `ean` varchar(13) default NULL,
628
  `publicationyear` text,
630
  `publicationyear` text,
629
  `publishercode` varchar(255) default NULL, -- publisher (MARC21 260$b)
631
  `publishercode` varchar(255) default NULL, -- publisher (MARC21 260$b)
630
  `volumedate` date default NULL,
632
  `volumedate` date default NULL,
(-)a/installer/data/mysql/updatedatabase.pl (+16 lines)
Lines 5247-5252 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
5247
    SetVersion($DBversion);
5247
    SetVersion($DBversion);
5248
}
5248
}
5249
5249
5250
<<<<<<< HEAD
5250
$DBversion = "3.09.00.005";
5251
$DBversion = "3.09.00.005";
5251
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5252
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5252
    unless (TableExists('quotes')) {
5253
    unless (TableExists('quotes')) {
Lines 5308-5313 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
5308
    SetVersion ($DBversion);
5309
    SetVersion ($DBversion);
5309
}
5310
}
5310
5311
5312
5313
$DBversion = "3.09.00.XXX";
5314
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5315
    $dbh->do("ALTER TABLE `biblioitems` ADD `ean` VARCHAR( 13 ) NULL AFTER issn");
5316
    $dbh->do("CREATE INDEX `ean` ON biblioitems (`ean`) ");
5317
    $dbh->do("ALTER TABLE `deletedbiblioitems` ADD `ean` VARCHAR( 13 ) NULL AFTER issn");
5318
    if (C4::Context->preference("marcflavour") eq 'UNIMARC') {
5319
         $dbh->do("UPDATE marc_subfield_structure SET kohafield='biblioitems.ean' WHERE tagfield='073' and tagsubfield='a'");
5320
    }
5321
    print "Upgrade to $DBversion done (Adding ean in biblioitems and deletedbiblioitems)\n";
5322
    print "If you have records with ean, please run misc/batchRebuildBiblioTables.pl to populate bibliotems.ean\n" if (C4::Context->preference("marcflavour") eq 'UNIMARC');
5323
5324
    SetVersion($DBversion);
5325
}
5326
5311
=head1 FUNCTIONS
5327
=head1 FUNCTIONS
5312
5328
5313
=head2 TableExists($table)
5329
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc (-2 / +11 lines)
Lines 3-10 Link Here
3
<div id="header_search">
3
<div id="header_search">
4
	<div id="subscription_search" class="residentsearch">
4
	<div id="subscription_search" class="residentsearch">
5
    <p class="tip">Search subscriptions:</p>
5
    <p class="tip">Search subscriptions:</p>
6
 <form action="/cgi-bin/koha/serials/serials-home.pl" method="get">[% IF ( routing ) %]<input type="hidden" name="routing" value="[% routing %]" />[% END %]<input type="hidden" name="searched" value="1" /> <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter %]" /> <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter %]" /><input type="submit" value="Search" class="submit" />
6
 <form action="/cgi-bin/koha/serials/serials-home.pl" method="get">
7
</form>
7
 [% IF ( routing ) %]<input type="hidden" name="routing" value="[% routing %]" />[% END %]
8
 <input type="hidden" name="searched" value="1" /> 
9
 <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter %]" />
10
11
 [% IF (UNIMARC) %]
12
 <label for="EAN_filter">EAN:</label> <input type="text" size="20" maxlength="40" name="EAN_filter" id="EAN_filter" value="[% EAN_filter %]" />
13
 [% END %]
14
 <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter %]" />
15
 <input type="submit" value="Search" class="submit" />
16
 </form>
8
	</div>
17
	</div>
9
    [% INCLUDE 'patron-search-box.inc' %]
18
    [% INCLUDE 'patron-search-box.inc' %]
10
	[% IF ( CAN_user_catalogue ) %]
19
	[% IF ( CAN_user_catalogue ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (+3 lines)
Lines 36-41 Link Here
36
		<li><label for="title">Title: </label> <input type="text" name="title" id="title" value="[% title %]" /></li>
36
		<li><label for="title">Title: </label> <input type="text" name="title" id="title" value="[% title %]" /></li>
37
		<li><label for="author">Author: </label> <input type="text" name="author" id="author" value="[% author %]" /></li>
37
		<li><label for="author">Author: </label> <input type="text" name="author" id="author" value="[% author %]" /></li>
38
		<li><label for="isbn">ISBN: </label> <input type="isbn" name="isbn" id="isbn" value="[% isbn %]" /></li>
38
		<li><label for="isbn">ISBN: </label> <input type="isbn" name="isbn" id="isbn" value="[% isbn %]" /></li>
39
                [% IF (UNIMARC) %]
40
		<li><label for="ean">EAN: </label> <input type="text" name="ean" id="ean" value="[% ean %]" /></li>
41
                [% END %]
39
		<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% name %]" /></li>
42
		<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% name %]" /></li>
40
		<li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% basket %]" /></li>
43
		<li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% basket %]" /></li>
41
        <li><label for="booksellerinvoicenumber ">Bookseller invoice no: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% booksellerinvoicenumber %]" /></li>
44
        <li><label for="booksellerinvoicenumber ">Bookseller invoice no: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% booksellerinvoicenumber %]" /></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (+11 lines)
Lines 289-294 $(document).ready(function() Link Here
289
                <input type="text" size="50" name="isbn" id="ISBN" value="[% isbn %]" />
289
                <input type="text" size="50" name="isbn" id="ISBN" value="[% isbn %]" />
290
            [% END %]
290
            [% END %]
291
        </li>
291
        </li>
292
        [% IF (UNIMARC) %]
293
        <li>
294
            [% IF ( biblionumber ) %]
295
            <span class="label">EAN: </span>
296
                <input type="hidden" size="20" name="ean" id="EAN" value="[% ean %]" />[% ean %]
297
            [% ELSE %]
298
            <label for="EAN">EAN: </label>
299
                <input type="text" size="20" name="ean" id="EAN" value="[% ean %]" />
300
            [% END %]
301
        </li>
302
        [% END %]
292
        <li>
303
        <li>
293
            [% IF ( biblionumber ) %]
304
            [% IF ( biblionumber ) %]
294
            <span class="label">Series: </span>
305
            <span class="label">Series: </span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-2 / +9 lines)
Lines 76-83 Link Here
76
    var summaryStatus = jQuery.trim($("#summaryfilter").val());
76
    var summaryStatus = jQuery.trim($("#summaryfilter").val());
77
	var basketStatus  = $("#basketfilter").val();
77
	var basketStatus  = $("#basketfilter").val();
78
	var orderStatus   = $("#orderfilter").val();
78
	var orderStatus   = $("#orderfilter").val();
79
	var eanStatus     = $("#eanfilter").val() || '';
79
80
80
	if (summaryStatus == '' && basketStatus == '' && orderStatus == '') { clearFilters(); return false; }
81
	if (summaryStatus == '' && basketStatus == '' && orderStatus == '' && eanStatus == '') { clearFilters(); return false; }
81
82
82
	var filtered = "table#pendingt tbody.filterclass tr";
83
	var filtered = "table#pendingt tbody.filterclass tr";
83
84
Lines 118-124 Link Here
118
			}catch(e){alert(e);}
119
			}catch(e){alert(e);}
119
		}
120
		}
120
	}
121
	}
121
	var transaction = YAHOO.util.Connect.asyncRequest('GET', '/cgi-bin/koha/acqui/parcel.pl?booksellerid=[% booksellerid %]&search='+summaryStatus+'&basketno='+basketStatus+'&orderno='+orderStatus+'&format=json', callback, null);
122
	var transaction = YAHOO.util.Connect.asyncRequest('GET', '/cgi-bin/koha/acqui/parcel.pl?booksellerid=[% booksellerid %]&search='+summaryStatus+'&basketno='+basketStatus+'&orderno='+orderStatus+'&ean='+eanStatus+'&format=json', callback, null);
122
123
123
	return false;
124
	return false;
124
    }
125
    }
Lines 423-428 Link Here
423
            <label for="orderfilter">Order line :</label>
424
            <label for="orderfilter">Order line :</label>
424
		    <input type="text" name="orderfilter" id="orderfilter" />
425
		    <input type="text" name="orderfilter" id="orderfilter" />
425
		</li>
426
		</li>
427
                [% IF (UNIMARC) %]
428
		<li>
429
		    <label for="eanfilter">EAN :</label>
430
		    <input type="text" name="eanfilter" id="eanfilter" />
431
		</li>
432
                [% END %]
426
	    </ol>
433
	    </ol>
427
		<fieldset class="action">
434
		<fieldset class="action">
428
		    <input type="submit" value="Filter" />
435
		    <input type="submit" value="Filter" />
(-)a/opac/opac-ISBDdetail.pl (-1 / +1 lines)
Lines 112-119 $template->param( Link Here
112
my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
112
my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
113
my $dbh = C4::Context->dbh;
113
my $dbh = C4::Context->dbh;
114
my $dat                 = TransformMarcToKoha( $dbh, $record );
114
my $dat                 = TransformMarcToKoha( $dbh, $record );
115
my @subscriptions       = GetSubscriptions( undef, undef, $biblionumber );
116
115
116
my @subscriptions       = GetSubscriptions( $dat->{title}, $dat->{issn}, undef, $biblionumber );
117
my @subs;
117
my @subs;
118
foreach my $subscription (@subscriptions) {
118
foreach my $subscription (@subscriptions) {
119
    my %cell;
119
    my %cell;
(-)a/opac/opac-detail.pl (-3 / +3 lines)
Lines 90-95 if($query->cookie("bib_list")){ Link Here
90
90
91
91
92
SetUTF8Flag($record);
92
SetUTF8Flag($record);
93
my $marcflavour      = C4::Context->preference("marcflavour");
94
my $ean = GetNormalizedEAN( $record, $marcflavour );
93
95
94
# XSLT processing of some stuff
96
# XSLT processing of some stuff
95
if (C4::Context->preference("OPACXSLTDetailsDisplay") ) {
97
if (C4::Context->preference("OPACXSLTDetailsDisplay") ) {
Lines 394-400 $template->param('OPACShowCheckoutName' => C4::Context->preference("OPACShowChec Link Here
394
my @all_items = GetItemsInfo( $biblionumber );
396
my @all_items = GetItemsInfo( $biblionumber );
395
397
396
# adding items linked via host biblios
398
# adding items linked via host biblios
397
my $marcflavour  = C4::Context->preference("marcflavour");
398
399
399
my $analyticfield = '773';
400
my $analyticfield = '773';
400
if ($marcflavour eq 'MARC21' || $marcflavour eq 'NORMARC'){
401
if ($marcflavour eq 'MARC21' || $marcflavour eq 'NORMARC'){
Lines 449-455 my $collections = GetKohaAuthorisedValues('items.ccode',$dat->{'frameworkcode'} Link Here
449
450
450
#coping with subscriptions
451
#coping with subscriptions
451
my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
452
my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
452
my @subscriptions       = GetSubscriptions( undef, undef, $biblionumber );
453
my @subscriptions       = GetSubscriptions($dat->{'title'}, $dat->{'issn'}, $ean, $biblionumber );
453
454
454
my @subs;
455
my @subs;
455
$dat->{'serial'}=1 if $subscriptionsnumber;
456
$dat->{'serial'}=1 if $subscriptionsnumber;
Lines 627-633 foreach ( keys %{$dat} ) { Link Here
627
# in each case, we're grabbing the first value we find in
628
# in each case, we're grabbing the first value we find in
628
# the record and normalizing it
629
# the record and normalizing it
629
my $upc = GetNormalizedUPC($record,$marcflavour);
630
my $upc = GetNormalizedUPC($record,$marcflavour);
630
my $ean = GetNormalizedEAN($record,$marcflavour);
631
my $oclc = GetNormalizedOCLCNumber($record,$marcflavour);
631
my $oclc = GetNormalizedOCLCNumber($record,$marcflavour);
632
my $isbn = GetNormalizedISBN(undef,$record,$marcflavour);
632
my $isbn = GetNormalizedISBN(undef,$record,$marcflavour);
633
my $content_identifier_exists;
633
my $content_identifier_exists;
(-)a/serials/checkexpiration.pl (+1 lines)
Lines 97-101 if ($date) { Link Here
97
}
97
}
98
$template->param (
98
$template->param (
99
    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
99
    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
100
    (uc(C4::Context->preference("marcflavour"))) => 1
100
);
101
);
101
output_html_with_http_headers $query, $cookie, $template->output;
102
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/serials/claims.pl (+1 lines)
Lines 100-104 $template->param( Link Here
100
        branchloop   => $branchloop,
100
        branchloop   => $branchloop,
101
        dateformat    => C4::Context->preference("dateformat"),
101
        dateformat    => C4::Context->preference("dateformat"),
102
    	DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
102
    	DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
103
        (uc(C4::Context->preference("marcflavour"))) => 1
103
        );
104
        );
104
output_html_with_http_headers $input, $cookie, $template->output;
105
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/serials/routing-preview.pl (+1 lines)
Lines 133-138 $template->param( Link Here
133
    routingnotes => $routingnotes,
133
    routingnotes => $routingnotes,
134
    generalroutingnote => C4::Context->preference('RoutingListNote'),
134
    generalroutingnote => C4::Context->preference('RoutingListNote'),
135
    hasRouting => check_routing($subscriptionid),
135
    hasRouting => check_routing($subscriptionid),
136
    (uc(C4::Context->preference("marcflavour"))) => 1
136
    );
137
    );
137
138
138
output_html_with_http_headers $query, $cookie, $template->output;
139
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/serials/routing.pl (+2 lines)
Lines 121-126 $template->param( Link Here
121
    dates => $dates,
121
    dates => $dates,
122
    routingnotes => $serials[0]->{'routingnotes'},
122
    routingnotes => $serials[0]->{'routingnotes'},
123
    hasRouting => check_routing($subscriptionid),
123
    hasRouting => check_routing($subscriptionid),
124
    (uc(C4::Context->preference("marcflavour"))) => 1
125
124
    );
126
    );
125
127
126
output_html_with_http_headers $query, $cookie, $template->output;
128
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/serials/serial-issues.pl (+1 lines)
Lines 108-111 if ($selectview eq "full"){ Link Here
108
        virtualshelves => "".C4::Context->preference("virtualshelves"),
108
        virtualshelves => "".C4::Context->preference("virtualshelves"),
109
    );
109
    );
110
}
110
}
111
$template->param((uc(C4::Context->preference("marcflavour"))) => 1);
111
output_html_with_http_headers $query, $cookie, $template->output;
112
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/serials/serials-collection.pl (+1 lines)
Lines 163-168 $template->param( Link Here
163
          subscriptioncount => $subscriptioncount,
163
          subscriptioncount => $subscriptioncount,
164
    location	       => $locationlib,
164
    location	       => $locationlib,
165
    callnumber	       => $callnumber,
165
    callnumber	       => $callnumber,
166
    uc(C4::Context->preference("marcflavour")) => 1
166
          );
167
          );
167
168
168
output_html_with_http_headers $query, $cookie, $template->output;
169
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/serials/serials-edit.pl (+2 lines)
Lines 399-404 $template->param( Link Here
399
    serialslist     => \@serialdatalist,
399
    serialslist     => \@serialdatalist,
400
    default_bib_view => $default_bib_view,
400
    default_bib_view => $default_bib_view,
401
    location         => $locationlib,
401
    location         => $locationlib,
402
    (uc(C4::Context->preference("marcflavour"))) => 1
403
402
);
404
);
403
output_html_with_http_headers $query, $cookie, $template->output;
405
output_html_with_http_headers $query, $cookie, $template->output;
404
406
(-)a/serials/serials-home.pl (-8 / +11 lines)
Lines 49-60 use C4::Output; Link Here
49
use C4::Context;
49
use C4::Context;
50
use C4::Branch;
50
use C4::Branch;
51
51
52
my $query         = new CGI;
52
my $query        = new CGI;
53
my $title         = $query->param('title_filter');
53
my $title        = $query->param('title_filter');
54
my $ISSN          = $query->param('ISSN_filter');
54
my $ISSN         = $query->param('ISSN_filter');
55
my $routing       = $query->param('routing')||C4::Context->preference("RoutingSerials");
55
my $EAN          = $query->param('EAN_filter');
56
my $searched      = $query->param('searched');
56
my $routing      = $query->param('routing') || C4::Context->preference("RoutingSerials");
57
my $biblionumber  = $query->param('biblionumber');
57
my $searched     = $query->param('searched');
58
my $biblionumber = $query->param('biblionumber');
58
59
59
my @serialseqs = $query->param('serialseq');
60
my @serialseqs = $query->param('serialseq');
60
my @planneddates = $query->param('planneddate');
61
my @planneddates = $query->param('planneddate');
Lines 92-99 if (@serialseqs){ Link Here
92
  $template->param('information'=>\@information);
93
  $template->param('information'=>\@information);
93
}
94
}
94
my @subscriptions;
95
my @subscriptions;
95
if ($searched){
96
if ($searched) {
96
    @subscriptions = GetSubscriptions( $title, $ISSN, $biblionumber );
97
    @subscriptions = GetSubscriptions( $title, $ISSN, $EAN, $biblionumber );
97
}
98
}
98
99
99
# to toggle between create or edit routing list options
100
# to toggle between create or edit routing list options
Lines 110-114 $template->param( Link Here
110
    ISSN_filter   => $ISSN,
111
    ISSN_filter   => $ISSN,
111
    done_searched => $searched,
112
    done_searched => $searched,
112
    routing       => $routing,
113
    routing       => $routing,
114
    (uc(C4::Context->preference("marcflavour"))) => 1
113
);
115
);
116
114
output_html_with_http_headers $query, $cookie, $template->output;
117
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/serials/serials-recieve.pl (+1 lines)
Lines 278-282 $template->param( Link Here
278
            frommissing => $manualstatus,
278
            frommissing => $manualstatus,
279
            missingdate => $manualdate,
279
            missingdate => $manualdate,
280
            missingid => $manualid,
280
            missingid => $manualid,
281
            (uc(C4::Context->preference("marcflavour"))) => 1
281
        );
282
        );
282
output_html_with_http_headers $query, $cookie, $template->output;
283
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/serials/subscription-add.pl (+2 lines)
Lines 175-180 if ($op eq 'addsubscription') { Link Here
175
            $template->param(bibliotitle => $bib->{title});
175
            $template->param(bibliotitle => $bib->{title});
176
        }
176
        }
177
    }
177
    }
178
        $template->param((uc(C4::Context->preference("marcflavour"))) => 1);
178
	output_html_with_http_headers $query, $cookie, $template->output;
179
	output_html_with_http_headers $query, $cookie, $template->output;
179
}
180
}
180
181
Lines 356-358 sub redirect_mod_subscription { Link Here
356
    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
357
    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
357
    return;
358
    return;
358
}
359
}
360
(-)a/serials/subscription-detail.pl (+1 lines)
Lines 138-143 $template->param( Link Here
138
    intranetcolorstylesheet => C4::Context->preference('intranetcolorstylesheet'),
138
    intranetcolorstylesheet => C4::Context->preference('intranetcolorstylesheet'),
139
    irregular_issues => scalar @irregular_issues,
139
    irregular_issues => scalar @irregular_issues,
140
    default_bib_view => $default_bib_view,
140
    default_bib_view => $default_bib_view,
141
    (uc(C4::Context->preference("marcflavour"))) => 1
141
    );
142
    );
142
143
143
output_html_with_http_headers $query, $cookie, $template->output;
144
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/serials/viewalerts.pl (-1 / +3 lines)
Lines 52-57 foreach (@$borrowers) { Link Here
52
}
52
}
53
$template->param(alertloop => $borrowers,
53
$template->param(alertloop => $borrowers,
54
                bibliotitle => $subscription->{bibliotitle},
54
                bibliotitle => $subscription->{bibliotitle},
55
                subscriptionid => $subscriptionid);
55
                subscriptionid => $subscriptionid,
56
                (uc(C4::Context->preference("marcflavour"))) => 1
57
                );
56
58
57
output_html_with_http_headers $input, $cookie, $template->output;
59
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/t/db_dependent/Serials.t (-1 / +4 lines)
Lines 24-30 $debug && warn scalar(@subscriptions); Link Here
24
@subscriptions = GetSubscriptions( undef, $$subscriptioninformation{issn} );
24
@subscriptions = GetSubscriptions( undef, $$subscriptioninformation{issn} );
25
isa_ok( \@subscriptions, 'ARRAY' );
25
isa_ok( \@subscriptions, 'ARRAY' );
26
$debug && warn scalar(@subscriptions);
26
$debug && warn scalar(@subscriptions);
27
@subscriptions = GetSubscriptions( undef,undef ,$$subscriptioninformation{bibnum} );
27
@subscriptions = GetSubscriptions( undef, undef, $$subscriptioninformation{ean} );
28
isa_ok( \@subscriptions, 'ARRAY' );
29
$debug && warn scalar(@subscriptions);
30
@subscriptions = GetSubscriptions( undef, undef, undef, $$subscriptioninformation{bibnum} );
28
isa_ok( \@subscriptions, 'ARRAY' );
31
isa_ok( \@subscriptions, 'ARRAY' );
29
$debug && warn scalar(@subscriptions);
32
$debug && warn scalar(@subscriptions);
30
if ($subscriptioninformation->{periodicity} % 16==0){
33
if ($subscriptioninformation->{periodicity} % 16==0){
(-)a/t/db_dependent/lib/KohaTest/Acquisition/GetHistory.pm (-1 / +27 lines)
Lines 71-76 sub one_order : Test( 55 ) { Link Here
71
        # diag( Data::Dumper->Dump( [ $order_loop ], [ 'order_loop' ] ) );
71
        # diag( Data::Dumper->Dump( [ $order_loop ], [ 'order_loop' ] ) );
72
    }
72
    }
73
73
74
    # searching by isbn
75
    {
76
        my ( $order_loop, $total_qty, $total_price, $total_qtyreceived) = GetHistory( isbn => $bibliodata->{'isbn'} );
77
        # diag( Data::Dumper->Dump( [ $order_loop, $total_qty, $total_price, $total_qtyreceived ], [ qw( order_loop total_qty total_price total_qtyreceived ) ] ) );
78
79
        is( scalar @$order_loop, 1, 'order_loop searched by isbn' );
80
        is( $total_qty,          1, 'total_qty searched by isbn' );
81
        is( $total_price,        1, 'total_price searched by isbn' );
82
        is( $total_qtyreceived,  0, 'total_qtyreceived searched by isbn' );
83
84
        # diag( Data::Dumper->Dump( [ $order_loop ], [ 'order_loop' ] ) );
85
    }
86
87
    # searching by ean
88
    {
89
        my ( $order_loop, $total_qty, $total_price, $total_qtyreceived) = GetHistory( ean => $bibliodata->{'ean'} );
90
        # diag( Data::Dumper->Dump( [ $order_loop, $total_qty, $total_price, $total_qtyreceived ], [ qw( order_loop total_qty total_price total_qtyreceived ) ] ) );
91
92
        is( scalar @$order_loop, 1, 'order_loop searched by ean' );
93
        is( $total_qty,          1, 'total_qty searched by ean' );
94
        is( $total_price,        1, 'total_price searched by ean' );
95
        is( $total_qtyreceived,  0, 'total_qtyreceived searched by ean' );
96
97
        # diag( Data::Dumper->Dump( [ $order_loop ], [ 'order_loop' ] ) );
98
    }
99
100
74
    # searching by basket number
101
    # searching by basket number
75
    {
102
    {
76
        my ( $order_loop, $total_qty, $total_price, $total_qtyreceived) = GetHistory( basket => $basketno );
103
        my ( $order_loop, $total_qty, $total_price, $total_qtyreceived) = GetHistory( basket => $basketno );
77
- 

Return to bug 5337