X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAP.pm;h=0d132293f12a63772588e1f0ab093ad0c1debcba;hb=1c2349448daef916a5403b21fd0d38d859de7843;hp=d490739f72953f038314b7efb0298fc1a1f6ac53;hpb=f4d0698c501d246634b31f0a61a2cfe859d25d7b;p=kivitendo-erp.git diff --git a/SL/AP.pm b/SL/AP.pm index d490739f7..0d132293f 100644 --- a/SL/AP.pm +++ b/SL/AP.pm @@ -100,22 +100,28 @@ sub post_transaction { $form->{AP_amounts}{"amount_$i"}{taxkey} = $form->{"taxkey_$i"}; $sth->finish; - if (!$form->{"korrektur_$i"}) { - if ($form->{taxincluded} *= 1) { + if ($form->{taxincluded} *= 1) { + if (!$form->{"korrektur_$i"}) { $tax = $form->{"amount_$i"} - ($form->{"amount_$i"} / ($form->{"taxrate_$i"} + 1)); - $amount = $form->{"amount_$i"} - $tax; - $form->{"amount_$i"} = $form->round_amount($amount, 2); - $diff += $amount - $form->{"amount_$i"}; - $form->{"tax_$i"} = $form->round_amount($tax, 2); - $form->{netamount} += $form->{"amount_$i"}; } else { + $tax = $form->{"tax_$i"}; + } + $amount = $form->{"amount_$i"} - $tax; + $form->{"amount_$i"} = $form->round_amount($amount, 2); + $diff += $amount - $form->{"amount_$i"}; + $form->{"tax_$i"} = $form->round_amount($tax, 2); + $form->{netamount} += $form->{"amount_$i"}; + } else { + if (!$form->{"korrektur_$i"}) { $form->{"tax_$i"} = $form->{"amount_$i"} * $form->{"taxrate_$i"}; - $form->{"tax_$i"} = - $form->round_amount($form->{"tax_$i"} * $form->{exchangerate}, 2); - $form->{netamount} += $form->{"amount_$i"}; + } else { + $tax = $form->{"tax_$i"}; } + $form->{"tax_$i"} = + $form->round_amount($form->{"tax_$i"} * $form->{exchangerate}, 2); + $form->{netamount} += $form->{"amount_$i"}; } $form->{total_tax} += $form->{"tax_$i"} * -1; }