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

(-)a/C4/Acquisition.pm (-9 / +10 lines)
Lines 1908-1929 sub DelOrder { Link Here
1908
        $query .= ", cancellationreason = ? ";
1908
        $query .= ", cancellationreason = ? ";
1909
    }
1909
    }
1910
    $query .= "
1910
    $query .= "
1911
        WHERE biblionumber=? AND ordernumber=?
1911
        WHERE ordernumber=?
1912
    ";
1912
    ";
1913
    my $sth = $dbh->prepare($query);
1913
    my $sth = $dbh->prepare($query);
1914
    if($reason) {
1914
    if($reason) {
1915
        $sth->execute($reason, $bibnum, $ordernumber);
1915
        $sth->execute($reason, $ordernumber);
1916
    } else {
1916
    } else {
1917
        $sth->execute( $bibnum, $ordernumber );
1917
        $sth->execute( $ordernumber );
1918
    }
1918
    }
1919
    $sth->finish;
1919
    $sth->finish;
1920
    if ($bibnum) {
1921
        my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
1922
        foreach my $itemnumber (@itemnumbers){
1923
            my $delcheck = C4::Items::DelItemCheck( $bibnum, $itemnumber );
1920
1924
1921
    my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
1925
            if($delcheck != 1) {
1922
    foreach my $itemnumber (@itemnumbers){
1926
                $error->{'delitem'} = 1;
1923
        my $delcheck = C4::Items::DelItemCheck( $bibnum, $itemnumber );
1927
            }
1924
1925
        if($delcheck != 1) {
1926
            $error->{'delitem'} = 1;
1927
        }
1928
        }
1928
    }
1929
    }
1929
1930
(-)a/acqui/basket.pl (-1 / +1 lines)
Lines 124-130 if ( $op eq 'delete_confirm' ) { Link Here
124
    my @orders = GetOrders($basketno);
124
    my @orders = GetOrders($basketno);
125
#Delete all orders included in that basket, and all items received.
125
#Delete all orders included in that basket, and all items received.
126
    foreach my $myorder (@orders){
126
    foreach my $myorder (@orders){
127
        DelOrder($myorder->{biblionumber},$myorder->{ordernumber});
127
        DelOrder($myorder->{biblionumber} || '', $myorder->{ordernumber});
128
    }
128
    }
129
# if $delbiblio = 1, delete the records if possible
129
# if $delbiblio = 1, delete the records if possible
130
    if ((defined $delbiblio)and ($delbiblio ==1)){
130
    if ((defined $delbiblio)and ($delbiblio ==1)){
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-2 / +6 lines)
Lines 500-505 Link Here
500
                                [% END %]
500
                                [% END %]
501
                            </td>
501
                            </td>
502
                            <td>
502
                            <td>
503
                            [% UNLESS (books_loo.biblionumber) %]
504
                               <a href="javascript:confirm_delete_item([% books_loo.ordernumber | html %])" class="button">Delete order</a><br>
505
                            [% ELSE %]
506
503
                            [% IF ( books_loo.left_holds_on_order ) %]
507
                            [% IF ( books_loo.left_holds_on_order ) %]
504
                            <span class="button" title="Can't cancel order, ([% books_loo.holds_on_order | html %]) holds are linked with this order cancel holds first">Can't cancel order</span><br>
508
                            <span class="button" title="Can't cancel order, ([% books_loo.holds_on_order | html %]) holds are linked with this order cancel holds first">Can't cancel order</span><br>
505
                            [% ELSE %]
509
                            [% ELSE %]
Lines 522-527 Link Here
522
                            [% IF ( books_loo.left_holds ) %]
526
                            [% IF ( books_loo.left_holds ) %]
523
                            <b title="Can't delete catalog record or order, cancel holds first">[% books_loo.holds | html %] hold(s) left</b>
527
                            <b title="Can't delete catalog record or order, cancel holds first">[% books_loo.holds | html %] hold(s) left</b>
524
                            [% END %]
528
                            [% END %]
529
                            [% END %]
525
                            </td>
530
                            </td>
526
                            [% END %]
531
                            [% END %]
527
                        [% END %]
532
                        [% END %]
Lines 563-569 Link Here
563
                    <td>
568
                    <td>
564
                      <p>
569
                      <p>
565
                        [% IF ( order.order_received ) %] (rcvd)[% END %]
570
                        [% IF ( order.order_received ) %] (rcvd)[% END %]
566
                        [% IF (order.title) %]
571
                        [% IF (order.biblionumber) %]
567
                          [% order.title | html %][% IF order.author %] by [% order.author | html %][% END %]
572
                          [% order.title | html %][% IF order.author %] by [% order.author | html %][% END %]
568
                        [% ELSE %]
573
                        [% ELSE %]
569
                          <em>Deleted bibliographic record, can't find title</em>
574
                          <em>Deleted bibliographic record, can't find title</em>
570
- 

Return to bug 10869