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

(-)a/acqui/addorder.pl (-4 / +3 lines)
Lines 131-137 use C4::Output; Link Here
131
use Koha::Acquisition::Currencies;
131
use Koha::Acquisition::Currencies;
132
use Koha::Acquisition::Orders;
132
use Koha::Acquisition::Orders;
133
use C4::Barcodes;
133
use C4::Barcodes;
134
use Data::Dumper;
135
### "-------------------- addorder.pl ----------"
134
### "-------------------- addorder.pl ----------"
136
135
137
# FIXME: This needs to do actual error checking and possibly return user to the same form,
136
# FIXME: This needs to do actual error checking and possibly return user to the same form,
Lines 268-279 if ( $basket->{is_standing} || $orderinfo->{quantity} ne '0' ) { Link Here
268
    $orderinfo->{unitprice} = $orderinfo->{ecost} if not defined $orderinfo->{unitprice} or $orderinfo->{unitprice} eq '';
267
    $orderinfo->{unitprice} = $orderinfo->{ecost} if not defined $orderinfo->{unitprice} or $orderinfo->{unitprice} eq '';
269
268
270
    my $modify = $input->param('modify');
269
    my $modify = $input->param('modify');
271
    if ($orderinfo->{ordernumber} && !$modify) {
270
    if (!$modify) {
272
        $orderinfo = C4::Acquisition::populate_order_with_prices(
271
        $orderinfo = C4::Acquisition::populate_order_with_prices(
273
            {
272
            {
274
               order        => $orderinfo,
273
               order        => $orderinfo,
275
               booksellerid => $orderinfo->{booksellerid},
274
               booksellerid => $orderinfo->{booksellerid},
276
               receiving     => 1,
275
               ordering     => 1,
277
            }
276
            }
278
        );
277
        );
279
    } elsif ( $modify ) {
278
    } elsif ( $modify ) {
Lines 281-287 if ( $basket->{is_standing} || $orderinfo->{quantity} ne '0' ) { Link Here
281
            {
280
            {
282
                order       => $orderinfo,
281
                order       => $orderinfo,
283
                booksellerid  => $orderinfo->{booksellerid},
282
                booksellerid  => $orderinfo->{booksellerid},
284
                ordering => 1,
283
                receiving => 1,
285
            }
284
            }
286
        );
285
        );
287
    }
286
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-1 / +1 lines)
Lines 487-493 Link Here
487
                        [% IF ( active ) %]
487
                        [% IF ( active ) %]
488
                            [% UNLESS ( closedate ) %]
488
                            [% UNLESS ( closedate ) %]
489
                            <td>
489
                            <td>
490
                                <a href="neworderempty.pl?ordernumber=[% books_loo.ordernumber %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;modifying=1">Modify</a>
490
                                <a href="neworderempty.pl?ordernumber=[% books_loo.ordernumber %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">Modify</a>
491
                                [% UNLESS (books_loo.order_received) %]
491
                                [% UNLESS (books_loo.order_received) %]
492
                                    <br />
492
                                    <br />
493
                                    <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber %]">Transfer</a>
493
                                    <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber %]">Transfer</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-2 / +1 lines)
Lines 275-281 Link Here
275
                  [% END %]
275
                  [% END %]
276
                </td>
276
                </td>
277
                <td>
277
                <td>
278
                  <a href="neworderempty.pl?ordernumber=[% order.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% order.ordernumber %]</a>
278
                  <a href="neworderempty.pl?ordernumber=[% order.ordernumber %]&amp;booksellerid=[% booksellerid %]&amp;modifying=1">[% order.ordernumber %]</a>
279
                  [% IF (order.parent_ordernumber && (order.parent_ordernumber != order.ordernumber)) %]
279
                  [% IF (order.parent_ordernumber && (order.parent_ordernumber != order.ordernumber)) %]
280
                    (<a href="neworderempty.pl?ordernumber=[% order.parent_ordernumber %]&amp;booksellerid=[% booksellerid %]" title="Original order line">[% order.parent_ordernumber %]</a>)
280
                    (<a href="neworderempty.pl?ordernumber=[% order.parent_ordernumber %]&amp;booksellerid=[% booksellerid %]" title="Original order line">[% order.parent_ordernumber %]</a>)
281
                  [% END %]
281
                  [% END %]
282
- 

Return to bug 19780