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

(-)a/C4/Acquisition.pm (+8 lines)
Lines 1506-1511 sub ModReceiveOrder { Link Here
1506
        |;
1506
        |;
1507
1507
1508
        $query .= q|
1508
        $query .= q|
1509
            , replacementprice = ?
1510
        | if defined $order->{replacementprice};
1511
1512
        $query .= q|
1509
            , unitprice = ?, unitprice_tax_included = ?, unitprice_tax_excluded = ?
1513
            , unitprice = ?, unitprice_tax_included = ?, unitprice_tax_excluded = ?
1510
        | if defined $order->{unitprice};
1514
        | if defined $order->{unitprice};
1511
1515
Lines 1526-1531 sub ModReceiveOrder { Link Here
1526
        my $sth = $dbh->prepare( $query );
1530
        my $sth = $dbh->prepare( $query );
1527
        my @params = ( $quantrec, $datereceived, $invoice->{invoiceid}, ( $budget_id ? $budget_id : $order->{budget_id} ) );
1531
        my @params = ( $quantrec, $datereceived, $invoice->{invoiceid}, ( $budget_id ? $budget_id : $order->{budget_id} ) );
1528
1532
1533
        if ( defined $order->{replacementprice} ) {
1534
            push @params, $order->{replacementprice};
1535
        }
1536
1529
        if ( defined $order->{unitprice} ) {
1537
        if ( defined $order->{unitprice} ) {
1530
            push @params, $order->{unitprice}, $order->{unitprice_tax_included}, $order->{unitprice_tax_excluded};
1538
            push @params, $order->{unitprice}, $order->{unitprice_tax_included}, $order->{unitprice_tax_excluded};
1531
        }
1539
        }
(-)a/acqui/addorderiso2709.pl (-2 / +6 lines)
Lines 262-267 if ($op eq ""){ Link Here
262
                    );
262
                    );
263
263
264
                    my $price = $infos->{price};
264
                    my $price = $infos->{price};
265
                    my $replacementprice = $infos->{replacementprice};
265
                    if ($price){
266
                    if ($price){
266
                        # in France, the cents separator is the , but sometimes, ppl use a .
267
                        # in France, the cents separator is the , but sometimes, ppl use a .
267
                        # in this case, the price will be x100 when unformatted ! Replace the . by a , to get a proper price calculation
268
                        # in this case, the price will be x100 when unformatted ! Replace the . by a , to get a proper price calculation
Lines 283-288 if ($op eq ""){ Link Here
283
                    } else {
284
                    } else {
284
                        $orderinfo{listprice} = 0;
285
                        $orderinfo{listprice} = 0;
285
                    }
286
                    }
287
                    $orderinfo{replacementprice} = $replacementprice || 0;
286
288
287
                    # remove uncertainprice flag if we have found a price in the MARC record
289
                    # remove uncertainprice flag if we have found a price in the MARC record
288
                    $orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
290
                    $orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
Lines 511-518 sub import_biblios_list { Link Here
511
        my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
513
        my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
512
        my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information";
514
        my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information";
513
515
514
        my $infos = get_infos_syspref('MarcFieldsToOrder', $marcrecord, ['price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2']);
516
        my $infos = get_infos_syspref('MarcFieldsToOrder', $marcrecord, ['price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2','replacementprice']);
515
        my $price = $infos->{price};
517
        my $price = $infos->{price};
518
        my $replacementprice = $infos->{replacementprice};
516
        my $quantity = $infos->{quantity};
519
        my $quantity = $infos->{quantity};
517
        my $budget_code = $infos->{budget_code};
520
        my $budget_code = $infos->{budget_code};
518
        my $discount = $infos->{discount};
521
        my $discount = $infos->{discount};
Lines 566-572 sub import_biblios_list { Link Here
566
                        'quantity' => $item_quantity,
569
                        'quantity' => $item_quantity,
567
                        'budget_code' => $item_budget_code || $budget_code,
570
                        'budget_code' => $item_budget_code || $budget_code,
568
                        'itemprice' => $item_price || $price,
571
                        'itemprice' => $item_price || $price,
569
                        'replacementprice' => $item_replacement_price,
572
                        'replacementprice' => $item_replacement_price || $replacementprice,
570
                        'itemcallnumber' => $item_callnumber,
573
                        'itemcallnumber' => $item_callnumber,
571
                    );
574
                    );
572
                    $all_items_quantity++;
575
                    $all_items_quantity++;
Lines 583-588 sub import_biblios_list { Link Here
583
586
584
        if ($alliteminfos == -1 || scalar(@$alliteminfos) == 0) {
587
        if ($alliteminfos == -1 || scalar(@$alliteminfos) == 0) {
585
            $cellrecord{price} = $price || '';
588
            $cellrecord{price} = $price || '';
589
            $cellrecord{replacementprice} = $replacementprice || '';
586
            $cellrecord{quantity} = $quantity || '';
590
            $cellrecord{quantity} = $quantity || '';
587
            $cellrecord{budget_id} = $budget_id || '';
591
            $cellrecord{budget_id} = $budget_id || '';
588
            $cellrecord{discount} = $discount || '';
592
            $cellrecord{discount} = $discount || '';
(-)a/acqui/finishreceive.pl (-1 / +5 lines)
Lines 49-54 my $origquantityrec = $input->param('origquantityrec'); Link Here
49
my $quantityrec      = $input->param('quantityrec');
49
my $quantityrec      = $input->param('quantityrec');
50
my $quantity         = $input->param('quantity');
50
my $quantity         = $input->param('quantity');
51
my $unitprice        = $input->param('unitprice');
51
my $unitprice        = $input->param('unitprice');
52
my $replacementprice = $input->param('replacementprice');
52
my $datereceived     = $input->param('datereceived'),
53
my $datereceived     = $input->param('datereceived'),
53
my $invoiceid        = $input->param('invoiceid');
54
my $invoiceid        = $input->param('invoiceid');
54
my $invoice          = GetInvoice($invoiceid);
55
my $invoice          = GetInvoice($invoiceid);
Lines 60-65 my $order = GetOrder($ordernumber); Link Here
60
my $new_ordernumber  = $ordernumber;
61
my $new_ordernumber  = $ordernumber;
61
62
62
$unitprice = Koha::Number::Price->new( $unitprice )->unformat();
63
$unitprice = Koha::Number::Price->new( $unitprice )->unformat();
64
$replacementprice = Koha::Number::Price->new( $replacementprice )->unformat();
65
warn "Replacement $replacementprice";
63
my $basket = Koha::Acquisition::Orders->find( $ordernumber )->basket;
66
my $basket = Koha::Acquisition::Orders->find( $ordernumber )->basket;
64
67
65
#need old receivedate if we update the order, parcel.pl only shows the right parcel this way FIXME
68
#need old receivedate if we update the order, parcel.pl only shows the right parcel this way FIXME
Lines 86-91 if ($quantityrec > $origquantityrec ) { Link Here
86
89
87
    $order->{order_internalnote} = $input->param("order_internalnote");
90
    $order->{order_internalnote} = $input->param("order_internalnote");
88
    $order->{tax_rate_on_receiving} = $input->param("tax_rate");
91
    $order->{tax_rate_on_receiving} = $input->param("tax_rate");
92
    $order->{replacementprice} = $replacementprice;
89
    $order->{unitprice} = $unitprice;
93
    $order->{unitprice} = $unitprice;
90
94
91
    $order = C4::Acquisition::populate_order_with_prices(
95
    $order = C4::Acquisition::populate_order_with_prices(
Lines 157-163 ModItem( Link Here
157
        dateaccessioned      => $datereceived,
161
        dateaccessioned      => $datereceived,
158
        datelastseen         => $datereceived,
162
        datelastseen         => $datereceived,
159
        price                => $unitprice,
163
        price                => $unitprice,
160
        replacementprice     => $order->{rrp},
164
        replacementprice     => $replacementprice,
161
        replacementpricedate => $datereceived,
165
        replacementpricedate => $datereceived,
162
    },
166
    },
163
    $biblionumber,
167
    $biblionumber,
(-)a/acqui/neworderempty.pl (+2 lines)
Lines 268-273 if ( defined $subscriptionid ) { Link Here
268
        $data->{tax_rate}       = $lastOrderReceived->{tax_rate_on_ordering};
268
        $data->{tax_rate}       = $lastOrderReceived->{tax_rate_on_ordering};
269
        $data->{discount}       = $lastOrderReceived->{discount};
269
        $data->{discount}       = $lastOrderReceived->{discount};
270
        $data->{rrp}            = $lastOrderReceived->{rrp};
270
        $data->{rrp}            = $lastOrderReceived->{rrp};
271
        $data->{replacementprice} = $lastOrderReceived->{replacementprice};
271
        $data->{ecost}          = $lastOrderReceived->{ecost};
272
        $data->{ecost}          = $lastOrderReceived->{ecost};
272
        $data->{quantity}       = $lastOrderReceived->{quantity};
273
        $data->{quantity}       = $lastOrderReceived->{quantity};
273
        $data->{unitprice}      = $lastOrderReceived->{unitprice};
274
        $data->{unitprice}      = $lastOrderReceived->{unitprice};
Lines 349-354 $template->param( Link Here
349
    quantity         => $quantity,
350
    quantity         => $quantity,
350
    quantityrec      => $quantity,
351
    quantityrec      => $quantity,
351
    rrp              => $data->{'rrp'},
352
    rrp              => $data->{'rrp'},
353
    replacementprice => $data->{'replacementprice'},
352
    gst_values       => \@gst_values,
354
    gst_values       => \@gst_values,
353
    tax_rate         => $data->{tax_rate_on_ordering} ? $data->{tax_rate_on_ordering}+0.0 : $bookseller->tax_rate ? $bookseller->tax_rate+0.0 : 0,
355
    tax_rate         => $data->{tax_rate_on_ordering} ? $data->{tax_rate_on_ordering}+0.0 : $bookseller->tax_rate ? $bookseller->tax_rate+0.0 : 0,
354
    listprice        => sprintf( "%.2f", $data->{listprice} || $data->{price} || $listprice),
356
    listprice        => sprintf( "%.2f", $data->{listprice} || $data->{price} || $listprice),
(-)a/acqui/orderreceive.pl (+1 lines)
Lines 215-220 $template->param( Link Here
215
    quantityreceivedplus1 => $order->{'quantityreceived'} + 1,
215
    quantityreceivedplus1 => $order->{'quantityreceived'} + 1,
216
    quantityreceived      => $order->{'quantityreceived'},
216
    quantityreceived      => $order->{'quantityreceived'},
217
    rrp                   => $rrp,
217
    rrp                   => $rrp,
218
    replacementprice      => $order->{'replacementprice'},
218
    ecost                 => $ecost,
219
    ecost                 => $ecost,
219
    unitprice             => $unitprice,
220
    unitprice             => $unitprice,
220
    tax_rate              => $tax_rate,
221
    tax_rate              => $tax_rate,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (+6 lines)
Lines 353-358 Link Here
353
                        <th class="tax_excluded">ecost tax exc.</th>
353
                        <th class="tax_excluded">ecost tax exc.</th>
354
                        <th class="tax_included">RRP tax inc.</th>
354
                        <th class="tax_included">RRP tax inc.</th>
355
                        <th class="tax_included">ecost tax inc.</th>
355
                        <th class="tax_included">ecost tax inc.</th>
356
                        <th class="replacementprice">Replacement price</th>
356
                        <th>Qty.</th>
357
                        <th>Qty.</th>
357
                        <th class="tax_excluded">Total tax exc. ([% currency %])</th>
358
                        <th class="tax_excluded">Total tax exc. ([% currency %])</th>
358
                        <th class="tax_included">Total tax inc. ([% currency %])</th>
359
                        <th class="tax_included">Total tax inc. ([% currency %])</th>
Lines 377-382 Link Here
377
                        <th class="tax_excluded">&nbsp;</th>
378
                        <th class="tax_excluded">&nbsp;</th>
378
                        <th class="tax_included">&nbsp;</th>
379
                        <th class="tax_included">&nbsp;</th>
379
                        <th class="tax_included">&nbsp;</th>
380
                        <th class="tax_included">&nbsp;</th>
381
                        <th class="replacementprice">&nbsp;</th>
380
                        <th>[% foot_loo.quantity %]</th>
382
                        <th>[% foot_loo.quantity %]</th>
381
                        <th class="tax_excluded">[% foot_loo.total_tax_excluded | $Price%]</th>
383
                        <th class="tax_excluded">[% foot_loo.total_tax_excluded | $Price%]</th>
382
                        <th class="tax_included">[% foot_loo.total_tax_included | $Price %]</th>
384
                        <th class="tax_included">[% foot_loo.total_tax_included | $Price %]</th>
Lines 399-404 Link Here
399
                    <th class="tax_excluded">&nbsp;</th>
401
                    <th class="tax_excluded">&nbsp;</th>
400
                    <th class="tax_included">&nbsp;</th>
402
                    <th class="tax_included">&nbsp;</th>
401
                    <th class="tax_included">&nbsp;</th>
403
                    <th class="tax_included">&nbsp;</th>
404
                    <th class="replacementprice">&nbsp;</th>
402
                    <th>[% total_quantity %]</th>
405
                    <th>[% total_quantity %]</th>
403
                    <th class="tax_excluded">[% total_tax_excluded | $Price %]</th>
406
                    <th class="tax_excluded">[% total_tax_excluded | $Price %]</th>
404
                    <th class="tax_included">[% total_tax_included | $Price %]</th>
407
                    <th class="tax_included">[% total_tax_included | $Price %]</th>
Lines 474-479 Link Here
474
                        <td class="number tax_excluded [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price%]</td>
477
                        <td class="number tax_excluded [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price%]</td>
475
                        <td class="number tax_included [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price %]</td>
478
                        <td class="number tax_included [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price %]</td>
476
                        <td class="number tax_included [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included | $Price %]</td>
479
                        <td class="number tax_included [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included | $Price %]</td>
480
                        <td class="number replacementprice [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]">[% books_loo.replacementprice | $Price %]</td>
477
                        <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity %]</td>
481
                        <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity %]</td>
478
                        <td class="number tax_excluded [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_excluded | $Price %]</td>
482
                        <td class="number tax_excluded [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_excluded | $Price %]</td>
479
                        <td class="number tax_included [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_included | $Price %]</td>
483
                        <td class="number tax_included [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_included | $Price %]</td>
Lines 536-541 Link Here
536
                  <th class="tax_excluded">ecost tax exc.</th>
540
                  <th class="tax_excluded">ecost tax exc.</th>
537
                  <th class="tax_included">RRP tax inc.</th>
541
                  <th class="tax_included">RRP tax inc.</th>
538
                  <th class="tax_included">ecost tax inc.</th>
542
                  <th class="tax_included">ecost tax inc.</th>
543
                  <th class="replacementprice">Replacement price</th>
539
                  <th>Qty.</th>
544
                  <th>Qty.</th>
540
                  <th class="tax_excluded">Total tax exc. ([% currency %])</th>
545
                  <th class="tax_excluded">Total tax exc. ([% currency %])</th>
541
                  <th class="tax_included">Total tax inc. ([% currency %])</th>
546
                  <th class="tax_included">Total tax inc. ([% currency %])</th>
Lines 588-593 Link Here
588
                    <td class="number tax_excluded">[% order.ecost_tax_excluded | $Price %]</td>
593
                    <td class="number tax_excluded">[% order.ecost_tax_excluded | $Price %]</td>
589
                    <td class="number tax_included">[% order.rrp_tax_included | $Price %]</td>
594
                    <td class="number tax_included">[% order.rrp_tax_included | $Price %]</td>
590
                    <td class="number tax_included">[% order.ecost_tax_included | $Price %]</td>
595
                    <td class="number tax_included">[% order.ecost_tax_included | $Price %]</td>
596
                    <td class="number replacementprice">[% order.replacementprice | $Price %]</td>
591
                    <td class="number">[% order.quantity %]</td>
597
                    <td class="number">[% order.quantity %]</td>
592
                    <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td>
598
                    <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td>
593
                    <td class="number tax_included">[% order.total_tax_included | $Price %]</td>
599
                    <td class="number tax_included">[% order.total_tax_included | $Price %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (+5 lines)
Lines 98-103 Link Here
98
                <th>Library</th>
98
                <th>Library</th>
99
                <th class="tax_excluded">Actual cost tax exc.</th>
99
                <th class="tax_excluded">Actual cost tax exc.</th>
100
                <th class="tax_included">Actual cost tax inc.</th>
100
                <th class="tax_included">Actual cost tax inc.</th>
101
                <th class="replacementprice">Replacement price</th>
101
                <th>Qty.</th>
102
                <th>Qty.</th>
102
                <th class="tax_excluded">Total tax exc. ([% currency.symbol %])</th>
103
                <th class="tax_excluded">Total tax exc. ([% currency.symbol %])</th>
103
                <th class="tax_included">Total tax inc. ([% currency.symbol %])</th>
104
                <th class="tax_included">Total tax inc. ([% currency.symbol %])</th>
Lines 128-133 Link Here
128
                  <td><p>[% order.branchcode %]</p></td>
129
                  <td><p>[% order.branchcode %]</p></td>
129
                  <td class="number tax_excluded">[% order.unitprice_tax_excluded | $Price %]</td>
130
                  <td class="number tax_excluded">[% order.unitprice_tax_excluded | $Price %]</td>
130
                  <td class="number tax_included">[% order.unitprice_tax_included | $Price %]</td>
131
                  <td class="number tax_included">[% order.unitprice_tax_included | $Price %]</td>
132
                  <td class="number replacementprice">[% order.replacementprice | $Price %]</td>
131
                  <td class="number">[% order.quantity %]</td>
133
                  <td class="number">[% order.quantity %]</td>
132
                  <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td>
134
                  <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td>
133
                  <td class="number tax_included">[% order.total_tax_included | $Price %]</td>
135
                  <td class="number tax_included">[% order.total_tax_included | $Price %]</td>
Lines 142-147 Link Here
142
                <tr>
144
                <tr>
143
                    <th colspan="2">Total (GST [% tf.tax_rate * 100 %] %)</th>
145
                    <th colspan="2">Total (GST [% tf.tax_rate * 100 %] %)</th>
144
                    <th class="tax_excluded"/><th class="tax_included"/>
146
                    <th class="tax_excluded"/><th class="tax_included"/>
147
                    <th class="replacementprice"/>
145
                    <th>[% tf.quantity %]</th>
148
                    <th>[% tf.quantity %]</th>
146
                    <th class="tax_excluded">[% tf.total_tax_excluded | $Price %]</th>
149
                    <th class="tax_excluded">[% tf.total_tax_excluded | $Price %]</th>
147
                    <th class="tax_included">[% tf.total_tax_included | $Price %]</th>
150
                    <th class="tax_included">[% tf.total_tax_included | $Price %]</th>
Lines 153-158 Link Here
153
              <tr>
156
              <tr>
154
                <th colspan='2'>Total ([% currency.symbol %])</th>
157
                <th colspan='2'>Total ([% currency.symbol %])</th>
155
                <th class="tax_excluded"/><th class="tax_included"/>
158
                <th class="tax_excluded"/><th class="tax_included"/>
159
                <th class="replacementprice"/>
156
                <th>[% total_quantity %]</th>
160
                <th>[% total_quantity %]</th>
157
                <th class="tax_excluded">[% total_tax_excluded | $Price %]</th>
161
                <th class="tax_excluded">[% total_tax_excluded | $Price %]</th>
158
                <th class="tax_included">[% total_tax_included | $Price %]</th>
162
                <th class="tax_included">[% total_tax_included | $Price %]</th>
Lines 164-169 Link Here
164
                <th colspan="2">Total + Shipment cost ([% currency.symbol %])</th>
168
                <th colspan="2">Total + Shipment cost ([% currency.symbol %])</th>
165
                <th class="tax_excluded"></th>
169
                <th class="tax_excluded"></th>
166
                <th class="tax_included"></th>
170
                <th class="tax_included"></th>
171
                <th class="replacementprice"/>
167
                <th>[% total_quantity %]</th>
172
                <th>[% total_quantity %]</th>
168
                <th class="tax_excluded">[% total_tax_excluded_shipment | $Price %]</th>
173
                <th class="tax_excluded">[% total_tax_excluded_shipment | $Price %]</th>
169
                <th class="tax_included">[% total_tax_included_shipment | $Price %]</th>
174
                <th class="tax_included">[% total_tax_included_shipment | $Price %]</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-2 / +6 lines)
Lines 598-611 $(document).ready(function() Link Here
598
            </li>
598
            </li>
599
            <li>
599
            <li>
600
                [% IF ( close ) %]
600
                [% IF ( close ) %]
601
                    <span class="label">Replacement cost: </span>
601
                    <span class="label">Retail price: </span>
602
                    <input type="hidden" name="rrp" id="rrp" value="[% rrp %]" />[% rrp %]  (adjusted for [% cur_active %], [% IF (listincgst == 1) %]tax inc.[% ELSE %]tax exc.[% END %])
602
                    <input type="hidden" name="rrp" id="rrp" value="[% rrp %]" />[% rrp %]  (adjusted for [% cur_active %], [% IF (listincgst == 1) %]tax inc.[% ELSE %]tax exc.[% END %])
603
                [% ELSE %]
603
                [% ELSE %]
604
                    <label for="rrp">Replacement cost: </label>
604
                    <label for="rrp">Retail price: </label>
605
                    <input type="text" size="20" name="rrp" id="rrp" value="[% rrp %]" /> (adjusted for [% cur_active %], [% IF (listincgst == 1) %]tax inc.[% ELSE %]tax exc.[% END %])
605
                    <input type="text" size="20" name="rrp" id="rrp" value="[% rrp %]" /> (adjusted for [% cur_active %], [% IF (listincgst == 1) %]tax inc.[% ELSE %]tax exc.[% END %])
606
                [% END %]
606
                [% END %]
607
            </li>
607
            </li>
608
            <li>
608
            <li>
609
                <label for="replacementprice">Replacement cost: </label>
610
                <input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice %]" />
611
            </li>
612
            <li>
609
                <label for="ecost">Budgeted cost: </label>
613
                <label for="ecost">Budgeted cost: </label>
610
                <input type="text" size="20" name="ecost" id="ecost" value="[% ecost %]" readonly="readonly"  /> [% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]
614
                <input type="text" size="20" name="ecost" id="ecost" value="[% ecost %]" readonly="readonly"  /> [% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]
611
            </li>
615
            </li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-1 / +5 lines)
Lines 346-352 Link Here
346
            <input type="hidden" name="tax_rate" value="0" />
346
            <input type="hidden" name="tax_rate" value="0" />
347
        [% END %]
347
        [% END %]
348
348
349
        <li><label for="rrp">Replacement cost: </label>[% rrp | $Price %]</li>
349
        <li><label for="rrp">Retail price: </label>[% rrp | $Price %]</li>
350
        <li>
351
            <label for="replacementprice">Replacement price:</label>
352
            <input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice | $Price %]" />
353
        </li>
350
        <li><label for="ecost">Budgeted cost: </label>[% ecost | $Price %]</li>
354
        <li><label for="ecost">Budgeted cost: </label>[% ecost | $Price %]</li>
351
        <li>
355
        <li>
352
            <label for="unitprice">Actual cost:</label>
356
            <label for="unitprice">Actual cost:</label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-1 / +7 lines)
Lines 40-45 Link Here
40
                null,
40
                null,
41
                null,
41
                null,
42
                null,
42
                null,
43
                null,
43
            ],
44
            ],
44
            'bAutoWidth': false,
45
            'bAutoWidth': false,
45
            "sPaginationType": "four_button"
46
            "sPaginationType": "four_button"
Lines 56-61 Link Here
56
                { type: "text" },
57
                { type: "text" },
57
                { type: "text" },
58
                { type: "text" },
58
                { type: "text" },
59
                { type: "text" },
60
                { type: "text" },
59
                null,
61
                null,
60
                null
62
                null
61
            ]
63
            ]
Lines 233-238 Link Here
233
            <th>Order line search</th>
235
            <th>Order line search</th>
234
            <th>Summary search</th>
236
            <th>Summary search</th>
235
            <th>&nbsp;</th>
237
            <th>&nbsp;</th>
238
            <th>Replacement price search</th>
236
            <th>Quantity search</th>
239
            <th>Quantity search</th>
237
            <th>Unit cost search</th>
240
            <th>Unit cost search</th>
238
            <th>Order cost search</th>
241
            <th>Order cost search</th>
Lines 246-251 Link Here
246
            <th>Order line</th>
249
            <th>Order line</th>
247
            <th>Summary</th>
250
            <th>Summary</th>
248
            <th>View record</th>
251
            <th>View record</th>
252
            <th>Replacement price</th>
249
            <th>Quantity</th>
253
            <th>Quantity</th>
250
            <th>Unit cost</th>
254
            <th>Unit cost</th>
251
            <th>Order cost</th>
255
            <th>Order cost</th>
Lines 294-299 Link Here
294
                [% END %]
298
                [% END %]
295
                </td>
299
                </td>
296
                <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_order.biblionumber %]" class="previewData">Card</a></td>
