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

(-)a/C4/Acquisition.pm (-6 / +2 lines)
Lines 509-522 sub ModBasket { Link Here
509
509
510
    # Log the basket update
510
    # Log the basket update
511
    if (C4::Context->preference("AcqLog")) {
511
    if (C4::Context->preference("AcqLog")) {
512
        my $infos = $basketinfo->{borrowernumber} ?
513
            sprintf("%010d", $basketinfo->{borrowernumber}) :
514
            undef;
515
        logaction(
512
        logaction(
516
            'ACQUISITIONS',
513
            'ACQUISITIONS',
517
            'MODIFY_BASKET',
514
            'MODIFY_BASKET',
518
            $basketinfo->{'basketno'},
515
            $basketinfo->{'basketno'}
519
            $infos
520
        );
516
        );
521
    }
517
    }
522
518
Lines 559-565 case the AcqCreateItem syspref takes precedence). Link Here
559
=cut
555
=cut
560
556
561
sub ModBasketHeader {
557
sub ModBasketHeader {
562
    my ($basketno, $basketname, $note, $booksellernote, $contractnumber, $booksellerid, $deliveryplace, $billingplace, $is_standing, $create_items, $borrowernumber) = @_;
558
    my ($basketno, $basketname, $note, $booksellernote, $contractnumber, $booksellerid, $deliveryplace, $billingplace, $is_standing, $create_items) = @_;
563
559
564
    $is_standing ||= 0;
560
    $is_standing ||= 0;
565
    my $query = qq{
561
    my $query = qq{
(-)a/acqui/addorder.pl (-2 / +1 lines)
Lines 365-372 if (C4::Context->preference("AcqLog") && $basketno) { Link Here
365
    logaction(
365
    logaction(
366
        'ACQUISITIONS',
366
        'ACQUISITIONS',
367
        'MODIFY_BASKET',
367
        'MODIFY_BASKET',
368
        $basketno,
368
        $basketno
369
        sprintf("%010d", $loggedinuser)
370
    );
369
    );
371
}
370
}
372
371
(-)a/acqui/basket.pl (-6 / +3 lines)
Lines 210-217 if ( $op eq 'delete_confirm' ) { Link Here
210
                            closed => 1,
210
                            closed => 1,
211
                            });
211
                            });
212
            ModBasket( { basketno => $basketno,
212
            ModBasket( { basketno => $basketno,
213
                         basketgroupid => $basketgroupid,
213
                         basketgroupid => $basketgroupid } );
214
                         borrowernumber => $loggedinuser } );
215
            print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1');
214
            print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1');
216
        } else {
215
        } else {
217
            print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid);
216
            print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid);
Lines 244-251 elsif ( $op eq 'ediorder' ) { Link Here
244
    $branch = undef if(defined $branch and $branch eq '');
243
    $branch = undef if(defined $branch and $branch eq '');
245
    ModBasket({
244
    ModBasket({
246
        basketno => $basket->{basketno},
245
        basketno => $basket->{basketno},
247
        branch   => $branch,
246
        branch   => $branch
248
        borrowernumber => $loggedinuser
249
    });
247
    });
250
    print $query->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=$basketno");
248
    print $query->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=$basketno");
251
    exit;
249
    exit;
Lines 561-568 sub edi_close_and_order { Link Here
561
            ModBasket(
559
            ModBasket(
562
                {
560
                {
563
                    basketno       => $basketno,
561
                    basketno       => $basketno,
564
                    basketgroupid  => $basketgroupid,
562
                    basketgroupid  => $basketgroupid
565
                    borrowernumber => $loggedinuser
566
                }
563
                }
567
            );
564
            );
568
            print $query->redirect(
565
            print $query->redirect(
(-)a/acqui/basketheader.pl (-3 / +1 lines)
Lines 153-160 if ( $op eq 'add_form' ) { Link Here
153
            scalar $input->param('deliveryplace'),
153
            scalar $input->param('deliveryplace'),
154
            scalar $input->param('billingplace'),
154
            scalar $input->param('billingplace'),
155
            scalar $input->param('is_standing') ? 1 : undef,
155
            scalar $input->param('is_standing') ? 1 : undef,
156
            scalar $input->param('create_items'),
156
            scalar $input->param('create_items')
157
            $loggedinuser
158
        );
157
        );
159
    } else { #New basket
158
    } else { #New basket
160
        $basketno = NewBasket(
159
        $basketno = NewBasket(
161
- 

Return to bug 23971