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

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

Return to bug 9775