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

(-)a/Koha/Acquisition/Order.pm (-1 / +2 lines)
Lines 51-57 sub insert { Link Here
51
    $self->{ordernumber} = $rs->id;
51
    $self->{ordernumber} = $rs->id;
52
52
53
    unless ( $self->{parent_ordernumber} ) {
53
    unless ( $self->{parent_ordernumber} ) {
54
        $rs->update( { parent_ordernumber => $self->{ordernumber} } );
54
        $self->{parent_ordernumber} = $self->{ordernumber};
55
        $rs->update( { parent_ordernumber => $self->{parent_ordernumber} } );
55
    }
56
    }
56
57
57
    return $self;
58
    return $self;
(-)a/t/db_dependent/Acquisition/CancelReceipt.t (-3 / +42 lines)
Lines 2-8 Link Here
2
2
3
use Modern::Perl;
3
use Modern::Perl;
4
4
5
use Test::More tests => 4;
5
use Test::More tests => 12;
6
use C4::Context;
6
use C4::Context;
7
use C4::Acquisition;
7
use C4::Acquisition;
8
use C4::Biblio;
8
use C4::Biblio;
Lines 85-93 $order = Koha::Acquisition::Order->new( Link Here
85
)->insert;
85
)->insert;
86
$ordernumber = $order->{ordernumber};
86
$ordernumber = $order->{ordernumber};
87
87
88
is( $order->{parent_ordernumber}, $order->{ordernumber},
89
    "Insert an order should set parent_order=ordernumber, if no parent_ordernumber given"
90
);
91
88
$order->add_item( $itemnumber1 );
92
$order->add_item( $itemnumber1 );
89
$order->add_item( $itemnumber2 );
93
$order->add_item( $itemnumber2 );
90
94
95
is(
96
    scalar( GetItemnumbersFromOrder( $order->{ordernumber} ) ),
97
    2,
98
    "Create items on ordering: 2 items should be linked to the order before receiving"
99
);
100
91
my ( undef, $new_ordernumber ) = ModReceiveOrder(
101
my ( undef, $new_ordernumber ) = ModReceiveOrder(
92
    {
102
    {
93
        biblionumber     => $biblionumber,
103
        biblionumber     => $biblionumber,
Lines 98-106 my ( undef, $new_ordernumber ) = ModReceiveOrder( Link Here
98
    }
108
    }
99
);
109
);
100
110
111
my $new_order = GetOrder( $new_ordernumber );
112
113
is( $new_order->{ordernumber}, $new_ordernumber,
114
    "ModReceiveOrder should return a correct ordernumber" );
115
isnt( $new_ordernumber, $ordernumber,
116
    "ModReceiveOrder should return a different ordernumber" );
117
is( $new_order->{parent_ordernumber}, $ordernumber,
118
    "The new order created by ModReceiveOrder should be linked to the parent order"
119
);
120
121
is(
122
    scalar( GetItemnumbersFromOrder( $order->{ordernumber} ) ),
123
    1,
124
    "Create items on ordering: 1 item should still be linked to the original order after receiving"
125
);
126
is(
127
    scalar( GetItemnumbersFromOrder($new_ordernumber) ),
128
    1,
129
    "Create items on ordering: 1 item should be linked to new order after receiving"
130
);
131
101
CancelReceipt($new_ordernumber);
132
CancelReceipt($new_ordernumber);
102
133
103
is(scalar( GetItemnumbersFromOrder($ordernumber) ), 2, "Create items on ordering: items are not deleted after cancelling a receipt");
134
is(
135
    scalar( GetItemnumbersFromOrder($new_ordernumber) ),
136
    0,
137
    "Create items on ordering: no item should be linked to the cancelled order"
138
);
139
is(
140
    scalar( GetItemnumbersFromOrder( $order->{ordernumber} ) ),
141
    2,
142
    "Create items on ordering: items are not deleted after cancelling a receipt"
143
);
104
144
105
my $item1 = C4::Items::GetItem( $itemnumber1 );
145
my $item1 = C4::Items::GetItem( $itemnumber1 );
106
is( $item1->{notforloan}, 9, "The notforloan value has been updated with '9'" );
146
is( $item1->{notforloan}, 9, "The notforloan value has been updated with '9'" );
107
- 

Return to bug 13319