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

(-)a/C4/Acquisition.pm (-19 / +46 lines)
Lines 921-927 sub GetPendingOrders { Link Here
921
921
922
  @orders = &GetOrders($basketnumber, $orderby);
922
  @orders = &GetOrders($basketnumber, $orderby);
923
923
924
Looks up the pending (non-cancelled) orders with the given basket
924
Looks up non-cancelled orders (pending and received) with the given basket
925
number. If C<$booksellerID> is non-empty, only orders from that seller
925
number. If C<$booksellerID> is non-empty, only orders from that seller
926
are returned.
926
are returned.
927
927
Lines 929-934 return : Link Here
929
C<&basket> returns a two-element array. C<@orders> is an array of
929
C<&basket> returns a two-element array. C<@orders> is an array of
930
references-to-hash, whose keys are the fields from the aqorders,
930
references-to-hash, whose keys are the fields from the aqorders,
931
biblio, and biblioitems tables in the Koha database.
931
biblio, and biblioitems tables in the Koha database.
932
If the record have been suppressed, its biblionumber is only retuned in deletedbiblionumber column.
932
933
933
=cut
934
=cut
934
935
Lines 936-962 sub GetOrders { Link Here
936
    my ( $basketno, $orderby ) = @_;
937
    my ( $basketno, $orderby ) = @_;
937
    my $dbh   = C4::Context->dbh;
938
    my $dbh   = C4::Context->dbh;
938
    my $query  ="
939
    my $query  ="
939
        SELECT biblio.*,biblioitems.*,
940
        SELECT  all_biblio.*,
941
                all_biblioitems.*,
940
                aqorders.*,
942
                aqorders.*,
941
                aqbudgets.*,
943
                aqbudgets.*,
942
                biblio.title,
943
                aqorders_transfers.ordernumber_from AS transferred_from,
944
                aqorders_transfers.ordernumber_from AS transferred_from,
944
                aqorders_transfers.timestamp AS transferred_from_timestamp
945
                aqorders_transfers.timestamp AS transferred_from_timestamp
945
        FROM    aqorders
946
        FROM    aqorders
946
            LEFT JOIN aqbudgets        ON aqbudgets.budget_id = aqorders.budget_id
947
            LEFT JOIN aqbudgets          ON aqbudgets.budget_id = aqorders.budget_id
947
            LEFT JOIN biblio           ON biblio.biblionumber = aqorders.biblionumber
948
            LEFT JOIN (
948
            LEFT JOIN biblioitems      ON biblioitems.biblionumber =biblio.biblionumber
949
                SELECT * FROM biblio
950
                UNION ALL
951
                SELECT * FROM deletedbiblio
952
            ) AS all_biblio              ON ((all_biblio.biblionumber=aqorders.biblionumber) OR (all_biblio.biblionumber=aqorders.deletedbiblionumber))
953
            LEFT JOIN (
954
                SELECT * FROM biblioitems
955
                UNION ALL
956
                SELECT * FROM deletedbiblioitems
957
            ) AS all_biblioitems         ON ((all_biblioitems.biblionumber=aqorders.biblionumber) OR (all_biblioitems.biblionumber=aqorders.deletedbiblionumber))
949
            LEFT JOIN aqorders_transfers ON aqorders_transfers.ordernumber_to = aqorders.ordernumber
958
            LEFT JOIN aqorders_transfers ON aqorders_transfers.ordernumber_to = aqorders.ordernumber
950
        WHERE   basketno=?
959
        WHERE   basketno=?
951
            AND (datecancellationprinted IS NULL OR datecancellationprinted='0000-00-00')
960
            AND (datecancellationprinted IS NULL OR datecancellationprinted='0000-00-00')
952
    ";
961
    ";
953
962
    $orderby = "all_biblioitems.publishercode,all_biblio.title" unless $orderby;
954
    $orderby = "biblioitems.publishercode,biblio.title" unless $orderby;
955
    $query .= " ORDER BY $orderby";
963
    $query .= " ORDER BY $orderby";
956
    my $sth = $dbh->prepare($query);
964
    my $sth = $dbh->prepare($query);
957
    $sth->execute($basketno);
965
    $sth->execute($basketno);
958
    my $results = $sth->fetchall_arrayref({});
966
    my $results = $sth->fetchall_arrayref({});
959
    $sth->finish;
967
    $sth->finish;
960
    return @$results;
968
    return @$results;
961
}
969
}
962
970
Lines 1005-1010 Looks up an order by order number. Link Here
1005
1013
1006
Returns a reference-to-hash describing the order. The keys of
1014
Returns a reference-to-hash describing the order. The keys of
1007
C<$order> are fields from the biblio, biblioitems, aqorders tables of the Koha database.
1015
C<$order> are fields from the biblio, biblioitems, aqorders tables of the Koha database.
1016
If the record have been suppressed, its biblionumber is only retuned in deletedbiblionumber column.
1008
1017
1009
=cut
1018
=cut
1010
1019
Lines 1012-1021 sub GetOrder { Link Here
1012
    my ($ordernumber) = @_;
1021
    my ($ordernumber) = @_;
1013
    my $dbh      = C4::Context->dbh;
1022
    my $dbh      = C4::Context->dbh;
1014
    my $query = "
1023
    my $query = "
1015
        SELECT biblioitems.*, biblio.*, aqorders.*
1024
        SELECT all_biblio.*, all_biblioitems.*,
1025
               aqorders.*
1016
        FROM   aqorders
1026
        FROM   aqorders
1017
        LEFT JOIN biblio on           biblio.biblionumber=aqorders.biblionumber
1027
        LEFT JOIN (
1018
        LEFT JOIN biblioitems on       biblioitems.biblionumber=aqorders.biblionumber
1028
                SELECT * FROM biblio
1029
                UNION ALL
1030
                SELECT * FROM deletedbiblio
1031
            ) AS all_biblio              ON ((all_biblio.biblionumber=aqorders.biblionumber) OR (all_biblio.biblionumber=aqorders.deletedbiblionumber))
1032
            LEFT JOIN (
1033
                SELECT * FROM biblioitems
1034
                UNION ALL
1035
                SELECT * FROM deletedbiblioitems
1036
            ) AS all_biblioitems         ON ((all_biblioitems.biblionumber=aqorders.biblionumber) OR (all_biblioitems.biblionumber=aqorders.deletedbiblionumber))
1019
        WHERE aqorders.ordernumber=?
1037
        WHERE aqorders.ordernumber=?
1020
1038
1021
    ";
1039
    ";
Lines 1026-1031 sub GetOrder { Link Here
1026
    return $data;
1044
    return $data;
1027
}
1045
}
1028
1046
1047
1029
=head3 GetLastOrderNotReceivedFromSubscriptionid
1048
=head3 GetLastOrderNotReceivedFromSubscriptionid
1030
1049
1031
  $order = &GetLastOrderNotReceivedFromSubscriptionid($subscriptionid);
