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

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

Return to bug 23294