Einkaufs-/Verkaufssuchen: bei Textfeldern führende/anhängende Whitespaces entfernen

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

diff --git a/SL/Form.pm b/SL/Form.pm
index 1f380b7..98bb4db 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -75,6 +75,7 @@ use SL::PrefixedNumber;
 use SL::Request;
 use SL::Template;
 use SL::User;
+use SL::Util;
 use SL::X;
 use Template;
 use URI;
@@ -3001,19 +3002,9 @@ sub current_date {
 }
 
 sub like {
-  $main::lxdebug->enter_sub();
-
   my ($self, $string) = @_;
 
-  if ($string !~ /%/) {
-    $string = "%$string%";
-  }
-
-  $string =~ s/\'/\'\'/g;
-
-  $main::lxdebug->leave_sub();
-
-  return $string;
+  return "%" . SL::Util::trim($string // '') . "%";
 }
 
 sub redo_rows {
@@ -3673,11 +3664,12 @@ sub calculate_tax {
 
   my ($self,$amount,$taxrate,$taxincluded,$roundplaces) = @_;
 
-  $roundplaces = 2 unless defined $roundplaces;
+  $roundplaces //= 2;
+  $taxincluded //= 0;
 
   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);