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

(-)a/acqui/addorderiso2709.pl (-1 / +6 lines)
Lines 207-215 if ($op eq ""){ Link Here
207
        # filter by storing only the 1st number
207
        # filter by storing only the 1st number
208
        # we suppose the currency is correct, as we have no possibilities to get it.
208
        # we suppose the currency is correct, as we have no possibilities to get it.
209
        my $price= GetMarcPrice($marcrecord, C4::Context->preference('marcflavour'));
209
        my $price= GetMarcPrice($marcrecord, C4::Context->preference('marcflavour'));
210
        if ($price){
210
211
        ## unformat_number will choke if there is more than one period (.) in $price
212
        ## MARC standards do not limit this field to a single period, so unless there
213
        ## is only one period, skip number unformatting.
214
        unless ( $price =~ /\..*\./ ) {
211
            $price = $num->unformat_number($price);
215
            $price = $num->unformat_number($price);
212
        }
216
        }
217
213
        if ($price){
218
        if ($price){
214
            $orderinfo{'listprice'} = $price;
219
            $orderinfo{'listprice'} = $price;
215
            eval {
220
            eval {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-5 / +5 lines)
Lines 269-274 Link Here
269
                    <td>&nbsp;</td>
269
                    <td>&nbsp;</td>
270
                    <td>[% qty_total %]</td>
270
                    <td>[% qty_total %]</td>
271
                    <td>[% total_est_gsti %]</td>
271
                    <td>[% total_est_gsti %]</td>
272
                    <td colspan="3">&nbsp;</td>
272
                </tr>
273
                </tr>
273
                [% END %]
274
                [% END %]
274
                </tfoot>
275
                </tfoot>
Lines 285-294 Link Here
285
                                    [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %][% END %]
286
                                    [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %][% END %]
286
                            </p>
287
                            </p>
287
                            </td>
288
                            </td>
288
                        <td class="number">[% books_loo.rrp %]</td>
289
                        <td class="number [% IF books_loo.rrp.search('^0') %]error[% END %]">[% books_loo.rrp %]</td>
289
                        <td class="number">[% books_loo.ecost %]</td>
290
                        <td class="number [% IF books_loo.ecost.search('^0') %]error[% END %]">[% books_loo.ecost %]</td>
290
                        <td class="number">[% books_loo.quantity %]</td>
291
                        <td class="number [% IF books_loo.quantity.search('^0') %]error[% END %]">[% books_loo.quantity %]</td>
291
                        <td class="number">[% books_loo.line_total %]</td>
292
                        <td class="number [% IF books_loo.line_total.search('^0') %]error[% END %]">[% books_loo.line_total %]</td>
292
                        <td>[% books_loo.budget_name %]</td>
293
                        <td>[% books_loo.budget_name %]</td>
293
                        [% IF ( active ) %]
294
                        [% IF ( active ) %]
294
                            [% UNLESS ( closedate ) %]
295
                            [% UNLESS ( closedate ) %]
295
- 

Return to bug 7112