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

(-)a/C4/Acquisition.pm (-9 / +9 lines)
Lines 1752-1758 sub SearchOrders { Link Here
1752
1752
1753
=head3 DelOrder
1753
=head3 DelOrder
1754
1754
1755
  &DelOrder($biblionumber, $ordernumber);
1755
  &DelOrder($ordernumber, $biblionumber);
1756
1756
1757
Cancel the order with the given order and biblio numbers. It does not
1757
Cancel the order with the given order and biblio numbers. It does not
1758
delete any entries in the aqorders table, it merely marks them as
1758
delete any entries in the aqorders table, it merely marks them as
Lines 1761-1781 cancelled. Link Here
1761
=cut
1761
=cut
1762
1762
1763
sub DelOrder {
1763
sub DelOrder {
1764
    my ( $bibnum, $ordernumber ) = @_;
1764
    my ($ordernumber,$biblionumber) = @_;
1765
    my $dbh = C4::Context->dbh;
1765
    my $dbh = C4::Context->dbh;
1766
    my $query = "
1766
    my $query = "
1767
        UPDATE aqorders
1767
        UPDATE aqorders
1768
        SET    datecancellationprinted=now(), orderstatus='cancelled'
1768
        SET    datecancellationprinted=now(), orderstatus='cancelled'
1769
        WHERE  biblionumber=? AND ordernumber=?
1769
        WHERE  ordernumber=?
1770
    ";
1770
    ";
1771
    my $sth = $dbh->prepare($query);
1771
    my $sth = $dbh->prepare($query);
1772
    $sth->execute( $bibnum, $ordernumber );
1772
    $sth->execute($ordernumber );
1773
    $sth->finish;
1773
    $sth->finish;
1774
    my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
1774
    if ($biblionumber) {
1775
    foreach my $itemnumber (@itemnumbers){
1775
        my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
1776
    	C4::Items::DelItem( $dbh, $bibnum, $itemnumber );
1776
        foreach my $itemnumber (@itemnumbers){
1777
            C4::Items::DelItem( $dbh, $biblionumber, $itemnumber );
1778
        }
1777
    }
1779
    }
1778
    
1779
}
1780
}
1780
1781
1781
=head3 TransferOrder
1782
=head3 TransferOrder
Lines 2242-2248 sub GetHistory { Link Here
2242
        LEFT JOIN deletedbiblio ON deletedbiblio.biblionumber=aqorders.biblionumber
2243
        LEFT JOIN deletedbiblio ON deletedbiblio.biblionumber=aqorders.biblionumber
2243
        LEFT JOIN deletedbiblioitems ON deletedbiblioitems.biblionumber=aqorders.biblionumber
2244
        LEFT JOIN deletedbiblioitems ON deletedbiblioitems.biblionumber=aqorders.biblionumber
2244
        ";
2245
        ";
2245
2246
    if ( C4::Context->preference("IndependentBranches") ) {
2246
    if ( C4::Context->preference("IndependentBranches") ) {
2247
        $query .= " LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber";
2247
        $query .= " LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber";
2248
    }
2248
    }
(-)a/acqui/addorder.pl (-1 / +1 lines)
Lines 323-329 if ( $orderinfo->{quantity} ne '0' ) { Link Here
323
323
324
else { # qty=0, delete the line
324
else { # qty=0, delete the line
325
    my $biblionumber = $input->param('biblionumber');
325
    my $biblionumber = $input->param('biblionumber');
326
    DelOrder( $biblionumber, $$orderinfo{ordernumber} );
326
    DelOrder($$orderinfo{ordernumber}, $biblionumber );
327
    if ($orderinfo->{delbiblio} == 1){
327
    if ($orderinfo->{delbiblio} == 1){
328
     DelBiblio($biblionumber);
328
     DelBiblio($biblionumber);
329
    }
329
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-26 / +32 lines)
Lines 475-484 Link Here
475
                            [% books_loo.ordernumber %]
475
                            [% books_loo.ordernumber %]
476
                        </td>
476
                        </td>
477
                        <td>
477
                        <td>
478
                            <p>
478
                            <p> [% IF ( books_loo.order_received ) %] (rcvd)[% END %]
479
                                [% IF ( books_loo.order_received ) %] (rcvd)[% END %]
479
                                [% IF (books_loo.biblionumber) %]
480
                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a> by [% books_loo.author %]
480
                                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a> by [% books_loo.author %]
481
                                <br />
481
                                    <br />
482
                                [% ELSE %]
483
                                    <em>Deleted bibliographic record, can't find title</em><br />
484
                                [% END %]
482
                                [% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
485
                                [% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
483
                                [% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]
486
                                [% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]
484
                                [% IF ( books_loo.publishercode ) %], [% books_loo.publishercode %][% END %]
487
                                [% IF ( books_loo.publishercode ) %], [% books_loo.publishercode %][% END %]
Lines 530-556 Link Here
530
                                [% END %]
533
                                [% END %]
531
                            </td>
534
                            </td>
532
                            <td>
535
                            <td>
533
                            [% IF ( books_loo.left_holds_on_order ) %]
536
                            [% UNLESS (books_loo.biblionumber) %]
534
                            <span class="button" title="Can't delete order, ([% books_loo.holds_on_order %]) holds are linked with this order cancel holds first">Can't delete order</span><br>
537
                                <a href="javascript:confirm_delete_item([% books_loo.ordernumber %])" class="button">Delete order</a><br>
535
                            [% ELSE %]
536
                            <a href="javascript:confirm_delete_item([% books_loo.ordernumber %],[% books_loo.biblionumber %])" class="button">Delete order</a><br>
537
                            [% END %]
538
                            [% IF ( books_loo.can_del_bib ) %]
539
                            <a href="javascript:confirm_delete_biblio([% books_loo.ordernumber %],[% books_loo.biblionumber %])" class="button">Delete order and catalog record</a><br>
540
                            [% ELSE %]
538
                            [% ELSE %]
541
                            <span class="button" title="Can't delete catalog record, see constraints below">Can't delete order and catalog record</span><br>
539
                                [% IF ( books_loo.left_holds_on_order ) %]
542
                            [% END %]
540
                                <span class="button" title="Can't delete order, ([% books_loo.holds_on_order %]) holds are linked with this order cancel holds first">Can't delete order</span><br>
543
                            [% IF ( books_loo.left_item ) %]
541
                                [% ELSE %]
544
                            <b title="Can't delete catalog record, because of [% books_loo.items %] existing hold(s)" >[% books_loo.items %] item(s) left</b><br>
542
                                <a href="javascript:confirm_delete_item([% books_loo.ordernumber %],[% books_loo.biblionumber %])" class="button">Delete order</a><br>
545
                            [% END %]
543
                                [% END %]
546
                            [% IF ( books_loo.left_biblio ) %]
544
                                [% IF ( books_loo.can_del_bib ) %]
547
                            <b title="Can't delete catalog record, delete other orders linked to it first">[% books_loo.biblios %] order(s) left</b><br>
545
                                <a href="javascript:confirm_delete_biblio([% books_loo.ordernumber %],[% books_loo.biblionumber %])" class="button">Delete order and catalog record</a><br>
548
                            [% END %]
546
                                [% ELSE %]
549
                            [% IF ( books_loo.left_subscription ) %]
547
                                <span class="button" title="Can't delete catalog record, see constraints below">Can't delete order and catalog record</span><br>
550
                            <b title="Can't delete catalog record, delete subscriptions first">[% books_loo.subscriptions %] subscription(s) left</b><br>
548
                                [% END %]
551
                            [% END %]
549
                                [% IF ( books_loo.left_item ) %]
552
                            [% IF ( books_loo.left_holds ) %]
550
                                <b title="Can't delete catalog record, because of [% books_loo.items %] existing hold(s)" >[% books_loo.items %] item(s) left</b><br>
553
                            <b title="Can't delete catalog record or order, cancel holds first">[% books_loo.holds %] hold(s) left</b>
551
                                [% END %]
552
                                [% IF ( books_loo.left_biblio ) %]
553
                                <b title="Can't delete catalog record, delete other orders linked to it first">[% books_loo.biblios %] order(s) left</b><br>
554
                                [% END %]
555
                                [% IF ( books_loo.left_subscription ) %]
556
                                <b title="Can't delete catalog record, delete subscriptions first">[% books_loo.subscriptions %] subscription(s) left</b><br>
557
                                [% END %]
558
                                [% IF ( books_loo.left_holds ) %]
559
                                <b title="Can't delete catalog record or order, cancel holds first">[% books_loo.holds %] hold(s) left</b>
560
                                [% END %]
554
                            [% END %]
561
                            [% END %]
555
                            </td>
562
                            </td>
556
                            [% END %]
563
                            [% END %]
Lines 592-598 Link Here
592
                    <td>
599
                    <td>
593
                      <p>
600
                      <p>
594
                        [% IF ( order.order_received ) %] (rcvd)[% END %]
601
                        [% IF ( order.order_received ) %] (rcvd)[% END %]
595
                        [% IF (order.title) %]
602
                        [% IF (order.biblionumber) %]
596
                          [% order.title |html %] by [% order.author %]<br />
603
                          [% order.title |html %] by [% order.author %]<br />
597
                        [% ELSE %]
604
                        [% ELSE %]
598
                          <em>Deleted bibliographic record, can't find title</em><br />
605
                          <em>Deleted bibliographic record, can't find title</em><br />
599
- 

Return to bug 10869