Kosmetik; mehr Variablen umbenannt

diff --git a/SL/DATEV.pm b/SL/DATEV.pm
index 055a7f07679df8b73150984f9f5880cf9cca8827..da82d03368090dfbddebe15514d6b17a6a4e76e7 100644 (file)
--- a/SL/DATEV.pm
+++ b/SL/DATEV.pm
@@ -324,8 +324,8 @@ sub _get_transactions {
               || $trans->[$j]->{'taxkey'} eq "1"
               || $trans->[$j]->{'taxkey'} eq "10"
               || $trans->[$j]->{'taxkey'} eq "11")) {
               || $trans->[$j]->{'taxkey'} eq "1"
               || $trans->[$j]->{'taxkey'} eq "10"
               || $trans->[$j]->{'taxkey'} eq "11")) {

-        my %new_trans = {};
-        map({ $new_trans{$_} = $trans->[$notsplitindex]->{$_}; } keys(%{ $trans->[$notsplitindex] }));
+        my %new_trans = ();
+        map { $new_trans{$_} = $trans->[$notsplitindex]->{$_}; } keys %{ $trans->[$notsplitindex] };

 
         $absumsatz               += $trans->[$j]->{'amount'};
         $new_trans{'amount'}      = $trans->[$j]->{'amount'} * (-1);
 
         $absumsatz               += $trans->[$j]->{'amount'};
         $new_trans{'amount'}      = $trans->[$j]->{'amount'} * (-1);


@@ -338,13 +338,13 @@ sub _get_transactions {
       } elsif (($j != $notsplitindex) && ($trans->[$j]->{'chart_id'} eq "")) {
         $absumsatz += ($trans->[$j]->{'amount'} * (1 + $taxes{ $taxid_taxkeys{$trans->[$j]->{'taxkey'}} }));
 
       } elsif (($j != $notsplitindex) && ($trans->[$j]->{'chart_id'} eq "")) {
         $absumsatz += ($trans->[$j]->{'amount'} * (1 + $taxes{ $taxid_taxkeys{$trans->[$j]->{'taxkey'}} }));
 

-        my %new_trans = {};
-        map({ $new_trans{$_} = $trans->[$notsplitindex]->{$_}; } keys(%{ $trans->[$notsplitindex] }));
+        my %new_trans = ();
+        map { $new_trans{$_} = $trans->[$notsplitindex]->{$_}; } keys %{ $trans->[$notsplitindex] };

 
 

-        $test                    = 1 + $taxes{  $taxid_taxkeys{$trans->[$j]->{'taxkey'}} };
-        $new_trans{'amount'}     = $form->round_amount(($trans->[$j]->{'amount'} * $test * -1), 2);
-        $new_trans{'umsatz'}     = abs($form->round_amount(($trans->[$j]->{'amount'} * $test), 2)) * $ml;
-        $trans->[$j]->{'umsatz'} = abs($form->round_amount(($trans->[$j]->{'amount'} * $test), 2)) * $ml;
+        my $tax_rate             = 1 + $taxes{ $taxid_taxkeys{$trans->[$j]->{'taxkey'}} };
+        $new_trans{'amount'}     = $form->round_amount(($trans->[$j]->{'amount'} * $tax_rate * -1), 2);
+        $new_trans{'umsatz'}     = abs($form->round_amount(($trans->[$j]->{'amount'} * $tax_rate), 2)) * $ml;
+        $trans->[$j]->{'umsatz'} = abs($form->round_amount(($trans->[$j]->{'amount'} * $tax_rate), 2)) * $ml;

 
         push @splits, [ \%new_trans, $trans->[$j] ];
         push @{ $form->{DATEV} }, $splits[-1];
 
         push @splits, [ \%new_trans, $trans->[$j] ];
         push @{ $form->{DATEV} }, $splits[-1];