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

(-)a/C4/Acquisition.pm (-5 / +6 lines)
Lines 1444-1450 C<$ordernumber>. Link Here
1444
sub ModReceiveOrder {
1444
sub ModReceiveOrder {
1445
    my (
1445
    my (
1446
        $biblionumber,    $ordernumber,  $quantrec, $user, $cost, $ecost,
1446
        $biblionumber,    $ordernumber,  $quantrec, $user, $cost, $ecost,
1447
        $invoiceid, $rrp, $budget_id, $datereceived, $received_items
1447
        $invoiceid, $rrp, $budget_id, $datereceived, $received_items, $notes
1448
    )
1448
    )
1449
    = @_;
1449
    = @_;
1450
1450
Lines 1475-1485 sub ModReceiveOrder { Link Here
1475
        $sth=$dbh->prepare("
1475
        $sth=$dbh->prepare("
1476
            UPDATE aqorders
1476
            UPDATE aqorders
1477
            SET quantity = ?,
1477
            SET quantity = ?,
1478
                orderstatus = 'partial'
1478
                orderstatus = 'partial',
1479
                notes = ?
1479
            WHERE ordernumber = ?
1480
            WHERE ordernumber = ?
1480
        ");
1481
        ");
1481
1482
1482
        $sth->execute($order->{quantity} - $quantrec, $ordernumber);
1483
        $sth->execute($order->{quantity} - $quantrec, $notes, $ordernumber);
1483
1484
1484
        $sth->finish;
1485
        $sth->finish;
1485
1486
Lines 1504-1512 sub ModReceiveOrder { Link Here
1504
    } else {
1505
    } else {
1505
        $sth=$dbh->prepare("update aqorders
1506
        $sth=$dbh->prepare("update aqorders
1506
                            set quantityreceived=?,datereceived=?,invoiceid=?,
1507
                            set quantityreceived=?,datereceived=?,invoiceid=?,
1507
                                unitprice=?,rrp=?,ecost=?,budget_id=?,orderstatus='complete'
1508
                                unitprice=?,rrp=?,ecost=?,budget_id=?,orderstatus='complete',notes=?
1508
                            where biblionumber=? and ordernumber=?");
1509
                            where biblionumber=? and ordernumber=?");
1509
        $sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$budget_id,$biblionumber,$ordernumber);
1510
        $sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$budget_id,$notes,$biblionumber,$ordernumber);
1510
        $sth->finish;
1511
        $sth->finish;
1511
    }
1512
    }
1512
    return ($datereceived, $new_ordernumber);
1513
    return ($datereceived, $new_ordernumber);
(-)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 168-178 my ($datereceived, $new_ordernumber) = ModReceiveOrder( Link Here
168
    12,
168
    12,
169
    $invoiceid,
169
    $invoiceid,
170
    42,
170
    42,
171
    undef,
172
    undef,
173
    undef,
174
    "my notes",
171
    );
175
    );
172
my $order2 = GetOrder( $ordernumber2 );
176
my $order2 = GetOrder( $ordernumber2 );
173
is($order2->{'quantityreceived'}, 0, 'Splitting up order did not receive any on original order');
177
is($order2->{'quantityreceived'}, 0, 'Splitting up order did not receive any on original order');
174
is($order2->{'quantity'}, 40, '40 items on original order');
178
is($order2->{'quantity'}, 40, '40 items on original order');
175
is($order2->{'budget_id'}, $budgetid, 'Budget on original order is unchanged');
179
is($order2->{'budget_id'}, $budgetid, 'Budget on original order is unchanged');
180
is($order2->{notes}, "my notes", 'ModReceiveOrder and GetOrder deal with notes');
176
181
177
$neworder = GetOrder( $new_ordernumber );
182
$neworder = GetOrder( $new_ordernumber );
178
is($neworder->{'quantity'}, 2, '2 items on new order');
183
is($neworder->{'quantity'}, 2, '2 items on new order');
Lines 195-207 my $budgetid2 = C4::Budgets::AddBudget( Link Here
195
    12,
200
    12,
196
    $invoiceid,
201
    $invoiceid,
197
    42,
202
    42,
198
    $budgetid2
203
    $budgetid2,
204
    undef,
205
    undef,
206
    "my other notes",
199
    );
207
    );
200
208
201
my $order3 = GetOrder( $ordernumber3 );
209
my $order3 = GetOrder( $ordernumber3 );
202
is($order3->{'quantityreceived'}, 0, 'Splitting up order did not receive any on original order');
210
is($order3->{'quantityreceived'}, 0, 'Splitting up order did not receive any on original order');
203
is($order3->{'quantity'}, 2, '2 items on original order');
211
is($order3->{'quantity'}, 2, '2 items on original order');
204
is($order3->{'budget_id'}, $budgetid, 'Budget on original order is unchanged');
212
is($order3->{'budget_id'}, $budgetid, 'Budget on original order is unchanged');
213
is($order3->{notes}, "my other notes", 'ModReceiveOrder and GetOrder deal with notes');
205
214
206
$neworder = GetOrder( $new_ordernumber );
215
$neworder = GetOrder( $new_ordernumber );
207
is($neworder->{'quantity'}, 2, '2 items on new order');
216
is($neworder->{'quantity'}, 2, '2 items on new order');
Lines 217-228 is($neworder->{'budget_id'}, $budgetid2, 'Budget on new order is changed'); Link Here
217
    12,
226
    12,
218
    $invoiceid,
227
    $invoiceid,
219
    42,
228
    42,
220
    $budgetid2
229
    $budgetid2,
230
    undef,
231
    undef,
232
    "my third notes",
221
    );
233
    );
222
234
223
$order3 = GetOrder( $ordernumber3 );
235
$order3 = GetOrder( $ordernumber3 );
224
is($order3->{'quantityreceived'}, 2, 'Order not split up');
236
is($order3->{'quantityreceived'}, 2, 'Order not split up');
225
is($order3->{'quantity'}, 2, '2 items on order');
237
is($order3->{'quantity'}, 2, '2 items on order');
226
is($order3->{'budget_id'}, $budgetid2, 'Budget has changed');
238
is($order3->{'budget_id'}, $budgetid2, 'Budget has changed');
239
is($order3->{notes}, "my third notes", 'ModReceiveOrder and GetOrder deal with notes');
227
240
228
$dbh->rollback;
241
$dbh->rollback;
229
- 

Return to bug 11699