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

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

Return to bug 9775