@@ -, +, @@ --- C4/Acquisition.pm | 18 +++---- acqui/addorder.pl | 2 +- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 54 +++++++++++--------- 3 files changed, 41 insertions(+), 33 deletions(-) --- a/C4/Acquisition.pm +++ a/C4/Acquisition.pm @@ -1579,7 +1579,7 @@ sub SearchOrders { =head3 DelOrder - &DelOrder($biblionumber, $ordernumber); + &DelOrder($ordernumber, $biblionumber); Cancel the order with the given order and biblio numbers. It does not delete any entries in the aqorders table, it merely marks them as @@ -1588,21 +1588,22 @@ cancelled. =cut sub DelOrder { - my ( $bibnum, $ordernumber ) = @_; + my ($ordernumber,$biblionumber) = @_; my $dbh = C4::Context->dbh; my $query = " UPDATE aqorders SET datecancellationprinted=now(), orderstatus='cancelled' - WHERE biblionumber=? AND ordernumber=? + WHERE ordernumber=? "; my $sth = $dbh->prepare($query); - $sth->execute( $bibnum, $ordernumber ); + $sth->execute($ordernumber ); $sth->finish; - my @itemnumbers = GetItemnumbersFromOrder( $ordernumber ); - foreach my $itemnumber (@itemnumbers){ - C4::Items::DelItem( $dbh, $bibnum, $itemnumber ); + if ($biblionumber) { + my @itemnumbers = GetItemnumbersFromOrder( $ordernumber ); + foreach my $itemnumber (@itemnumbers){ + C4::Items::DelItem( $dbh, $biblionumber, $itemnumber ); + } } - } =head3 TransferOrder @@ -2059,7 +2060,6 @@ sub GetHistory { LEFT JOIN deletedbiblio ON deletedbiblio.biblionumber=aqorders.biblionumber LEFT JOIN deletedbiblioitems ON deletedbiblioitems.biblionumber=aqorders.biblionumber "; - if ( C4::Context->preference("IndependentBranches") ) { $query .= " LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber"; } --- a/acqui/addorder.pl +++ a/acqui/addorder.pl @@ -251,7 +251,7 @@ if ( $orderinfo->{quantity} ne '0' ) { else { # qty=0, delete the line my $biblionumber = $input->param('biblionumber'); - DelOrder( $biblionumber, $$orderinfo{ordernumber} ); + DelOrder($$orderinfo{ordernumber}, $biblionumber ); if ($orderinfo->{delbiblio} == 1){ DelBiblio($biblionumber); } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -336,8 +336,12 @@ [% IF ( books_loo.order_received ) %]
[% IF ( books_loo.order_received ) %] (rcvd)[% END %]
- [% books_loo.title |html %] by [% books_loo.author %]
-
+ [% IF (books_loo.biblionumber) %]
+ [% books_loo.title |html %] by [% books_loo.author %]
+
+ [% ELSE %]
+ Deleted bibliographic record, can't find title
+ [% END %]
[% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
[% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]
[% IF ( books_loo.publishercode ) %], [% books_loo.publishercode %][% END %]
@@ -387,27 +391,31 @@
[% END %]
[% IF ( order.order_received ) %] (rcvd)[% END %]
- [% IF (order.title) %]
+ [% IF (order.biblionumber) %]
[% order.title |html %] by [% order.author %]
[% ELSE %]
Deleted bibliographic record, can't find title
--