1050
  $order = &GetLastOrderNotReceivedFromSubscriptionid($subscriptionid);
Lines 1257-1263 sub ModItemOrder { Link Here
1257
1276
1258
  my @orders = GetCancelledOrders($basketno, $orderby);
1277
  my @orders = GetCancelledOrders($basketno, $orderby);
1259
1278
1260
Returns cancelled orders for a basket
1279
Returns cancelled orders for a basket.
1280
If the record have been suppressed, its biblionumber is only retuned in deletedbiblionumber column.
1261
1281
1262
=cut
1282
=cut
1263
1283
Lines 1269-1285 sub GetCancelledOrders { Link Here
1269
    my $dbh   = C4::Context->dbh;
1289
    my $dbh   = C4::Context->dbh;
1270
    my $query = "
1290
    my $query = "
1271
        SELECT
1291
        SELECT
1272
            biblio.*,
1292
            all_biblio.*,
1273
            biblioitems.*,
1293
            all_biblioitems.*,
1274
            aqorders.*,
1294
            aqorders.*,
1275
            aqbudgets.*,
1295
            aqbudgets.*,
1276
            aqorders_transfers.ordernumber_to AS transferred_to,
1296
            aqorders_transfers.ordernumber_to AS transferred_to,
1277
            aqorders_transfers.timestamp AS transferred_to_timestamp
1297
            aqorders_transfers.timestamp AS transferred_to_timestamp
1278
        FROM aqorders
1298
        FROM aqorders
1279
          LEFT JOIN aqbudgets   ON aqbudgets.budget_id = aqorders.budget_id
1299
          LEFT JOIN aqbudgets   ON aqbudgets.budget_id = aqorders.budget_id
1280
          LEFT JOIN biblio      ON biblio.biblionumber = aqorders.biblionumber
1300
          LEFT JOIN (
1281
          LEFT JOIN biblioitems ON biblioitems.biblionumber = biblio.biblionumber
1301
                SELECT * FROM biblio
1282
          LEFT JOIN aqorders_transfers ON aqorders_transfers.ordernumber_from = aqorders.ordernumber
1302
                UNION ALL
1303
                SELECT * FROM deletedbiblio
1304
            ) AS all_biblio              ON ((all_biblio.biblionumber=aqorders.biblionumber) OR (all_biblio.biblionumber=aqorders.deletedbiblionumber))
1305
            LEFT JOIN (
1306
                SELECT * FROM biblioitems
1307
                UNION ALL
1308
                SELECT * FROM deletedbiblioitems
1309
            ) AS all_biblioitems         ON ((all_biblioitems.biblionumber=aqorders.biblionumber) OR (all_biblioitems.biblionumber=aqorders.deletedbiblionumber))
1310
            LEFT JOIN aqorders_transfers ON aqorders_transfers.ordernumber_from = aqorders.ordernumber
1283
        WHERE basketno = ?
1311
        WHERE basketno = ?
1284
          AND (datecancellationprinted IS NOT NULL
1312
          AND (datecancellationprinted IS NOT NULL
1285
               AND datecancellationprinted <> '0000-00-00')
1313
               AND datecancellationprinted <> '0000-00-00')
Lines 1295-1301 sub GetCancelledOrders { Link Here
1295
    return @$results;
1323
    return @$results;
1296
}
1324
}
1297
1325
1298
1299
#------------------------------------------------------------#
1326
#------------------------------------------------------------#
1300
1327
1301
=head3 ModReceiveOrder
1328
=head3 ModReceiveOrder
(-)a/C4/Biblio.pm (+13 lines)
Lines 441-446 sub DelBiblio { Link Here
441
        C4::Reserves::CancelReserve({ reserve_id => $res->{'reserve_id'} });
441
        C4::Reserves::CancelReserve({ reserve_id => $res->{'reserve_id'} });
442
    }
442
    }
