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

(-)a/C4/Circulation.pm (+3 lines)
Lines 1801-1806 sub AddReturn { Link Here
1801
    unless ($item) {
1801
    unless ($item) {
1802
        return ( 0, { BadBarcode => $barcode } );    # no barcode means no item or borrower.  bail out.
1802
        return ( 0, { BadBarcode => $barcode } );    # no barcode means no item or borrower.  bail out.
1803
    }
1803
    }
1804
    if ($item->{deleted_at}) {
1805
        return ( 0, { BadBarcode => $barcode } );
1806
    }
1804
1807
1805
    my $itemnumber = $item->{ itemnumber };
1808
    my $itemnumber = $item->{ itemnumber };
1806
    my $itemtype = $item->{itype}; # GetItem called effective_itemtype
1809
    my $itemtype = $item->{itype}; # GetItem called effective_itemtype
(-)a/t/db_dependent/Acquisition.t (-2 / +2 lines)
Lines 513-519 ok((not defined $error), "DelOrder does not fail"); Link Here
513
$order2 = GetOrder($order2->{ordernumber});
513
$order2 = GetOrder($order2->{ordernumber});
514
ok((defined $order2->{datecancellationprinted}), "order is cancelled");
514
ok((defined $order2->{datecancellationprinted}), "order is cancelled");
515
ok((not defined $order2->{cancellationreason}), "order has no cancellation reason");
515
ok((not defined $order2->{cancellationreason}), "order has no cancellation reason");
516
ok((not defined Koha::Biblios->find( $order2->{biblionumber} )), "biblio does not exist anymore");
516
ok(Koha::Biblios->find($order2->{biblionumber})->deleted_at , "biblio does not exist anymore");
517
517
518
my $order4 = GetOrder($ordernumbers[3]);
518
my $order4 = GetOrder($ordernumbers[3]);
519
$error = DelOrder($order4->{biblionumber}, $order4->{ordernumber}, 1, "foobar");
519
$error = DelOrder($order4->{biblionumber}, $order4->{ordernumber}, 1, "foobar");
Lines 521-527 ok((not defined $error), "DelOrder does not fail"); Link Here
521
$order4 = GetOrder($order4->{ordernumber});
521
$order4 = GetOrder($order4->{ordernumber});
522
ok((defined $order4->{datecancellationprinted}), "order is cancelled");
522
ok((defined $order4->{datecancellationprinted}), "order is cancelled");
523
ok(($order4->{cancellationreason} eq "foobar"), "order has cancellation reason \"foobar\"");
523
ok(($order4->{cancellationreason} eq "foobar"), "order has cancellation reason \"foobar\"");
524
ok((not defined Koha::Biblios->find( $order4->{biblionumber} )), "biblio does not exist anymore");
524
ok(Koha::Biblios->find($order4->{biblionumber})->deleted_at, "biblio does not exist anymore");
525
525
526
my $order5 = GetOrder($ordernumbers[4]);
526
my $order5 = GetOrder($ordernumbers[4]);
527
C4::Items::AddItem( { barcode => '0102030405' }, $order5->{biblionumber} );
527
C4::Items::AddItem( { barcode => '0102030405' }, $order5->{biblionumber} );
(-)a/t/db_dependent/Items_DelItemCheck.t (-1 / +1 lines)
Lines 161-167 DelItemCheck( $biblio->{biblionumber}, $item->{itemnumber} ); Link Here
161
161
162
my $test_item = GetItem( $item->{itemnumber} );
162
my $test_item = GetItem( $item->{itemnumber} );
163
163
164
is( $test_item->{itemnumber}, undef,
164
isnt( $test_item->{deleted_at}, undef,
165
    "DelItemCheck should delete item if ItemSafeToDelete returns true"
165
    "DelItemCheck should delete item if ItemSafeToDelete returns true"
166
);
166
);
167
167
(-)a/t/db_dependent/db_structure.t (-3 lines)
Lines 22-30 use Koha::Database; Link Here
22
22
23
my @modules = (
23
my @modules = (
24
    [ qw( Borrower Deletedborrower ) ],
24
    [ qw( Borrower Deletedborrower ) ],
25
    [ qw( Biblio Deletedbiblio ) ],
26
    [ qw( Biblioitem Deletedbiblioitem ) ],
27
    [ qw( Item Deleteditem ) ],
28
);
25
);
29
26
30
my @keys_to_check = qw( size is_nullable data_type accessor datetime_undef_if_invalid default_value );
27
my @keys_to_check = qw( size is_nullable data_type accessor datetime_undef_if_invalid default_value );
(-)a/t/lib/TestBuilder.pm (-1 / +10 lines)
Lines 470-477 sub _gen_default_values { Link Here
470
            debarred       => undef,
470
            debarred       => undef,
471
            borrowernotes  => '',
471
            borrowernotes  => '',
472
        },
472
        },
473
        Biblio => {
474
            deleted_at => undef,
475
        },
476
        Biblioitems => {
477
            deleted_at => undef,
478
        },
479
        BiblioMetadata => {
480
            deleted_at => undef,
481
        },
473
        Item => {
482
        Item => {
474
            more_subfields_xml => undef,
483
            more_subfields_xml => undef,
484
            deleted_at => undef,
475
        },
485
        },
476
        Category => {
486
        Category => {
477
            enrolmentfee => 0,
487
            enrolmentfee => 0,
478
- 

Return to bug 20271