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

(-)a/acqui/neworderempty.pl (+2 lines)
Lines 352-357 $template->param( Link Here
352
    cur_active_sym   => $active_currency->symbol,
352
    cur_active_sym   => $active_currency->symbol,
353
    cur_active       => $active_currency->currency,
353
    cur_active       => $active_currency->currency,
354
    currencies       => \@currencies,
354
    currencies       => \@currencies,
355
    currency         => $data->{currency},
356
    vendor_currency  => $bookseller->{listprice},
355
    orderexists      => ( $new eq 'yes' ) ? 0 : 1,
357
    orderexists      => ( $new eq 'yes' ) ? 0 : 1,
356
    title            => $data->{'title'},
358
    title            => $data->{'title'},
357
    author           => $data->{'author'},
359
    author           => $data->{'author'},
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-7 / +7 lines)
Lines 302-309 $(document).ready(function() Link Here
302
        <input type="hidden" name="suggestionid" value="[% suggestionid %]" />
302
        <input type="hidden" name="suggestionid" value="[% suggestionid %]" />
303
        <input type="hidden" name="import_batch_id" value="[% import_batch_id %]" />
303
        <input type="hidden" name="import_batch_id" value="[% import_batch_id %]" />
304
304
305
        [% FOREACH currency IN currencies %]
305
        [% FOREACH c IN currencies %]
306
            <input type="hidden" id="currency_rate_[% currency.currency %]"  name="[% currency.currency %]" value="[% currency.rate %]" />
306
            <input type="hidden" id="currency_rate_[% c.currency %]"  name="[% c.currency %]" value="[% c.rate %]" />
307
        [% END %]
307
        [% END %]
308
308
309
        <ol><li>
309
        <ol><li>
Lines 523-533 $(document).ready(function() Link Here
523
                [% ELSE %]
523
                [% ELSE %]
524
			<label for="currency">Currency:</label>
524
			<label for="currency">Currency:</label>
525
            <select name="currency" id="currency" onchange="updateCosts();">
525
            <select name="currency" id="currency" onchange="updateCosts();">
526
                [% FOREACH currency IN currencies %]
526
                [% FOREACH c IN currencies %]
527
                    [% IF ordernumber and currency.currency == listprice or not ordernumber and currency.active %]
527
                    [% IF ordernumber and c.currency == currency or not ordernumber and c.currency == vendor_currency %]
528
                        <option value="[% currency.currency %]" selected="selected">[% currency.currency %]</option>
528
                        <option value="[% c.currency %]" selected="selected">[% c.currency %]</option>
529
                    [% ELSIF not currency.archived %]
529
                    [% ELSIF not c.archived %]
530
                        <option value="[% currency.currency %]">[% currency.currency %]</option>
530
                        <option value="[% c.currency %]">[% c.currency %]</option>
531
                    [% END %]
531
                    [% END %]
532
                [% END %]
532
                [% END %]
533
            </select>
533
            </select>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-11 / +10 lines)
Lines 222-243 function delete_contact(ev) { Link Here
222
            <ol>
222
            <ol>
223
            <li><label for="list_currency">List prices are: </label>
223
            <li><label for="list_currency">List prices are: </label>
224
                <select name="list_currency" id="list_currency">
224
                <select name="list_currency" id="list_currency">
225
                    [% FOREACH currency IN currencies %]
225
                    [% FOREACH c IN currencies %]
226
                        [% IF booksellerid and currency.currency == listprice or not booksellerid and currency.active %]
226
                        [% IF booksellerid and c.currency == listprice or not booksellerid and c.active %]
227
                            <option value="[% currency.currency %]" selected="selected">[% currency.currency %]</option>
227
                            <option value="[% c.currency %]" selected="selected">[% c.currency %]</option>
228
                        [% ELSIF not currency.archived %]
228
                        [% ELSIF not c.archived %]
229
                            <option value="[% currency.currency %]" selected="selected">[% currency.currency %]</option>
229
                            <option value="[% c.currency %]">[% c.currency %]</option>
230
                        [% END %]
230
                        [% END %]
231
                    [% END %]
231
                    [% END %]
232
                </select>
232
                </select>
233
            </li>
233
            </li>
234
            <li><label for="invoice_currency">Invoice prices are: </label>
234
            <li><label for="invoice_currency">Invoice prices are: </label>
235
                <select name="invoice_currency" id="invoice_currency">
235
                <select name="invoice_currency" id="invoice_currency">
236
                    [% FOREACH currency IN currencies %]
236
                    [% FOREACH c IN currencies %]
237
                        [% IF booksellerid and currency.currency == invoiceprice or not booksellerid and currency.active %]
237
                        [% IF booksellerid and c.currency == invoiceprice or not booksellerid and c.active %]
238
                            <option value="[% currency.currency %]" selected="selected">[% currency.currency %]</option>
238
                            <option value="[% c.currency %]" selected="selected">[% c.currency %]</option>
239
                        [% ELSIF not currency.archived %]
239
                        [% ELSIF not c.archived %]
240
                            <option value="[% currency.currency %]" selected="selected">[% currency.currency %]</option>
240
                            <option value="[% c.currency %]">[% c.currency %]</option>
241
                        [% END %]
241
                        [% END %]
242
                    [% END %]
242
                    [% END %]
243
                </select>
243
                </select>
244
- 

Return to bug 16227