trim-Funktion zum Entfernen führender und anhängender Whitespaces

[kivitendo-erp.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index cc988141303b0d07f95cf59d553fae0e3601b989..d2aa049274fe4dac1a4b4f74e8de5fa528650289 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -951,6 +951,8 @@ sub round_amount {
 
   return 0 if !defined $amount;
 
 
   return 0 if !defined $amount;
 

+  $places //= 0;
+

   if ($adjust) {
     my $precision = $::instance_conf->get_precision || 0.01;
     return $self->round_amount( $self->round_amount($amount / $precision, 0) * $precision, $places);
   if ($adjust) {
     my $precision = $::instance_conf->get_precision || 0.01;
     return $self->round_amount( $self->round_amount($amount / $precision, 0) * $precision, $places);


@@ -3671,11 +3673,12 @@ sub calculate_tax {
 
   my ($self,$amount,$taxrate,$taxincluded,$roundplaces) = @_;
 
 
   my ($self,$amount,$taxrate,$taxincluded,$roundplaces) = @_;
 

-  $roundplaces = 2 unless defined $roundplaces;
+  $roundplaces //= 2;
+  $taxincluded //= 0;

 
   my $tax;
 
 
   my $tax;
 

-  if ($taxincluded *= 1) {
+  if ($taxincluded) {

     # calculate tax (unrounded), subtract from amount, round amount and round tax
     $tax       = $amount - ($amount / ($taxrate + 1)); # equivalent to: taxrate * amount / (taxrate + 1)
     $amount    = $self->round_amount($amount - $tax, $roundplaces);
     # calculate tax (unrounded), subtract from amount, round amount and round tax
     $tax       = $amount - ($amount / ($taxrate + 1)); # equivalent to: taxrate * amount / (taxrate + 1)
     $amount    = $self->round_amount($amount - $tax, $roundplaces);