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

(-)a/C4/Acquisition.pm (-5 / +6 lines)
Lines 1435-1441 C<$ordernumber>. Link Here
1435
sub ModReceiveOrder {
1435
sub ModReceiveOrder {
1436
    my (
1436
    my (
1437
        $biblionumber,    $ordernumber,  $quantrec, $user, $cost, $ecost,
1437
        $biblionumber,    $ordernumber,  $quantrec, $user, $cost, $ecost,
1438
        $invoiceid, $rrp, $budget_id, $datereceived, $received_items
1438
        $invoiceid, $rrp, $budget_id, $datereceived, $received_items, $notes
1439
    )
1439
    )
1440
    = @_;
1440
    = @_;
1441
1441
Lines 1466-1476 q{SELECT * FROM aqorders WHERE biblionumber=? AND aqorders.ordernumber=?}, Link Here
1466
        my $sth=$dbh->prepare("
1466
        my $sth=$dbh->prepare("
1467
            UPDATE aqorders
1467
            UPDATE aqorders
1468
            SET quantity = ?,
1468
            SET quantity = ?,
1469
                orderstatus = 'partial'
1469
                orderstatus = 'partial',
1470
                notes = ?
1470
            WHERE ordernumber = ?
1471
            WHERE ordernumber = ?
1471
        ");
1472
        ");
1472
1473
1473
        $sth->execute($order->{quantity} - $quantrec, $ordernumber);
1474
        $sth->execute($order->{quantity} - $quantrec, $notes, $ordernumber);
1474
1475
1475
        delete $order->{'ordernumber'};
1476
        delete $order->{'ordernumber'};
1476
        $order->{'budget_id'} = ( $budget_id || $order->{'budget_id'} );
1477
        $order->{'budget_id'} = ( $budget_id || $order->{'budget_id'} );
Lines 1493-1501 q{SELECT * FROM aqorders WHERE biblionumber=? AND aqorders.ordernumber=?}, Link Here
1493
    } else {
1494
    } else {
1494
        my $sth=$dbh->prepare("update aqorders
1495
        my $sth=$dbh->prepare("update aqorders
1495
                            set quantityreceived=?,datereceived=?,invoiceid=?,
1496
                            set quantityreceived=?,datereceived=?,invoiceid=?,
1496
                                unitprice=?,rrp=?,ecost=?,budget_id=?,orderstatus='complete'
1497
                                unitprice=?,rrp=?,ecost=?,budget_id=?,orderstatus='complete',notes=?
1497
                            where biblionumber=? and ordernumber=?");
1498
                            where biblionumber=? and ordernumber=?");
1498
        $sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$budget_id,$biblionumber,$ordernumber);
1499
        $sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$budget_id,$notes,$biblionumber,$ordernumber);
1499
    }
1500
    }
1500
    return ($datereceived, $new_ordernumber);
1501
    return ($datereceived, $new_ordernumber);
1501
}
1502
}
(-)a/acqui/finishreceive.pl (-1 / +2 lines)
Lines 53-59 my $booksellerid = $input->param('booksellerid'); Link Here
53
my $cnt              = 0;
53
my $cnt              = 0;
54
my $ecost            = $input->param('ecost');
54
my $ecost            = $input->param('ecost');
55
my $rrp              = $input->param('rrp');
55
my $rrp              = $input->param('rrp');
56
my $note             = $input->param("note");
56
my $notes            = $input->param("notes");
57
my $bookfund         = $input->param("bookfund");
57
my $bookfund         = $input->param("bookfund");
58
my $order            = GetOrder($ordernumber);
58
my $order            = GetOrder($ordernumber);
59
my $new_ordernumber  = $ordernumber;
59
my $new_ordernumber  = $ordernumber;
Lines 112-117 if ($quantityrec > $origquantityrec ) { Link Here
112
            $bookfund,
112
            $bookfund,
113
            $datereceived,
113
            $datereceived,
114
            \@received_items,
114
            \@received_items,
115
            $notes,
115
        );
116
        );
116
    }
117
    }
117
118
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-1 / +1 lines)
Lines 329-335 Link Here
329
        [% ELSE %]
329
        [% ELSE %]
330
            <input type="text" size="20" name="cost" id="cost" value="[% ecost %]" />
330
            <input type="text" size="20" name="cost" id="cost" value="[% ecost %]" />
331
        [% END %]</li></ol>
331
        [% END %]</li></ol>
332
        <label for="note">Notes: </label><textarea name="note" width="40" rows="8" >[% notes %]</textarea>
