warnings: besseres sanitizing in Form::calculate_tax

diff --git a/SL/Form.pm b/SL/Form.pm
index 1f380b7cfce1e7482ce77aa4151e6da414ce416a..d2aa049274fe4dac1a4b4f74e8de5fa528650289 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -3673,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);