300
                <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_order.biblionumber %]" class="previewData">Card</a></td>
301
                <td>[% loop_order.replacementprice | $Price %]</td>
297
                <td>[% loop_order.quantity %]</td>
302
                <td>[% loop_order.quantity %]</td>
298
                <td>[% loop_order.ecost | $Price %]</td>
303
                <td>[% loop_order.ecost | $Price %]</td>
299
                <td>[% loop_order.total | $Price %]</td>
304
                <td>[% loop_order.total | $Price %]</td>
Lines 354-359 Link Here
354
          <th>Holds</th>
359
          <th>Holds</th>
355
          <th>Summary</th>
360
          <th>Summary</th>
356
          <th>View record</th>
361
          <th>View record</th>
362
          <th>Replacement price</th>
357
          <th>Quantity</th>
363
          <th>Quantity</th>
358
          <th>Fund</th>
364
          <th>Fund</th>
359
          <th>Est cost</th>
365
          <th>Est cost</th>
Lines 435-440 Link Here
435
                [% END %]
441
                [% END %]
436
                </td>
442
                </td>
437
                <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% order.biblionumber %]" class="previewData">Card</a></td>
443
                <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% order.biblionumber %]" class="previewData">Card</a></td>
444
                <td>[% order.replacementprice | $Price %]</td>
438
                <td>[% order.quantityreceived %]</td>
445
                <td>[% order.quantityreceived %]</td>
439
                <td>[% order.budget.budget_name %]</td>
446
                <td>[% order.budget.budget_name %]</td>
440
                <td>[% order.ecost | $Price %]</td>
447
                <td>[% order.ecost | $Price %]</td>
441
- 

Return to bug 18639