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

(-)a/acqui/neworderempty.pl (-35 / +33 lines)
Lines 460-500 $template->param( Link Here
460
    closedate            => $basket->{'closedate'},
460
    closedate            => $basket->{'closedate'},
461
461
462
    # order details
462
    # order details
463
    suggestionid         => $suggestion->suggestionid,
463
    suggestion         => $suggestion,
464
    surnamesuggestedby   => $suggestion->surname,
464
    biblionumber       => $biblionumber,
465
    firstnamesuggestedby => $suggestion->firstname,
465
    uncertainprice     => $data->{'uncertainprice'},
466
    biblionumber         => $biblionumber,
466
    discount_2dp       => sprintf( "%.2f", $bookseller->discount ),      # for display
467
    uncertainprice       => $data->{'uncertainprice'},
467
    discount           => $bookseller->discount,
468
    discount_2dp         => sprintf( "%.2f", $bookseller->discount ),      # for display
468
    orderdiscount_2dp  => sprintf( "%.2f", $data->{'discount'} || 0 ),
469
    discount             => $bookseller->discount,
469
    orderdiscount      => $data->{'discount'},
470
    orderdiscount_2dp    => sprintf( "%.2f", $data->{'discount'} || 0 ),
470
    order_internalnote => $data->{'order_internalnote'},
471
    orderdiscount        => $data->{'discount'},
471
    order_vendornote   => $data->{'order_vendornote'},
472
    order_internalnote   => $data->{'order_internalnote'},
472
    listincgst         => $bookseller->listincgst,
473
    order_vendornote     => $data->{'order_vendornote'},
473
    invoiceincgst      => $bookseller->invoiceincgst,
474
    listincgst           => $bookseller->listincgst,
474
    cur_active_sym     => $active_currency->symbol,
475
    invoiceincgst        => $bookseller->invoiceincgst,
475
    cur_active         => $active_currency->currency,
476
    cur_active_sym       => $active_currency->symbol,
476
    currencies         => Koha::Acquisition::Currencies->search,
477
    cur_active           => $active_currency->currency,
477
    currency           => $data->{currency},
478
    currencies           => Koha::Acquisition::Currencies->search,
478
    vendor_currency    => $bookseller->listprice,
479
    currency             => $data->{currency},
479
    orderexists        => ( $new eq 'yes' ) ? 0 : 1,
480
    vendor_currency      => $bookseller->listprice,
480
    title              => $data->{'title'},
481
    orderexists          => ( $new eq 'yes' ) ? 0 : 1,
481
    author             => $data->{'author'},
482
    title                => $data->{'title'},
482
    publicationyear    => $data->{'publicationyear'} ? $data->{'publicationyear'} : $data->{'copyrightdate'},
483
    author               => $data->{'author'},
483
    editionstatement   => $data->{'editionstatement'},
484
    publicationyear      => $data->{'publicationyear'} ? $data->{'publicationyear'} : $data->{'copyrightdate'},
484
    budget_loop        => $budget_loop,
485
    editionstatement     => $data->{'editionstatement'},
485
    isbn               => $data->{'isbn'},
486
    budget_loop          => $budget_loop,
486
    ean                => $data->{'ean'},
487
    isbn                 => $data->{'isbn'},
487
    seriestitle        => $data->{'seriestitle'},
488
    ean                  => $data->{'ean'},
488
    itemtypeloop       => \@itemtypes,
489
    seriestitle          => $data->{'seriestitle'},
489
    quantity           => $quantity,
490
    itemtypeloop         => \@itemtypes,
490
    quantityrec        => $quantity,
491
    quantity             => $quantity,
491
    quantitysugg       => $data->{quantitysugg},
492
    quantityrec          => $quantity,
492
    rrp                => $data->{'rrp'},
493
    quantitysugg         => $data->{quantitysugg},
493
    replacementprice   => $data->{'replacementprice'},
494
    rrp                  => $data->{'rrp'},
494
    gst_values         => \@gst_values,
495
    replacementprice     => $data->{'replacementprice'},
495
    tax_rate           => $data->{tax_rate_on_ordering} ? $data->{tax_rate_on_ordering} + 0.0
496
    gst_values           => \@gst_values,
497
    tax_rate             => $data->{tax_rate_on_ordering} ? $data->{tax_rate_on_ordering} + 0.0
498
    : $bookseller->tax_rate ? $bookseller->tax_rate + 0.0
496
    : $bookseller->tax_rate ? $bookseller->tax_rate + 0.0
499
    : 0,
497
    : 0,
500
    listprice => sprintf( "%.2f", $data->{listprice} || $data->{price} || $listprice ),
498
    listprice => sprintf( "%.2f", $data->{listprice} || $data->{price} || $listprice ),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-7 / +7 lines)