332
        <label for="note">Notes: </label><textarea name="notes" width="40" rows="8" >[% notes %]</textarea>
333
    </fieldset>
333
    </fieldset>
334
334
335
</div>
335
</div>
(-)a/t/db_dependent/Acquisition.t (-4 / +16 lines)
Lines 8-14 use POSIX qw(strftime); Link Here
8
8
9
use C4::Bookseller qw( GetBookSellerFromId );
9
use C4::Bookseller qw( GetBookSellerFromId );
10
10
11
use Test::More tests => 63;
11
use Test::More tests => 66;
12
12
13
BEGIN {
13
BEGIN {
14
    use_ok('C4::Acquisition');
14
    use_ok('C4::Acquisition');
Lines 167-177 my ($datereceived, $new_ordernumber) = ModReceiveOrder( Link Here
167
    12,
167
    12,
168
    $invoiceid,
168
    $invoiceid,
169
    42,
169
    42,
170
    undef,
171
    undef,
172
    undef,
173
    "my notes",
170
    );
174
    );
171
my $order2 = GetOrder( $ordernumber2 );
175
my $order2 = GetOrder( $ordernumber2 );
172
is($order2->{'quantityreceived'}, 0, 'Splitting up order did not receive any on original order');
176
is($order2->{'quantityreceived'}, 0, 'Splitting up order did not receive any on original order');
173
is($order2->{'quantity'}, 40, '40 items on original order');
177
is($order2->{'quantity'}, 40, '40 items on original order');
174
is($order2->{'budget_id'}, $budgetid, 'Budget on original order is unchanged');
178
is($order2->{'budget_id'}, $budgetid, 'Budget on original order is unchanged');
179
is($order2->{notes}, "my notes", 'ModReceiveOrder and GetOrder deal with notes');
175
180
176
$neworder = GetOrder( $new_ordernumber );
181
$neworder = GetOrder( $new_ordernumber );
177
is($neworder->{'quantity'}, 2, '2 items on new order');
182
is($neworder->{'quantity'}, 2, '2 items on new order');
Lines 194-206 my $budgetid2 = C4::Budgets::AddBudget( Link Here
194
    12,
199
    12,
195
    $invoiceid,
200
    $invoiceid,
196
    42,
201
    42,
197
    $budgetid2
202
    $budgetid2,
203
    undef,
204
    undef,
205
    "my other notes",
198
    );
206
    );
199
207
200
my $order3 = GetOrder( $ordernumber3 );
208
my $order3 = GetOrder( $ordernumber3 );
201
is($order3->{'quantityreceived'}, 0, 'Splitting up order did not receive any on original order');
209
is($order3->{'quantityreceived'}, 0, 'Splitting up order did not receive any on original order');
202
is($order3->{'quantity'}, 2, '2 items on original order');
210
is($order3->{'quantity'}, 2, '2 items on original order');
203
is($order3->{'budget_id'}, $budgetid, 'Budget on original order is unchanged');
211
is($order3->{'budget_id'}, $budgetid, 'Budget on original order is unchanged');
212
is($order3->{notes}, "my other notes", 'ModReceiveOrder and GetOrder deal with notes');
204
213
205
$neworder = GetOrder( $new_ordernumber );
214
$neworder = GetOrder( $new_ordernumber );
206
is($neworder->{'quantity'}, 2, '2 items on new order');
215
is($neworder->{'quantity'}, 2, '2 items on new order');
Lines 216-227 is($neworder->{'budget_id'}, $budgetid2, 'Budget on new order is changed'); Link Here
216
    12,
225
    12,
217
    $invoiceid,
226
    $invoiceid,
218
    42,
227
    42,
219
    $budgetid2
228
    $budgetid2,
229
    undef,
230
    undef,
231
    "my third notes",
220
    );
232
    );
221
233
222
$order3 = GetOrder( $ordernumber3 );
234
$order3 = GetOrder( $ordernumber3 );
223
is($order3->{'quantityreceived'}, 2, 'Order not split up');
235
is($order3->{'quantityreceived'}, 2, 'Order not split up');
224
is($order3->{'quantity'}, 2, '2 items on order');
236
is($order3->{'quantity'}, 2, '2 items on order');
225
is($order3->{'budget_id'}, $budgetid2, 'Budget has changed');
237
is($order3->{'budget_id'}, $budgetid2, 'Budget has changed');
238
is($order3->{notes}, "my third notes", 'ModReceiveOrder and GetOrder deal with notes');
226
239
227
$dbh->rollback;
240
$dbh->rollback;
228
- 

Return to bug 11699