Merge von 798 aus unstable: Bugfix

Quoting Barewords

diff --git a/SL/PE.pm b/SL/PE.pm
index 57c9c67afa6c731a077739571ec29276d68cc463..5a23fb749c9254b2a5a6f118804a862e206d18c0 100644 (file)
--- a/SL/PE.pm
+++ b/SL/PE.pm
@@ -136,7 +136,7 @@ sub save_project {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # 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
 
   if ($form->{id}) {
     $query = qq|UPDATE project SET


@@ -218,8 +218,7 @@ sub save_partsgroup {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # 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}) {
   $form->{discount} /= 100;
 
   if ($form->{id}) {


@@ -360,7 +359,7 @@ sub save_pricegroup {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 

-  map { $form->{$_} =~ s/\'/\'\'/g } (pricegroup);
+  map { $form->{$_} =~ s/\'/\'\'/g } qw(pricegroup);

 
   $form->{discount} /= 100;
 
 
   $form->{discount} /= 100;
 

diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl
index e7e2378a9e80eb4158d554fc4ccdc3461dd88676..8c495f74eb4e35259b59d67ec0f3381feda28193 100644 (file)
--- 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}) {
 
   # 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);
   }
 
   map { delete $form->{$_} } qw(ndx lastndx nextsub);


@@ -441,8 +441,8 @@ sub project_selected {
 
 sub continue       { &{ $form->{nextsub} } }
 sub gl_transaction { &add }
 
 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 ed8aadca3cc676aa7c6b72019dea715d49c4462b..6d4cb661efeb8f9310a782c2be8b314e8da12b3c 100644 (file)
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -1259,7 +1259,7 @@ sub form_header {
 
     # with JavaScript Calendar
     $button1 = qq|
 
     # with JavaScript Calendar
     $button1 = qq|

-       <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate} tabindex="2" $readonly>
+       <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" tabindex="2" $readonly>

        <input type=button name=transdate id="trigger1" value=|
       . $locale->text('button') . qq|></td>  
        |;
        <input type=button name=transdate id="trigger1" value=|
       . $locale->text('button') . qq|></td>  
        |;


@@ -1272,7 +1272,7 @@ sub form_header {
 
     # without JavaScript Calendar
     $button1 =
 
     # without JavaScript Calendar
     $button1 =

-      qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate} tabindex="2" $readonly></td>|;
+      qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" tabindex="2" $readonly></td>|;

   }
 
   $form->header;
   }
 
   $form->header;