Funktionen format_dates und reformat_numbers von common.pl nach Form.pm verschoben

[mfinanz.git] / SL / DB / Helper / PriceTaxCalculator.pm

diff --git a/SL/DB/Helper/PriceTaxCalculator.pm b/SL/DB/Helper/PriceTaxCalculator.pm
index 6a334354822131855044dd102653237b36511234..63dde450a618a5bcfad3b697b69d024f3760844a 100644 (file)
--- a/SL/DB/Helper/PriceTaxCalculator.pm
+++ b/SL/DB/Helper/PriceTaxCalculator.pm
@@ -70,6 +70,7 @@ sub _calculate_item {
   croak("Undefined unit " . $item->unit)       if !$item_unit;
 
   $item->base_qty($item_unit->convert_to($item->qty, $part_unit));
   croak("Undefined unit " . $item->unit)       if !$item_unit;
 
   $item->base_qty($item_unit->convert_to($item->qty, $part_unit));

+  $item->fxsellprice($item->sellprice);

 
   my $num_dec   = _num_decimal_places($item->sellprice);
   my $discount  = _round($item->sellprice * ($item->discount || 0), $num_dec);
 
   my $num_dec   = _num_decimal_places($item->sellprice);
   my $discount  = _round($item->sellprice * ($item->discount || 0), $num_dec);


@@ -108,8 +109,8 @@ sub _calculate_item {
     $tax_amount = $linetotal * $tax_rate;
   }
 
     $tax_amount = $linetotal * $tax_rate;
   }
 

-  $data->{taxes}->{ $taxkey->chart_id } ||= 0;
-  $data->{taxes}->{ $taxkey->chart_id }  += $tax_amount;
+  $data->{taxes}->{ $taxkey->tax->chart_id } ||= 0;
+  $data->{taxes}->{ $taxkey->tax->chart_id }  += $tax_amount;

 
   $self->netamount($self->netamount + $sellprice * $item->qty / $item->price_factor);
 
 
   $self->netamount($self->netamount + $sellprice * $item->qty / $item->price_factor);