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

(-)a/acqui/neworderempty.pl (-1 / +1 lines)
Lines 359-365 $template->param( Link Here
359
    authorisedbyname => $borrower->{'firstname'} . " " . $borrower->{'surname'},
359
    authorisedbyname => $borrower->{'firstname'} . " " . $borrower->{'surname'},
360
    biblioitemnumber => $data->{'biblioitemnumber'},
360
    biblioitemnumber => $data->{'biblioitemnumber'},
361
    discount_2dp     => sprintf( "%.2f",  $bookseller->{'discount'}) ,   # for display
361
    discount_2dp     => sprintf( "%.2f",  $bookseller->{'discount'}) ,   # for display
362
    discount         => $bookseller->{'discount'},
362
    discount         => defined($data->{'discount'}) ? $data->{'discount'} : $bookseller->{'discount'},
363
    listincgst       => $bookseller->{'listincgst'},
363
    listincgst       => $bookseller->{'listincgst'},
364
    invoiceincgst    => $bookseller->{'invoiceincgst'},
364
    invoiceincgst    => $bookseller->{'invoiceincgst'},
365
    name             => $bookseller->{'name'},
365
    name             => $bookseller->{'name'},
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js (-2 / +8 lines)
Lines 645-650 function calcNeworderTotal(){ Link Here
645
    var quantity = new Number(f.quantity.value);
645
    var quantity = new Number(f.quantity.value);
646
    var discount = new Number(f.discount.value);
646
    var discount = new Number(f.discount.value);
647
    var listinc  = new Number (f.listinc.value);
647
    var listinc  = new Number (f.listinc.value);
648
    var miscellaneous = new Number (f.miscellaneous.value);
648
    //var currency = f.currency.value;
649
    //var currency = f.currency.value;
649
    var applygst = new Number (f.applygst.value);
650
    var applygst = new Number (f.applygst.value);
650
    var listprice   =  new Number(f.listprice.value);
651
    var listprice   =  new Number(f.listprice.value);
Lines 657-665 function calcNeworderTotal(){ Link Here
657
658
658
    //do real stuff
659
    //do real stuff
659
    var rrp   = new Number(listprice*exchangerate);
660
    var rrp   = new Number(listprice*exchangerate);
660
    var ecost = rrp;
661
    var ecost = rrp + miscellaneous;
661
    if (100-discount != 100) { //Prevent rounding issues if no discount
662
    if (100-discount != 100) { //Prevent rounding issues if no discount
662
        ecost = new Number(Math.floor(rrp * (100 - discount ))/100);
663
        ecost = new Number((Math.floor(rrp * (100 - discount ))/100)+miscellaneous);
663
    }
664
    }
664
    var GST   = new Number(0);
665
    var GST   = new Number(0);
665
    if (gst_on) {
666
    if (gst_on) {
Lines 682-687 function calcNeworderTotal(){ Link Here
682
    if (f.GST) {
683
    if (f.GST) {
683
        f.GST.value=GST;
684
        f.GST.value=GST;
684
    }
685
    }
686
687
// In case the discount changed, we should update the message
688
    var discount_2dp = discount.toFixed(2);
689
    $('#discount_value').html(discount_2dp);
690
685
    return true;
691
    return true;
686
}
692
}
687
693
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-3 / +19 lines)
Lines 222-228 $(document).ready(function() Link Here
222
        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
222
        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
223
        <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
223
        <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
224
        <input type="hidden" name="biblioitemnumber" value="[% biblioitemnumber %]" />
224
        <input type="hidden" name="biblioitemnumber" value="[% biblioitemnumber %]" />
225
        <input type="hidden" name="discount" value="[% discount %]" />
226
        <input type="hidden" name="listinc" value="[% listincgst %]" />
225
        <input type="hidden" name="listinc" value="[% listincgst %]" />
227
<!--        <input type="hidden" name="currency" value="[% currency %]" />-->
226
<!--        <input type="hidden" name="currency" value="[% currency %]" />-->
228
        <input type="hidden" name="applygst" value="[% gstreg %]" />
227
        <input type="hidden" name="applygst" value="[% gstreg %]" />
Lines 464-476 $(document).ready(function() Link Here
464
            </li>
463
            </li>
465
            <li>
464
            <li>
466
                [% IF ( close ) %]
465
                [% IF ( close ) %]
466
            <span class="label">Discount percentage: </span>
467
                    <input type="text" size="20" name="discount" id="discount" value="[% discount %]" />
468
                [% ELSE %]
469
                <label for="discount">Discount percentage: </label>
470
                    <input type="text" size="20" name="discount" id="discount" value="[% discount %]" onchange="calcNeworderTotal()"/>
471
                [% END %]
472
            </li>
473
            <li>
474
                [% IF ( close ) %]
475
            <span class="label">Miscellaneous cost: </span>
476
                    <input type="text" size="20" name="miscellaneous" id="miscellaneous" />
477
                [% ELSE %]
478
                <label for="miscellaneous">Miscellaneous cost: </label>
479
                    <input type="text" size="20" name="miscellaneous" id="miscellaneous" onchange="calcNeworderTotal()"/>
480
                [% END %]
481
            </li>
482
            <li>
483
                [% IF ( close ) %]
467
            <label for="ecost">Budgeted cost: </label>
484
            <label for="ecost">Budgeted cost: </label>
468
                    <input type="text" size="20" name="ecost" id="ecost" value="[% ecost %]" readonly="readonly"  />
485
                    <input type="text" size="20" name="ecost" id="ecost" value="[% ecost %]" readonly="readonly"  />
469
                [% ELSE %]
486
                [% ELSE %]
470
                <label for="ecost">Budgeted cost: </label>
487
                <label for="ecost">Budgeted cost: </label>
471
                    <input type="text" size="20" name="ecost" id="ecost" value="[% ecost %]" />
488
                    <input type="text" size="20" name="ecost" id="ecost" value="[% ecost %]" />
472
                [% END %]
489
                [% END %]
473
                [% IF ( discount_2dp ) %]  (adjusted for [% discount_2dp %]% discount)  [% END %]
490
                [% IF ( discount_2dp ) %]  (adjusted for <span id="discount_value">[% discount_2dp %]</span>% discount)  [% END %]
474
491
475
            </li>
492
            </li>
476
            [% IF ( GST ) %]
493
            [% IF ( GST ) %]
477
- 

Return to bug 8343