443
443
444
    # Get all orders using this record. Must be done before deleting the record to be able to find orders to update after deletion
445
    require C4::Acquisition;
446
    my @orders = C4::Acquisition::GetOrdersByBiblionumber ($biblionumber);
447
444
    # Delete in Zebra. Be careful NOT to move this line after _koha_delete_biblio
448
    # Delete in Zebra. Be careful NOT to move this line after _koha_delete_biblio
445
    # for at least 2 reasons :
449
    # for at least 2 reasons :
446
    # - if something goes wrong, the biblio may be deleted from Koha but not from zebra
450
    # - if something goes wrong, the biblio may be deleted from Koha but not from zebra
Lines 463-468 sub DelBiblio { Link Here
463
    # from being generated by _koha_delete_biblioitems
467
    # from being generated by _koha_delete_biblioitems
464
    $error = _koha_delete_biblio( $dbh, $biblionumber );
468
    $error = _koha_delete_biblio( $dbh, $biblionumber );
465
469
470
    #If the record is used in an order, move the biblionumber from aqorders.biblionumber to aqorders.deletedbiblionumber
471
    if (scalar @orders > 0) {
472
        for my $myorder (@orders) {
473
            $sth = $dbh->prepare("UPDATE aqorders
474
                                  SET deletedbiblionumber = ?
475
                                  WHERE ordernumber=?");
476
            $sth->execute($biblionumber,$myorder->{ordernumber});
477
        }
478
    }
466
    logaction( "CATALOGUING", "DELETE", $biblionumber, "" ) if C4::Context->preference("CataloguingLog");
479
    logaction( "CATALOGUING", "DELETE", $biblionumber, "" ) if C4::Context->preference("CataloguingLog");
467
480
468
    return;
481
    return;
(-)a/acqui/basket.pl (-2 / +1 lines)
Lines 383-389 sub get_order_infos { Link Here
383
        $line{'title'} .= " / $seriestitle" if $seriestitle;
383
        $line{'title'} .= " / $seriestitle" if $seriestitle;
384
        $line{'title'} .= " / $volume"      if $volume;
384
        $line{'title'} .= " / $volume"      if $volume;
385
    } else {
385
    } else {
386
        $line{'title'} = "Deleted bibliographic notice, can't find title.";
386
        $line{'title'} = "Can't find title.";
387
    }
387
    }
388
388
389
    my $biblionumber = $order->{'biblionumber'};
389
    my $biblionumber = $order->{'biblionumber'};
Lines 432-438 sub get_order_infos { Link Here
432
            };
432
            };
