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

(-)a/acqui/neworderempty.pl (-4 / +9 lines)
Lines 108-114 my $suggestionid = $input->param('suggestionid'); Link Here
108
my $close           = $input->param('close');
108
my $close           = $input->param('close');
109
my $uncertainprice  = $input->param('uncertainprice');
109
my $uncertainprice  = $input->param('uncertainprice');
110
my $import_batch_id = $input->param('import_batch_id'); # if this is filled, we come from a staged file, and we will return here after saving the order !
110
my $import_batch_id = $input->param('import_batch_id'); # if this is filled, we come from a staged file, and we will return here after saving the order !
111
my $subscriptionid  = $input->param('subscriptionid');
111
my $from_subscriptionid  = $input->param('from_subscriptionid');
112
my $data;
112
my $data;
113
my $new = 'no';
113
my $new = 'no';
114
114
Lines 262-267 else { #modify order Link Here
262
    $biblionumber = $data->{'biblionumber'};
262
    $biblionumber = $data->{'biblionumber'};
263
    $budget_id = $data->{'budget_id'};
263
    $budget_id = $data->{'budget_id'};
264
264
265
    $template->param(
266
        subscriptionid => $data->{subscriptionid},
267
    );
268
265
    $basket   = GetBasket( $data->{'basketno'} );
269
    $basket   = GetBasket( $data->{'basketno'} );
266
    $basketno = $basket->{'basketno'};
270
    $basketno = $basket->{'basketno'};
267
271
Lines 358-365 if ($basketobj->effective_create_items eq 'ordering' && !$ordernumber) { Link Here
358
my @itemtypes;
362
my @itemtypes;
359
@itemtypes = Koha::ItemTypes->search unless C4::Context->preference('item-level_itypes');
363
@itemtypes = Koha::ItemTypes->search unless C4::Context->preference('item-level_itypes');
360
364
361
if ( defined $subscriptionid ) {
365
if ( defined $from_subscriptionid ) {
362
    my $lastOrderReceived = GetLastOrderReceivedFromSubscriptionid $subscriptionid;
366
    my $lastOrderReceived = GetLastOrderReceivedFromSubscriptionid $from_subscriptionid;
363
    if ( defined $lastOrderReceived ) {
367
    if ( defined $lastOrderReceived ) {
364
        $budget_id              = $lastOrderReceived->{budgetid};
368
        $budget_id              = $lastOrderReceived->{budgetid};
365
        $data->{listprice}      = $lastOrderReceived->{listprice};
369
        $data->{listprice}      = $lastOrderReceived->{listprice};
Lines 377-382 if ( defined $subscriptionid ) { Link Here
377
381
378
        $basket = GetBasket( $input->param('basketno') );
382
        $basket = GetBasket( $input->param('basketno') );
379
    }
383
    }
384
385
    $template->param( subscriptionid => $from_subscriptionid );
380
}
386
}
381
387
382
# Find the items.barcode subfield for barcode validations
388
# Find the items.barcode subfield for barcode validations
Lines 457-463 $template->param( Link Here
457
    publishercode    => $data->{'publishercode'},
463
    publishercode    => $data->{'publishercode'},
458
    barcode_subfield => $barcode_subfield,
464
    barcode_subfield => $barcode_subfield,
459
    import_batch_id  => $import_batch_id,
465
    import_batch_id  => $import_batch_id,
460
    subscriptionid   => $subscriptionid,
461
    acqcreate        => $basketobj->effective_create_items eq "ordering" ? 1 : "",
466
    acqcreate        => $basketobj->effective_create_items eq "ordering" ? 1 : "",
462
    users_ids        => join(':', @order_user_ids),
467
    users_ids        => join(':', @order_user_ids),
463
    users            => \@order_users,
468
    users            => \@order_users,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-2 / +1 lines)
Lines 71-77 Link Here
71
                                        Outstanding order
71
                                        Outstanding order
72
                                    [% END %]
72
                                    [% END %]
73
                                    [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid%]
73
                                    [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid%]
74
                                        <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;biblionumber=[% sub.biblionumber %]&amp;subscriptionid=[% sub.subscriptionid %]" title="Order this one">
74
                                        <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;biblionumber=[% sub.biblionumber %]&amp;from_subscriptionid=[% sub.subscriptionid %]" title="Order this one">
75
                                            Order
75
                                            Order
76
                                        </a>
76
                                        </a>
77
                                    [% ELSE %]
77
                                    [% ELSE %]
78
- 

Return to bug 19030