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

(-)a/C4/Acquisition.pm (-9 / +17 lines)
Lines 1194-1200 C<@results> is an array of references-to-hash with the following keys: Link Here
1194
1194
1195
sub SearchOrder {
1195
sub SearchOrder {
1196
#### -------- SearchOrder-------------------------------
1196
#### -------- SearchOrder-------------------------------
1197
    my ($ordernumber, $search, $supplierid, $basket) = @_;
1197
    my ( $ordernumber, $search, $ean, $supplierid, $basket ) = @_;
1198
1198
1199
    my $dbh = C4::Context->dbh;
1199
    my $dbh = C4::Context->dbh;
1200
    my @args = ();
1200
    my @args = ();
Lines 1214-1220 sub SearchOrder { Link Here
1214
        $query .= " AND (biblio.title like ? OR biblio.author LIKE ? OR biblioitems.isbn like ?)";
1214
        $query .= " AND (biblio.title like ? OR biblio.author LIKE ? OR biblioitems.isbn like ?)";
1215
        push @args, ("%$search%","%$search%","%$search%");
1215
        push @args, ("%$search%","%$search%","%$search%");
1216
    }
1216
    }
1217
    if($supplierid){
1217
    if ($ean) {
1218
        $query .= " AND biblioitems.ean = ?";
1219
        push @args, $ean;
1220
    }
1221
    if ($supplierid) {
1218
        $query .= "AND aqbasket.booksellerid = ?";
1222
        $query .= "AND aqbasket.booksellerid = ?";
1219
        push @args, $supplierid;
1223
        push @args, $supplierid;
1220
    }
1224
    }
Lines 1572-1583 sub GetHistory { Link Here
1572
    my $title = $params{title};
1576
    my $title = $params{title};
1573
    my $author = $params{author};
1577
    my $author = $params{author};
1574
    my $isbn   = $params{isbn};
1578
    my $isbn   = $params{isbn};
1579
    my $ean    = $params{ean};
1575
    my $name = $params{name};
1580
    my $name = $params{name};
1576
    my $from_placed_on = $params{from_placed_on};
1581
    my $from_placed_on = $params{from_placed_on};
1577
    my $to_placed_on = $params{to_placed_on};
1582
    my $to_placed_on = $params{to_placed_on};
1578
    my $basket = $params{basket};
1583
    my $basket = $params{basket};
1579
    my $booksellerinvoicenumber = $params{booksellerinvoicenumber};
1584
    my $booksellerinvoicenumber = $params{booksellerinvoicenumber};
1580
1581
    my @order_loop;
1585
    my @order_loop;
1582
    my $total_qty         = 0;
1586
    my $total_qty         = 0;
1583
    my $total_qtyreceived = 0;
1587
    my $total_qtyreceived = 0;
Lines 1589-1600 sub GetHistory { Link Here
1589
            biblio.title,
1593
            biblio.title,
1590
            biblio.author,
1594
            biblio.author,
1591
	    biblioitems.isbn,
1595
	    biblioitems.isbn,
1596
	    biblioitems.ean,
1592
            aqorders.basketno,
1597
            aqorders.basketno,
1593
    aqbasket.basketname,
1598
            aqbasket.basketname,
1594
    aqbasket.basketgroupid,
1599
            aqbasket.basketgroupid,
1595
    aqbasketgroups.name as groupname,
1600
            aqbasketgroups.name as groupname,
1596
            aqbooksellers.name,
1601
            aqbooksellers.name,
1597
    aqbasket.creationdate,
1602
            aqbasket.creationdate,
1598
            aqorders.datereceived,
1603
            aqorders.datereceived,
1599
            aqorders.quantity,
1604
            aqorders.quantity,
1600
            aqorders.quantityreceived,
1605
            aqorders.quantityreceived,
Lines 1605-1611 sub GetHistory { Link Here
1605
            aqorders.biblionumber
1610
            aqorders.biblionumber
1606
        FROM aqorders
1611
        FROM aqorders
1607
        LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
1612
        LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
1608
    LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id
1613
        LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id
1609
        LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
1614
        LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
1610
	LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber
1615
	LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber
1611
        LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber";
1616
        LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber";
Lines 1632-1638 sub GetHistory { Link Here
1632
        $query .= " AND biblioitems.isbn LIKE ? ";
1637
        $query .= " AND biblioitems.isbn LIKE ? ";
1633
        push @query_params, "%$isbn%";
1638
        push @query_params, "%$isbn%";
1634
    }
1639
    }
1635
1640
    if ( defined $ean and $ean ) {
1641
        $query .= " AND biblioitems.ean = ? ";
1642
        push @query_params, "$ean";
1643
    }
1636
    if ( $name ) {
1644
    if ( $name ) {
1637
        $query .= " AND aqbooksellers.name LIKE ? ";
1645
        $query .= " AND aqbooksellers.name LIKE ? ";
1638
        push @query_params, "%$name%";
1646
        push @query_params, "%$name%";
(-)a/C4/Biblio.pm (-3 / +6 lines)
Lines 3259-3265 sub _koha_modify_biblioitem_nonmarc { Link Here
3259
        cn_item         = ?,
3259
        cn_item         = ?,
3260
        cn_suffix       = ?,
3260
        cn_suffix       = ?,
3261
        cn_sort         = ?,
3261
        cn_sort         = ?,
3262
        totalissues     = ?
3262
        totalissues     = ?,
3263
	ean             = ?
3263
        where biblioitemnumber = ?
3264
        where biblioitemnumber = ?
3264
        ";
3265
        ";
3265
    my $sth = $dbh->prepare($query);
3266
    my $sth = $dbh->prepare($query);
Lines 3271-3276 sub _koha_modify_biblioitem_nonmarc { Link Here
3271
        $biblioitem->{'pages'},            $biblioitem->{'bnotes'},           $biblioitem->{'size'},                  $biblioitem->{'place'},
3272
        $biblioitem->{'pages'},            $biblioitem->{'bnotes'},           $biblioitem->{'size'},                  $biblioitem->{'place'},
3272
        $biblioitem->{'lccn'},             $biblioitem->{'url'},              $biblioitem->{'biblioitems.cn_source'}, $biblioitem->{'cn_class'},
3273
        $biblioitem->{'lccn'},             $biblioitem->{'url'},              $biblioitem->{'biblioitems.cn_source'}, $biblioitem->{'cn_class'},
3273
        $biblioitem->{'cn_item'},          $biblioitem->{'cn_suffix'},        $cn_sort,                               $biblioitem->{'totalissues'},
3274
        $biblioitem->{'cn_item'},          $biblioitem->{'cn_suffix'},        $cn_sort,                               $biblioitem->{'totalissues'},
3275
	$biblioitem->{'ean'},
3274
        $biblioitem->{'biblioitemnumber'}
3276
        $biblioitem->{'biblioitemnumber'}
3275
    );
3277
    );
3276
    if ( $dbh->errstr ) {
3278
    if ( $dbh->errstr ) {
Lines 3322-3328 sub _koha_add_biblioitem { Link Here
3322
        cn_item         = ?,
3324
        cn_item         = ?,
3323
        cn_suffix       = ?,
3325
        cn_suffix       = ?,
3324
        cn_sort         = ?,
3326
        cn_sort         = ?,
3325
        totalissues     = ?
3327
        totalissues     = ?,
3328
	ean             = ?
3326
        ";
3329
        ";
3327
    my $sth = $dbh->prepare($query);
3330
    my $sth = $dbh->prepare($query);
3328
    $sth->execute(
3331
    $sth->execute(
Lines 3333-3339 sub _koha_add_biblioitem { Link Here
3333
        $biblioitem->{'pages'},            $biblioitem->{'bnotes'},           $biblioitem->{'size'},                  $biblioitem->{'place'},
3336
        $biblioitem->{'pages'},            $biblioitem->{'bnotes'},           $biblioitem->{'size'},                  $biblioitem->{'place'},
3334
        $biblioitem->{'lccn'},             $biblioitem->{'marc'},             $biblioitem->{'url'},                   $biblioitem->{'biblioitems.cn_source'},
3337
        $biblioitem->{'lccn'},             $biblioitem->{'marc'},             $biblioitem->{'url'},                   $biblioitem->{'biblioitems.cn_source'},
3335
        $biblioitem->{'cn_class'},         $biblioitem->{'cn_item'},          $biblioitem->{'cn_suffix'},             $cn_sort,
3338
        $biblioitem->{'cn_class'},         $biblioitem->{'cn_item'},          $biblioitem->{'cn_suffix'},             $cn_sort,
3336
        $biblioitem->{'totalissues'}
3339
        $biblioitem->{'totalissues'},      $biblioitem->{'ean'}
3337
    );
3340
    );
3338
    my $bibitemnum = $dbh->{'mysql_insertid'};
3341
    my $bibitemnum = $dbh->{'mysql_insertid'};
3339
3342
(-)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 367-372 $template->param( Link Here
367
    editionstatement => $data->{'editionstatement'},
367
    editionstatement => $data->{'editionstatement'},
368
    budget_loop      => $budget_loop,
368
    budget_loop      => $budget_loop,
369
    isbn             => $data->{'isbn'},
369
    isbn             => $data->{'isbn'},
370
    ean              => $data->{'ean'},
370
    seriestitle      => $data->{'seriestitle'},
371
    seriestitle      => $data->{'seriestitle'},
371
    itemtypeloop     => \@itemtypes,
372
    itemtypeloop     => \@itemtypes,
372
    quantity         => $data->{'quantity'},
373
    quantity         => $data->{'quantity'},
Lines 385-390 $template->param( Link Here
385
# CHECKME: gst-stuff needs verifing, mason.
386
# CHECKME: gst-stuff needs verifing, mason.
386
    gstrate          => $bookseller->{'gstrate'} // C4::Context->preference("gist") // 0,
387
    gstrate          => $bookseller->{'gstrate'} // C4::Context->preference("gist") // 0,
387
    gstreg           => $bookseller->{'gstreg'},
388
    gstreg           => $bookseller->{'gstreg'},
389
    (uc(C4::Context->preference("marcflavour"))) => 1
388
);
390
);
389
391
390
output_html_with_http_headers $input, $cookie, $template->output;
392
output_html_with_http_headers $input, $cookie, $template->output;
Lines 516-521 sub Load_Duplicate { Link Here
516
    booksellerid        => $basket->{'booksellerid'},
518
    booksellerid        => $basket->{'booksellerid'},
517
    breedingid          => $params->{'breedingid'},
519
    breedingid          => $params->{'breedingid'},
518
    duplicatetitle      => $duplicatetitle,
520
    duplicatetitle      => $duplicatetitle,
521
    (uc(C4::Context->preference("marcflavour"))) => 1
519
  );
522
  );
520
523
521
  output_html_with_http_headers $input, $cookie, $template->output;
524
  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 141-147 my ( $holdcount, $holds ) = GetReservesFromBiblionumber($biblionumber,1); Link Here
141
141
142
#coping with subscriptions
142
#coping with subscriptions
143
my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
143
my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
144
my @subscriptions       = GetSubscriptions( $dat->{title}, $dat->{issn}, $biblionumber );
144
my @subscriptions       = GetSubscriptions( $dat->{title}, $dat->{issn}, undef, $biblionumber );
145
my @subs;
145
my @subs;
146
146
147
foreach my $subscription (@subscriptions) {
147
foreach my $subscription (@subscriptions) {
(-)a/installer/data/mysql/atomicupdate/02.00.060-adding-ean.pl (+7 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
use C4::Context;
3
my $dbh= C4::Context->dbh;
4
$dbh->do("ALTER TABLE `biblioitems` ADD `ean` VARCHAR( 13 ) NULL AFTER issn");
5
$dbh->do("CREATE INDEX `ean` ON biblioitems (`ean`) ");
6
$dbh->do("ALTER TABLE `deletedbiblioitems` ADD `ean` VARCHAR( 13 ) NULL AFTER issn");
7
$dbh->do("CREATE INDEX `ean` ON deletedbiblioitems (`ean`) ");
(-)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 (-1 / +1 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, ''),
(-)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 618-623 CREATE TABLE `deletedbiblioitems` ( -- information about bibliographic records t Link Here
618
  `itemtype` varchar(10) default NULL, -- biblio level item type (MARC21 942$c)
619
  `itemtype` varchar(10) default NULL, -- biblio level item type (MARC21 942$c)
619
  `isbn` varchar(30) default NULL, -- ISBN (MARC21 020$a)
620
  `isbn` varchar(30) default NULL, -- ISBN (MARC21 020$a)
620
  `issn` varchar(9) default NULL, -- ISSN (MARC21 022$a)
621
  `issn` varchar(9) default NULL, -- ISSN (MARC21 022$a)
622
  `ean` varchar(13) default NULL,
621
  `publicationyear` text,
623
  `publicationyear` text,
622
  `publishercode` varchar(255) default NULL, -- publisher (MARC21 260$b)
624
  `publishercode` varchar(255) default NULL, -- publisher (MARC21 260$b)
623
  `volumedate` date default NULL,
625
  `volumedate` date default NULL,
(-)a/installer/data/mysql/updatedatabase.pl (+14 lines)
Lines 4944-4949 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
4944
}
4944
}
4945
4945
4946
4946
4947
4948
4949
4950
4951
$DBversion = "3.07.00.030";
4952
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
4953
    $dbh->do("ALTER TABLE `biblioitems` ADD `ean` VARCHAR( 13 ) NULL AFTER issn");
4954
    $dbh->do("CREATE INDEX `ean` ON biblioitems (`ean`) ");
4955
    $dbh->do("ALTER TABLE `deletedbiblioitems` ADD `ean` VARCHAR( 13 ) NULL AFTER issn");
4956
    $dbh->do("CREATE INDEX `ean` ON deletedbiblioitems (`ean`) ");
4957
    print "Upgrade to $DBversion done (Adding ean in biblioitems and deletedbiblioitems)\n";
4958
    SetVersion($DBversion);
4959
}
4960
4947
=head1 FUNCTIONS
4961
=head1 FUNCTIONS
4948
4962
4949
=head2 DropAllForeignKeys($table)
4963
=head2 DropAllForeignKeys($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc (-2 / +11 lines)
Lines 1-9 Link Here
1
2
<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Serials Resident Search Box -->
1
<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Serials Resident Search Box -->
3
<div id="header_search">
2
<div id="header_search">
4
	<div id="subscription_search" class="residentsearch">
3
	<div id="subscription_search" class="residentsearch">
5
	<p class="tip">Search Subscriptions:</p>
4
	<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" />
5
 <form action="/cgi-bin/koha/serials/serials-home.pl" method="get">
6
 [% IF ( routing ) %]<input type="hidden" name="routing" value="[% routing %]" />[% END %]
7
 <input type="hidden" name="searched" value="1" /> 
8
 <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter %]" /> 
9
10
[% UNLESS (MARC21) %]
11
 <label for="EAN_filter">EAN:</label> <input type="text" size="20" maxlength="40" name="EAN_filter" id="EAN_filter" value="[% EAN_filter %]" />
12
[% END %]
13
 <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter %]" />
14
 <input type="submit" value="Search" class="submit" />
15
7
</form>
16
</form>
8
	</div>
17
	</div>
9
    [% INCLUDE 'patron-search-box.inc' %]
18
    [% INCLUDE 'patron-search-box.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (+3 lines)
Lines 23-28 Link Here
23
		<li><label for="title">Title: </label> <input type="text" name="title" id="title" value="[% title %]" /></li>
23
		<li><label for="title">Title: </label> <input type="text" name="title" id="title" value="[% title %]" /></li>
24
		<li><label for="author">Author: </label> <input type="text" name="author" id="author" value="[% author %]" /></li>
24
		<li><label for="author">Author: </label> <input type="text" name="author" id="author" value="[% author %]" /></li>
25
		<li><label for="isbn">ISBN: </label> <input type="isbn" name="isbn" id="isbn" value="[% isbn %]" /></li>
25
		<li><label for="isbn">ISBN: </label> <input type="isbn" name="isbn" id="isbn" value="[% isbn %]" /></li>
26
                [% UNLESS (MARC21) %]
27
		<li><label for="ean">EAN: </label> <input type="text" name="ean" id="ean" value="[% ean %]" /></li>
28
                [% END %]
26
		<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% name %]" /></li>
29
		<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% name %]" /></li>
27
		<li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% basket %]" /></li>
30
		<li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% basket %]" /></li>
28
		<li><label for="booksellerinvoicenumber ">Bookseller Invoice No: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% booksellerinvoicenumber %]" /></li>
31
		<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 291-296 $(document).ready(function() Link Here
291
                <input type="text" size="50" name="isbn" id="ISBN" value="[% isbn %]" />
291
                <input type="text" size="50" name="isbn" id="ISBN" value="[% isbn %]" />
292
            [% END %]
292
            [% END %]
293
        </li>
293
        </li>
294
        [% UNLESS (MARC21) %]
295
        <li>
296
            [% IF ( biblionumber ) %]
297
            <span class="label">EAN: </span>
298
                <input type="hidden" size="20" name="ean" id="EAN" value="[% ean %]" />[% ean %]
299
            [% ELSE %]
300
            <label for="EAN">EAN: </label>
301
                <input type="text" size="20" name="ean" id="EAN" value="[% ean %]" />
302
            [% END %]
303
        </li>
304
        [% END %]
294
        <li>
305
        <li>
295
            [% IF ( biblionumber ) %]
306
            [% IF ( biblionumber ) %]
296
            <span class="label">Series: </span>
307
            <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 417-422 Link Here
417
		    <label for="orderfilter">Order Line :</label>
418
		    <label for="orderfilter">Order Line :</label>
418
		    <input type="text" name="orderfilter" id="orderfilter" />
419
		    <input type="text" name="orderfilter" id="orderfilter" />
419
		</li>
420
		</li>
421
                [% UNLESS (MARC21) %]
422
		<li>
423
		    <label for="eanfilter">EAN :</label>
424
		    <input type="text" name="eanfilter" id="eanfilter" />
425
		</li>
426
                [% END %]
420
	    </ol>
427
	    </ol>
421
		<fieldset class="action">
428
		<fieldset class="action">
422
		    <input type="submit" value="Filter" />
429
		    <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 (-2 / +3 lines)
Lines 88-93 if($query->cookie("bib_list")){ Link Here
88
88
89
89
90
SetUTF8Flag($record);
90
SetUTF8Flag($record);
91
my $marcflavour      = C4::Context->preference("marcflavour");
92
my $ean = GetNormalizedEAN( $record, $marcflavour );
91
93
92
# XSLT processing of some stuff
94
# XSLT processing of some stuff
93
if (C4::Context->preference("OPACXSLTDetailsDisplay") ) {
95
if (C4::Context->preference("OPACXSLTDetailsDisplay") ) {
Lines 442-448 my $collections = GetKohaAuthorisedValues('items.ccode',$dat->{'frameworkcode'} Link Here
442
444
443
#coping with subscriptions
445
#coping with subscriptions
444
my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
446
my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
445
my @subscriptions       = GetSubscriptions( undef, undef, $biblionumber );
447
my @subscriptions       = GetSubscriptions($dat->{'title'}, $dat->{'issn'}, $ean, $biblionumber );
446
448
447
my @subs;
449
my @subs;
448
$dat->{'serial'}=1 if $subscriptionsnumber;
450
$dat->{'serial'}=1 if $subscriptionsnumber;
Lines 597-603 foreach ( keys %{$dat} ) { Link Here
597
# in each case, we're grabbing the first value we find in
599
# in each case, we're grabbing the first value we find in
598
# the record and normalizing it
600
# the record and normalizing it
599
my $upc = GetNormalizedUPC($record,$marcflavour);
601
my $upc = GetNormalizedUPC($record,$marcflavour);
600
my $ean = GetNormalizedEAN($record,$marcflavour);
601
my $oclc = GetNormalizedOCLCNumber($record,$marcflavour);
602
my $oclc = GetNormalizedOCLCNumber($record,$marcflavour);
602
my $isbn = GetNormalizedISBN(undef,$record,$marcflavour);
603
my $isbn = GetNormalizedISBN(undef,$record,$marcflavour);
603
my $content_identifier_exists;
604
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 48-59 use C4::Serials; Link Here
48
use C4::Output;
48
use C4::Output;
49
use C4::Context;
49
use C4::Context;
50
50
51
my $query         = new CGI;
51
my $query        = new CGI;
52
my $title         = $query->param('title_filter');
52
my $title        = $query->param('title_filter');
53
my $ISSN          = $query->param('ISSN_filter');
53
my $ISSN         = $query->param('ISSN_filter');
54
my $routing       = $query->param('routing')||C4::Context->preference("RoutingSerials");
54
my $EAN          = $query->param('EAN_filter');
55
my $searched      = $query->param('searched');
55
my $routing      = $query->param('routing') || C4::Context->preference("RoutingSerials");
56
my $biblionumber  = $query->param('biblionumber');
56
my $searched     = $query->param('searched');
57
my $biblionumber = $query->param('biblionumber');
57
58
58
my @serialseqs = $query->param('serialseq');
59
my @serialseqs = $query->param('serialseq');
59
my @planneddates = $query->param('planneddate');
60
my @planneddates = $query->param('planneddate');
Lines 91-98 if (@serialseqs){ Link Here
91
  $template->param('information'=>\@information);
92
  $template->param('information'=>\@information);
92
}
93
}
93
my @subscriptions;
94
my @subscriptions;
94
if ($searched){
95
if ($searched) {
95
    @subscriptions = GetSubscriptions( $title, $ISSN, $biblionumber );
96
    @subscriptions = GetSubscriptions( $title, $ISSN, $EAN, $biblionumber );
96
}
97
}
97
98
98
# to toggle between create or edit routing list options
99
# to toggle between create or edit routing list options
Lines 108-112 $template->param( Link Here
108
    ISSN_filter   => $ISSN,
109
    ISSN_filter   => $ISSN,
109
    done_searched => $searched,
110
    done_searched => $searched,
110
    routing       => $routing,
111
    routing       => $routing,
112
    (uc(C4::Context->preference("marcflavour"))) => 1
111
);
113
);
114
112
output_html_with_http_headers $query, $cookie, $template->output;
115
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 170-175 if ($op eq 'addsubscription') { Link Here
170
            $template->param(bibliotitle => $bib->{title});
170
            $template->param(bibliotitle => $bib->{title});
171
        }
171
        }
172
    }
172
    }
173
        $template->param((uc(C4::Context->preference("marcflavour"))) => 1);
173
	output_html_with_http_headers $query, $cookie, $template->output;
174
	output_html_with_http_headers $query, $cookie, $template->output;
174
}
175
}
175
176
Lines 350-352 sub redirect_mod_subscription { Link Here
350
    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
351
    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
351
    return;
352
    return;
352
}
353
}
354
(-)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 (-2 / +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;
58
- 

Return to bug 5337