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

(-)a/acqui/neworderempty.pl (-1 / +2 lines)
Lines 329-335 $template->param( Link Here
329 
    authorisedbyname => $borrower->{'firstname'} . " " . $borrower->{'surname'},
 329 
    authorisedbyname => $borrower->{'firstname'} . " " . $borrower->{'surname'},
330 
    biblioitemnumber => $data->{'biblioitemnumber'},
 330 
    biblioitemnumber => $data->{'biblioitemnumber'},
331 
    discount_2dp     => sprintf( "%.2f",  $bookseller->{'discount'}) ,   # for display
 331 
    discount_2dp     => sprintf( "%.2f",  $bookseller->{'discount'}) ,   # for display
332 
    discount         => $bookseller->{'discount'},
 332 
    discount         => defined($data->{'discount'}) ?
333 
                            $data->{'discount'} : $bookseller->{'discount'},
333 
    listincgst       => $bookseller->{'listincgst'},
 334 
    listincgst       => $bookseller->{'listincgst'},
334 
    invoiceincgst    => $bookseller->{'invoiceincgst'},
 335 
    invoiceincgst    => $bookseller->{'invoiceincgst'},
335 
    name             => $bookseller->{'name'},
 336 
    name             => $bookseller->{'name'},
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js (+5 lines)
Lines 676-681 function calcNeworderTotal(){ Link Here
676 
    if (f.GST) {
 676 
    if (f.GST) {
677 
        f.GST.value=GST;
 677 
        f.GST.value=GST;
678 
    }
 678 
    }
679 

            

            

              680
              
    // In case the discount changed, we should update the message

            

            

              681
              
    var discount_2dp = discount.toFixed(2);

            

            

              682
              
    $('#discount_value').html(discount_2dp);

            

            

              683
              

            

        

          679
          
    return true;

          684
          
    return true;

        

        

          680
          
}

          685
          
}

        

        

          681
          

          686
          

        



(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
      (-4 / +14 lines)




  

    
      
            Lines 125-131
          ff.submit();
      
      
        Link Here
      
    
  

        

          125
          
        <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" />

          125
          
        <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" />

        

        

          126
          
        <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />

          126
          
        <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />

        

        

          127
          
        <input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />

          127
          
        <input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />

        

            

              128
              
        <input type="hidden" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" />

              
              
            

        

          129
          
        <input type="hidden" name="listinc" value="<!-- TMPL_VAR NAME="listincgst" -->" />

          128
          
        <input type="hidden" name="listinc" value="<!-- TMPL_VAR NAME="listincgst" -->" />

        

        

          130
          
        <input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="currency" -->" />

          129
          
        <input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="currency" -->" />

        

        

          131
          
        <input type="hidden" name="applygst" value="<!-- TMPL_VAR NAME="gstreg" -->" />

          130
          
        <input type="hidden" name="applygst" value="<!-- TMPL_VAR NAME="gstreg" -->" />

        

  

    
      
            Lines 292-306
          ff.submit();
      
      
        Link Here
      
    
  

        

          292
          
                    <input type="text" size="20" name="rrp" id="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /> (adjusted for <!-- TMPL_VAR NAME="cur_active" -->)

          291
          
                    <input type="text" size="20" name="rrp" id="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /> (adjusted for <!-- TMPL_VAR NAME="cur_active" -->)

        

        

          293
          
                <!--/TMPL_IF-->

          292
          
                <!--/TMPL_IF-->

        

        

          294
          
            </li>

          293
          
            </li>

        

            

              
              
              294
              
            

            

            

              295
              

            

            

              296
              

            

        

          295
          
            <li>

          297
          
            <li>

        

          
            

              296
              
                <!-- TMPL_IF name="close" -->


              298
              
                <!-- TMPL_IF NAME="close" -->

            

            

              
              

              299
              
                    <span class="label">Discount: </span>

            

            


              300
              
                    <input type="hidden" size="20" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /><!-- TMPL_VAR NAME="discount" -->"

            

            


              301
              
                <!-- TMPL_ELSE -->

            

            


              302
              
                    <label for="discount">Discount: </label>

            

            


              303
              
                    <input type="text" size="20" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" onchange="calcNeworderTotal()"/>

            

            


              304
              
                <!-- /TMPL_IF -->

            

            


              305
              
            </li>

            

            


              306
              
            <li>

            

            


              307
              
            <!-- TMPL_IF name="close" -->

            

        

          297
          
            <label for="ecost">Budgeted cost: </label>

          308
          
            <label for="ecost">Budgeted cost: </label>

        

        

          298
          
                    <input type="text" size="20" name="ecost" id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" readonly="readonly"  />

          309
          
                    <input type="text" size="20" name="ecost" id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" readonly="readonly"  />

        

        

          299
          
                <!-- TMPL_ELSE -->

          310
          
                <!-- TMPL_ELSE -->

        

        

          300
          
                <label for="ecost">Budgeted cost: </label>

          311
          
                <label for="ecost">Budgeted cost: </label>

        

        

          301
          
                    <input type="text" size="20" name="ecost" id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" />

          312
          
                    <input type="text" size="20" name="ecost" id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" />

        

        

          302
          
                <!--/TMPL_IF-->

          313
          
                <!--/TMPL_IF-->

        

          
            

              303
              
                <!-- TMPL_IF name="discount_2dp" -->  (adjusted for <!-- TMPL_VAR name="discount_2dp" -->% discount)  <!--/TMPL_IF-->


              314
              
                <!-- TMPL_IF name="discount_2dp" -->  (adjusted for <span id="discount_value"><!-- TMPL_VAR name="discount_2dp" --></span>% discount)  <!--/TMPL_IF-->

            

        

          304
          

          315
          

        

        

          305
          
            </li>

          316
          
            </li>

        

        

          306
          
            <!-- TMPL_IF NAME="GST"-->

          317
          
            <!-- TMPL_IF NAME="GST"-->

        

            

              307
              
- 

              
              
            






  

  Return to bug 5173