433
        }
433
        }
434
    }
434
    }
435
436
    return \%line;
435
    return \%line;
437
}
436
}
438
437
(-)a/acqui/neworderempty.pl (+1 lines)
Lines 377-382 $template->param( Link Here
377
    surnamesuggestedby   => $suggestion->{surnamesuggestedby},
377
    surnamesuggestedby   => $suggestion->{surnamesuggestedby},
378
    firstnamesuggestedby => $suggestion->{firstnamesuggestedby},
378
    firstnamesuggestedby => $suggestion->{firstnamesuggestedby},
379
    biblionumber         => $biblionumber,
379
    biblionumber         => $biblionumber,
380
    deletedbiblionumber  => $data->{'deletedbiblionumber'},
380
    uncertainprice       => $data->{'uncertainprice'},
381
    uncertainprice       => $data->{'uncertainprice'},
381
    authorisedbyname     => $borrower->{'firstname'} . " " . $borrower->{'surname'},
382
    authorisedbyname     => $borrower->{'firstname'} . " " . $borrower->{'surname'},
382
    discount_2dp         => sprintf( "%.2f",  $bookseller->{'discount'} ) ,   # for display
383
    discount_2dp         => sprintf( "%.2f",  $bookseller->{'discount'} ) ,   # for display
(-)a/installer/data/mysql/kohastructure.sql (+2 lines)
Lines 2900-2905 DROP TABLE IF EXISTS `aqorders`; Link Here
2900
CREATE TABLE `aqorders` ( -- information related to the basket line items
2900
CREATE TABLE `aqorders` ( -- information related to the basket line items
2901
  `ordernumber` int(11) NOT NULL auto_increment, -- primary key and unique identifier assigned by Koha to each line
2901
  `ordernumber` int(11) NOT NULL auto_increment, -- primary key and unique identifier assigned by Koha to each line
2902
  `biblionumber` int(11) default NULL, -- links the order to the biblio being ordered (biblio.biblionumber)
2902
  `biblionumber` int(11) default NULL, -- links the order to the biblio being ordered (biblio.biblionumber)
2903
  `deletedbiblionumber` int(11) default NULL, -- links the order to the deletedbiblio being ordered (deletedbiblio.biblionumber)
2903
  `entrydate` date default NULL, -- the date the bib was added to the basket
2904
  `entrydate` date default NULL, -- the date the bib was added to the basket
2904
  `quantity` smallint(6) default NULL, -- the quantity ordered
2905
  `quantity` smallint(6) default NULL, -- the quantity ordered
2905
  `currency` varchar(3) default NULL, -- the currency used for the purchase
2906
  `currency` varchar(3) default NULL, -- the currency used for the purchase
Lines 2940-2945 CREATE TABLE `aqorders` ( -- information related to the basket line items Link Here
2940
  CONSTRAINT `aqorders_ibfk_1` FOREIGN KEY (`basketno`) REFERENCES `aqbasket` (`basketno`) ON DELETE CASCADE ON UPDATE CASCADE,
2941
  CONSTRAINT `aqorders_ibfk_1` FOREIGN KEY (`basketno`) REFERENCES `aqbasket` (`basketno`) ON DELETE CASCADE ON UPDATE CASCADE,
2941
  CONSTRAINT `aqorders_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE SET NULL ON UPDATE CASCADE,
2942
  CONSTRAINT `aqorders_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE SET NULL ON UPDATE CASCADE,
2942
  CONSTRAINT aqorders_ibfk_3 FOREIGN KEY (invoiceid) REFERENCES aqinvoices (invoiceid) ON DELETE SET NULL ON UPDATE CASCADE,
2943
  CONSTRAINT aqorders_ibfk_3 FOREIGN KEY (invoiceid) REFERENCES aqinvoices (invoiceid) ON DELETE SET NULL ON UPDATE CASCADE,
2944
  CONSTRAINT aqorders_ibfk_4 FOREIGN KEY (deletedbiblionumber) REFERENCES deletedbiblio (biblionumber) ON DELETE SET NULL ON UPDATE CASCADE,
2943
  CONSTRAINT `aqorders_subscriptionid` FOREIGN KEY (`subscriptionid`) REFERENCES `subscription` (`subscriptionid`) ON DELETE CASCADE ON UPDATE CASCADE
2945
  CONSTRAINT `aqorders_subscriptionid` FOREIGN KEY (`subscriptionid`) REFERENCES `subscription` (`subscriptionid`) ON DELETE CASCADE ON UPDATE CASCADE
2944
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2946
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2945
2947
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 7139-7144 if ( CheckVersion($DBversion) ) { Link Here
7139
    SetVersion ($DBversion);
7139
    SetVersion ($DBversion);
7140
}
7140
}
7141
7141
7142
$DBversion = "3.13.00.XXX";
7143
if ( CheckVersion($DBversion) ) {
7144
    $dbh->do("ALTER TABLE aqorders ADD COLUMN deletedbiblionumber INT(11) DEFAULT NULL AFTER biblionumber;");
7145
    $dbh->do("ALTER TABLE aqorders ADD CONSTRAINT `aqorders_ibfk_4` FOREIGN KEY (`deletedbiblionumber`) REFERENCES `deletedbiblio` (`biblionumber`) ON DELETE SET NULL ON UPDATE CASCADE;");
7146
    print "Upgrade to $DBversion done \n";
7147
    SetVersion($DBversion);
7148
}
7149
7142
=head1 FUNCTIONS
7150
=head1 FUNCTIONS
7143
7151
7144
=head2 TableExists($table)
7152
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-3 / +8 lines)
Lines 339-346 Link Here
339
                               [% IF (books_loo.biblionumber) %]
339
                               [% IF (books_loo.biblionumber) %]
340
                                   <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a> by [% books_loo.author %]
340
                                   <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a> by [% books_loo.author %]
341
                                   <br />
341
                                   <br />
342
                               [% ELSIF (books_loo.deletedbiblionumber) %]
343
                                   [% books_loo.title |html %] by [% books_loo.author %]
344
                                   <br />
345
                                   <em>(Deleted record)</em>
346
                                   <br />
342
                               [% ELSE %]
347
                               [% ELSE %]
343
                                   <em>Deleted bibliographic record, can't find title</em><br />
348
                                   <em>Can't find title</em><br />
344
                               [% END %]
349
                               [% END %]
345
                                [% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
350
                                [% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
346
                                [% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]
351
                                [% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]
Lines 453-462 Link Here
453
                    <td>
458
                    <td>
454
                      <p>
459
                      <p>
455
                        [% IF ( order.order_received ) %] (rcvd)[% END %]
460
                        [% IF ( order.order_received ) %] (rcvd)[% END %]
456
                        [% IF (order.biblionumber) %]
461
                        [% IF (order.biblionumber)||(order.deletedbiblionumber) %]
457
                          [% order.title |html %] by [% order.author %]<br />
462
                          [% order.title |html %] by [% order.author %]<br />
458
                        [% ELSE %]
463
                        [% ELSE %]
459
                          <em>Deleted bibliographic record, can't find title</em><br />
464
                            <em>Can't find title</em><br />
460
                        [% END %]
465
                        [% END %]
461
                        [% IF ( order.notes ) %] [% order.notes %][% END %]
466
                        [% IF ( order.notes ) %] [% order.notes %][% END %]
462
                        [% IF ( order.isbn ) %] - [% order.isbn %][% END %]
467
                        [% IF ( order.isbn ) %] - [% order.isbn %][% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-24 / +24 lines)
Lines 214-220 $(document).ready(function() Link Here
214
            Catalog details
214
            Catalog details
215
            [% IF ( biblionumber ) %]
215
            [% IF ( biblionumber ) %]
216
                <span><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]"> Edit record</a></span>
216
                <span><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]"> Edit record</a></span>
217
            [% END %]
217
            [% ELSIF (deletedbiblionumber) %]
218
	        <span> (Deleted record, not editable)</span>
219
	    [% END %]
218
        </legend>
220
        </legend>
219
        [% UNLESS ( existing ) %]
221
        [% UNLESS ( existing ) %]
220
        <input type="hidden" name="existing" value="no" />
222
        <input type="hidden" name="existing" value="no" />
Lines 234-259 $(document).ready(function() Link Here
234
        [% END %]
236
        [% END %]
235
237
236
        <ol><li>
238
        <ol><li>
237
            [% IF ( biblionumber ) %]
239
            [% IF ( biblionumber )||( deletedbiblionumber ) %]
238
            <span class="label">Title</span>
240
                <span class="label">Title:</span>
239
                <input type="hidden" name="title" value="[% title |html %]" /> <span class="title">[% title |html %]</span>
241
                <input type="hidden" name="title" value="[% title |html %]" /> <span class="title">[% title |html %]</span>
240
            [% ELSE %]
242
	    [% ELSE %]
241
            <label for="entertitle" class="required">Title: </label>
243
            <label for="entertitle" class="required">Title: </label>
242
                <input type="text" id="entertitle" size="50" name="title" value="[% title |html %]" class="focus" />
244
                <input type="text" id="entertitle" size="50" name="title" value="[% title |html %]" class="focus" />
243
            [% END %]
245
            [% END %]
244
        </li>
246
        </li>
245
        <li>
247
        <li>
246
            [% IF ( biblionumber ) %]
248
            [% IF ( biblionumber )||( deletedbiblionumber ) %]
247
            <span class="label">Author: </span>
249
                <span class="label">Author: </span>
248
                <input type="hidden" name="author" id="author" value="[% author %]" />[% author %]
250
                <input type="hidden" name="author" id="author" value="[% author %]" />[% author %]
249
            [% ELSE %]
251
	    [% ELSE %]
250
            <label for="author">Author: </label>
252
            <label for="author">Author: </label>
251
                <input type="text" size="50" name="author" id="author" value="[% author %]" />
253
                <input type="text" size="50" name="author" id="author" value="[% author %]" />
252
            [% END %]
254
            [% END %]
253
        </li>
255
        </li>
254
        <li>
256
        <li>
255
            [% IF ( biblionumber ) %]
257
            [% IF ( biblionumber )||( deletedbiblionumber ) %]
256
            <span class="label">Publisher: </span>
258
                <span class="label">Publisher: </span>
257
                <input type="hidden" name="publishercode" id="publishercode" value="[% publishercode %]" />[% publishercode %]
259
                <input type="hidden" name="publishercode" id="publishercode" value="[% publishercode %]" />[% publishercode %]
258
            [% ELSE %]
260
            [% ELSE %]
259
            <label for="publishercode"> Publisher: </label>
261
            <label for="publishercode"> Publisher: </label>
Lines 261-278 $(document).ready(function() Link Here
261
            [% END %]
263
            [% END %]
262
        </li>
264
        </li>
263
        <li>
265
        <li>
264
            [% IF ( biblionumber ) %]
266
            [% IF ( biblionumber )||( deletedbiblionumber ) %]
265
            <span class="label">Edition: </span>
267
                <span class="label">Edition: </span>
266
                <input type="hidden" name="editionstatement" id="editionstatement" value="[% editionstatement %]" />[% editionstatement %]
268
                <input type="hidden" name="editionstatement" id="editionstatement" value="[% editionstatement %]" />[% editionstatement %]
267
268
            [% ELSE %]
269
            [% ELSE %]
269
            <label for="editionstatement">Edition: </label>
270
            <label for="editionstatement">Edition: </label>
270
                <input type="text" size="20" name="editionstatement" id="editionstatement" value="[% editionstatement %]" />
271
                <input type="text" size="20" name="editionstatement" id="editionstatement" value="[% editionstatement %]" />
271
            [% END %]
272
            [% END %]
272
        </li>
273
        </li>
273
        <li>
274
        <li>
274
            [% IF ( biblionumber ) %]
275
            [% IF ( biblionumber )||( deletedbiblionumber ) %]
275
            <span class="label">Publication year: </span>
276
                <span class="label">Publication year: </span>
276
                <input type="hidden" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %]
277
                <input type="hidden" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %]
277
            [% ELSE %]
278
            [% ELSE %]
278
            <label for="publicationyear">Publication year: </label>
279
            <label for="publicationyear">Publication year: </label>
Lines 280-287 $(document).ready(function() Link Here
280
            [% END %]
281
            [% END %]
281
        </li>
282
        </li>
282
        <li>
283
        <li>
283
            [% IF ( biblionumber ) %]
284
            [% IF ( biblionumber )||( deletedbiblionumber ) %]
284
            <span class="label">ISBN: </span>
285
                <span class="label">ISBN: </span>
285
                <input type="hidden" name="isbn" id="ISBN" value="[% isbn %]" />[% isbn %]
286
                <input type="hidden" name="isbn" id="ISBN" value="[% isbn %]" />[% isbn %]
286
            [% ELSE %]
287
            [% ELSE %]
287
            <label for="ISBN">ISBN: </label>
288
            <label for="ISBN">ISBN: </label>
Lines 290-297 $(document).ready(function() Link Here
290
        </li>
291
        </li>
291
        [% IF (UNIMARC) %]
292
        [% IF (UNIMARC) %]
292
        <li>
293
        <li>
293
            [% IF ( biblionumber ) %]
294
            [% IF ( biblionumber )||( deletedbiblionumber ) %]
294
            <span class="label">EAN: </span>
295
                <span class="label">EAN: </span>
295
                <input type="hidden" name="ean" id="EAN" value="[% ean %]" />[% ean %]
296
                <input type="hidden" name="ean" id="EAN" value="[% ean %]" />[% ean %]
296
            [% ELSE %]
297
            [% ELSE %]
297
            <label for="EAN">EAN: </label>
298
            <label for="EAN">EAN: </label>
Lines 300-314 $(document).ready(function() Link Here
300
        </li>
301
        </li>
301
        [% END %]
302
        [% END %]
302
        <li>
303
        <li>
303
            [% IF ( biblionumber ) %]
304
            [% IF ( biblionumber )||( deletedbiblionumber ) %]
304
            <span class="label">Series: </span>
305
                <span class="label">Series: </span>
305
                <input type="hidden" name="series" id="series" value="[% seriestitle %]" />[% seriestitle %]
306
                <input type="hidden" name="series" id="series" value="[% seriestitle %]" />[% seriestitle %]
306
            [% ELSE %]
307
            [% ELSE %]
307
            <label for="series">Series: </label>
308
            <label for="series">Series: </label>
308
                <input type="text" size="50" name="series" id="series" value="[% seriestitle %]" />
309
                <input type="text" size="50" name="series" id="series" value="[% seriestitle %]" />
309
            [% END %]
310
            [% END %]
310
        </li>
311
        </li>
311
            [% UNLESS ( biblionumber ) %]
312
            [% UNLESS (( biblionumber )||( deletedbiblionumber )) %]
312
            [% IF ( itemtypeloop ) %]
313
            [% IF ( itemtypeloop ) %]
313
            <li>
314
            <li>
314
                <span class="label">Item type:</span>
315
                <span class="label">Item type:</span>
315
- 

Return to bug 10758