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

(-)a/acqui/finishreceive.pl (+3 lines)
Lines 33-38 use C4::Items; Link Here
33 
use C4::Search;
 33 
use C4::Search;
34 

          34
          

        

        

          35
          
use Koha::Acquisition::Bookseller;

          35
          
use Koha::Acquisition::Bookseller;

        

            

              
              
              36
              
use Koha::Number::Price;

            

        

          36
          

          37
          

        

        

          37
          
use List::MoreUtils qw/any/;

          38
          
use List::MoreUtils qw/any/;

        

        

          38
          

          39
          

        

  

    
      
            Lines 58-63
          my $bookfund         = $input->param("bookfund");
      
      
        Link Here
      
    
  

        

          58
          
my $order            = GetOrder($ordernumber);

          59
          
my $order            = GetOrder($ordernumber);

        

        

          59
          
my $new_ordernumber  = $ordernumber;

          60
          
my $new_ordernumber  = $ordernumber;

        

        

          60
          

          61
          

        

            

              
              
              62
              
$unitprice = Koha::Number::Price->new( $unitprice )->unformat();

            

            

              63
              

            

        

          61
          
#need old receivedate if we update the order, parcel.pl only shows the right parcel this way FIXME

          64
          
#need old receivedate if we update the order, parcel.pl only shows the right parcel this way FIXME

        

        

          62
          
if ($quantityrec > $origquantityrec ) {

          65
          
if ($quantityrec > $origquantityrec ) {

        

        

          63
          
    my @received_items = ();

          66
          
    my @received_items = ();

        



(-)a/acqui/invoice.pl
      (-3 / +2 lines)




  

    
      
            Lines 124-131
          my $total_tax_value = 0;
      
      
        Link Here
      
    
  

        

          124
          
foreach my $order (@$orders) {

          124
          
foreach my $order (@$orders) {

        

        

          125
          
    my $line = get_infos( $order, $bookseller);

          125
          
    my $line = get_infos( $order, $bookseller);

        

        

          126
          

          126
          

        

          
            

              127
              
    $line->{total_tax_excluded} = Koha::Number::Price->new( $line->{unitprice_tax_excluded} * $line->{quantity} )->format;


              127
              
    $line->{total_tax_excluded} = $line->{unitprice_tax_excluded} * $line->{quantity};

            

            

              128
              
    $line->{total_tax_included} = Koha::Number::Price->new( $line->{unitprice_tax_included} * $line->{quantity} )->format;


              128
              
    $line->{total_tax_included} = $line->{unitprice_tax_included} * $line->{quantity};

            

        

          129
          

          129
          

        

        

          130
          
    $line->{tax_value} = $line->{tax_value_on_receiving};

          130
          
    $line->{tax_value} = $line->{tax_value_on_receiving};

        

        

          131
          
    $line->{tax_rate} = $line->{tax_rate_on_receiving};

          131
          
    $line->{tax_rate} = $line->{tax_rate_on_receiving};

        

            

              132
              
- 

              
              
            






  

  Return to bug 18471