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

(-)a/acqui/finishreceive.pl (+10 lines)
Lines 59-64 my $bookfund = $input->param("bookfund"); Link Here
59
my $order            = GetOrder($ordernumber);
59
my $order            = GetOrder($ordernumber);
60
my $new_ordernumber  = $ordernumber;
60
my $new_ordernumber  = $ordernumber;
61
61
62
#bug18723 regression fix
63
if (C4::Context->preference("CurrencyFormat") eq 'FR') {
64
    if (rindex($unitprice, '.') ge 0) {
65
        substr($unitprice, rindex($unitprice, '.'), 1, ',');
66
    }
67
    if (rindex($replacementprice,'.') ge 0) {
68
        substr($replacementprice, rindex($replacementprice, '.'), 1, ',');
69
    }
70
}
71
62
$unitprice = Koha::Number::Price->new( $unitprice )->unformat();
72
$unitprice = Koha::Number::Price->new( $unitprice )->unformat();
63
$replacementprice = Koha::Number::Price->new( $replacementprice )->unformat();
73
$replacementprice = Koha::Number::Price->new( $replacementprice )->unformat();
64
my $order_obj = Koha::Acquisition::Orders->find( $ordernumber );
74
my $order_obj = Koha::Acquisition::Orders->find( $ordernumber );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-2 / +1 lines)
Lines 291-297 Link Here
291
        <li><label for="rrp">Retail price: </label>[% rrp | $Price %] <span class="hint">(adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])</span></li>
291
        <li><label for="rrp">Retail price: </label>[% rrp | $Price %] <span class="hint">(adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])</span></li>
292
        <li>
292
        <li>
293
            <label for="replacementprice">Replacement price:</label>
293
            <label for="replacementprice">Replacement price:</label>
294
            <input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice | $Price %]" />
294
            <input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice | $Price on_editing => 1 %]" />
295
        </li>
295
        </li>
296
        <li><label for="ecost">Budgeted cost: </label>[% ecost | $Price %] <span class="hint">[% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]</span></li>
296
        <li><label for="ecost">Budgeted cost: </label>[% ecost | $Price %] <span class="hint">[% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]</span></li>
297
        <li>
297
        <li>
298
- 

Return to bug 18723