Lines 143-149 Link Here
143
            cloneItemBlock(0, '[% UniqueItemFields | html %]');
143
            cloneItemBlock(0, '[% UniqueItemFields | html %]');
144
        [% END %]
144
        [% END %]
145
145
146
        [% IF ( suggestionid ) %]updateCosts();[% END %]
146
        [% IF ( suggestion ) %]updateCosts();[% END %]
147
        $("#quantity").change(function() {
147
        $("#quantity").change(function() {
148
            updateCosts();
148
            updateCosts();
149
        });
149
        });
Lines 348-354 Link Here
348
            <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
348
            <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
349
            <input type="hidden" name="listinc" id="listinc" value="[% listincgst | html %]" />
349
            <input type="hidden" name="listinc" id="listinc" value="[% listincgst | html %]" />
350
            <input type="hidden" name="invoiceincgst" id="invoiceincgst" value="[% invoiceincgst | html %]" />
350
            <input type="hidden" name="invoiceincgst" id="invoiceincgst" value="[% invoiceincgst | html %]" />
351
            <input type="hidden" name="suggestionid" value="[% suggestionid | html %]" />
351
            <input type="hidden" name="suggestionid" value="[% suggestion.suggestionid | html %]" />
352
            <input type="hidden" name="import_batch_id" value="[% import_batch_id | html %]" />
352
            <input type="hidden" name="import_batch_id" value="[% import_batch_id | html %]" />
353
353
354
            [% FOREACH c IN currencies %]
354
            [% FOREACH c IN currencies %]
Lines 466-479 Link Here
466
            [% END %]
466
            [% END %]
467
        </fieldset>
467
        </fieldset>
468
468
469
        [% IF ( suggestionid ) %]
469
        [% IF ( suggestion ) %]
470
            <fieldset class="rows">
470
            <fieldset class="rows">
471
                <legend>Suggestion</legend>
471
                <legend>Suggestion</legend>
472
                <ol>
472
                <ol>
473
                    <li>
473
                    <li>
474
                        <span class="label">Suggested by: </span>
474
                        <span class="label">Suggested by: </span>
475
                        [% surnamesuggestedby | html %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby | html %][% END %] (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid | uri %]&amp;op=show"
475
                        [% suggestion.suggester.surname | html %][% IF ( suggestion.suggester.firstname ) %], [% suggestion.suggester.firstname | html %][% END %] (<a
476
                            >suggestion #[% suggestionid | html %]</a
476
                            href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestion.suggestionid | uri %]&amp;op=show"
477
                            >suggestion #[% suggestion.suggestionid | html %]</a
477
                        >)
478
                        >)
478
                    </li>
479
                    </li>
479
                </ol>
480
                </ol>
Lines 743-749 Link Here
743
            <input type="hidden" id="op" name="op" value="cud-order" />
744
            <input type="hidden" id="op" name="op" value="cud-order" />
744
            <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]" />
745
            <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]" />
745
            <input type="submit" class="btn btn-primary" value="Save" />
746
            <input type="submit" class="btn btn-primary" value="Save" />
746
            [% IF (suggestionid) %]
747
            [% IF (suggestion) %]
747
                <a class="cancel" href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">Cancel</a>
748
                <a class="cancel" href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">Cancel</a>
748
            [% ELSE %]
749
            [% ELSE %]
749
                [% IF subscriptionid %]
750
                [% IF subscriptionid %]
750
- 

Return to bug 39724