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

(-)a/acqui/neworderempty.pl (+2 lines)
Lines 375-380 if ( defined $from_subscriptionid ) { Link Here
375
        $data->{replacementprice} = $lastOrderReceived->{replacementprice};
375
        $data->{replacementprice} = $lastOrderReceived->{replacementprice};
376
        $data->{ecost}          = $lastOrderReceived->{ecost};
376
        $data->{ecost}          = $lastOrderReceived->{ecost};
377
        $data->{quantity}       = $lastOrderReceived->{quantity};
377
        $data->{quantity}       = $lastOrderReceived->{quantity};
378
        $data->{unitprice}       = $lastOrderReceived->{unitprice};
378
        $data->{order_internalnote} = $lastOrderReceived->{order_internalnote};
379
        $data->{order_internalnote} = $lastOrderReceived->{order_internalnote};
379
        $data->{order_vendornote}   = $lastOrderReceived->{order_vendornote};
380
        $data->{order_vendornote}   = $lastOrderReceived->{order_vendornote};
380
        $data->{sort1}          = $lastOrderReceived->{sort1};
381
        $data->{sort1}          = $lastOrderReceived->{sort1};
Lines 465-470 $template->param( Link Here
465
    listprice        => sprintf( "%.2f", $data->{listprice} || $data->{price} || $listprice),
466
    listprice        => sprintf( "%.2f", $data->{listprice} || $data->{price} || $listprice),
466
    total            => sprintf( "%.2f", ($data->{ecost} || 0) * ($data->{'quantity'} || 0) ),
467
    total            => sprintf( "%.2f", ($data->{ecost} || 0) * ($data->{'quantity'} || 0) ),
467
    ecost            => sprintf( "%.2f", $data->{ecost} || 0),
468
    ecost            => sprintf( "%.2f", $data->{ecost} || 0),
469
    unitprice        => sprintf( "%.2f", $data->{unitprice} || 0),
468
    publishercode    => $data->{'publishercode'},
470
    publishercode    => $data->{'publishercode'},
469
    barcode_subfield => $barcode_subfield,
471
    barcode_subfield => $barcode_subfield,
470
    import_batch_id  => $import_batch_id,
472
    import_batch_id  => $import_batch_id,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-1 / +5 lines)
Lines 467-472 Link Here
467
                <label for="total">Total: </label>
467
                <label for="total">Total: </label>
468
                <input type="text" id="total" size="20" name="total" value="[% total | html %]" readonly="readonly" /> (budgeted cost * quantity)
468
                <input type="text" id="total" size="20" name="total" value="[% total | html %]" readonly="readonly" /> (budgeted cost * quantity)
469
            </li>
469
            </li>
470
            <li class="ordering_unitprice">
471
                <label for="unitprice">Actual cost: </label>
472
                <input type="text" id="unitprice" size="20" name="unitprice" value="[% unitprice | html %]" />
473
                [% IF (invoiceincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]
474
            </li>
470
            <li>
475
            <li>
471
                <label for="order_internalnote">Internal note: </label>
476
                <label for="order_internalnote">Internal note: </label>
472
                <textarea id="order_internalnote" cols="30" rows="3" name="order_internalnote" >[% IF ( order_internalnote ) %][% order_internalnote | html %][% END %]</textarea>
477
                <textarea id="order_internalnote" cols="30" rows="3" name="order_internalnote" >[% IF ( order_internalnote ) %][% order_internalnote | html %][% END %]</textarea>
473
- 

Return to bug 23294