From: Stephan Köhler Date: Thu, 19 Jan 2006 13:26:35 +0000 (+0000) Subject: Merge von 798 aus unstable: Bugfix X-Git-Tag: release-2.2.0~23 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e2f6b9d3965445c69b2efb2b3fd4a025b3c1b37c;p=kivitendo-erp.git Merge von 798 aus unstable: Bugfix Quoting Barewords --- diff --git a/SL/PE.pm b/SL/PE.pm index 57c9c67af..5a23fb749 100644 --- a/SL/PE.pm +++ b/SL/PE.pm @@ -136,7 +136,7 @@ sub save_project { # connect to database my $dbh = $form->dbconnect($myconfig); - map { $form->{$_} =~ s/\'/\'\'/g } (projectnumber, description); + map { $form->{$_} =~ s/\'/\'\'/g } qw(projectnumber description); if ($form->{id}) { $query = qq|UPDATE project SET @@ -218,8 +218,7 @@ sub save_partsgroup { # connect to database my $dbh = $form->dbconnect($myconfig); - map { $form->{$_} =~ s/\'/\'\'/g } (partsgroup); - + map { $form->{$_} =~ s/\'/\'\'/g } qw(partsgroup); $form->{discount} /= 100; if ($form->{id}) { @@ -360,7 +359,7 @@ sub save_pricegroup { # connect to database my $dbh = $form->dbconnect($myconfig); - map { $form->{$_} =~ s/\'/\'\'/g } (pricegroup); + map { $form->{$_} =~ s/\'/\'\'/g } qw(pricegroup); $form->{discount} /= 100; diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl index e7e2378a9..8c495f74e 100644 --- a/bin/mozilla/arap.pl +++ b/bin/mozilla/arap.pl @@ -236,7 +236,7 @@ sub name_selected { # delete all the new_ variables for $i (1 .. $form->{lastndx}) { - map { delete $form->{"new_${_}_$i"} } (id, name); + map { delete $form->{"new_${_}_$i"} } qw(id name); } map { delete $form->{$_} } qw(ndx lastndx nextsub); @@ -441,8 +441,8 @@ sub project_selected { sub continue { &{ $form->{nextsub} } } sub gl_transaction { &add } -sub ar_transaction { &add_transaction(ar) } -sub ap_transaction { &add_transaction(ap) } -sub sales_invoice { &add_transaction(is) } -sub vendor_invoice { &add_transaction(ir) } +sub ar_transaction { &add_transaction('ar') } +sub ap_transaction { &add_transaction('ap') } +sub sales_invoice { &add_transaction('is') } +sub vendor_invoice { &add_transaction('ir') } diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index ed8aadca3..6d4cb661e 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -1259,7 +1259,7 @@ sub form_header { # with JavaScript Calendar $button1 = qq| - {transdate} tabindex="2" $readonly> + text('button') . qq|> |; @@ -1272,7 +1272,7 @@ sub form_header { # without JavaScript Calendar $button1 = - qq|{transdate} tabindex="2" $readonly>|; + qq||; } $form->header;