Kosmetik

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

diff --git a/SL/Form.pm b/SL/Form.pm
index 7fc4456f9ae47c240eff9744a1df491d79c51688..978a01596a90e835eebe9b0f9a76ad5796e3e3da 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -181,7 +181,7 @@ sub new {
   $self->{action} = lc $self->{action};
   $self->{action} =~ s/( |-|,|\#)/_/g;
 
   $self->{action} = lc $self->{action};
   $self->{action} =~ s/( |-|,|\#)/_/g;
 

-  $self->{version}   = "2.4.2";
+  $self->{version}   = "2.4.3";

 
   $main::lxdebug->leave_sub();
 
 
   $main::lxdebug->leave_sub();
 


@@ -532,6 +532,10 @@ sub _prepare_html_template {
   $additional_params->{"conf_latex_templates"}        = $main::latex;
   $additional_params->{"conf_opendocument_templates"} = $main::opendocument_templates;
 
   $additional_params->{"conf_latex_templates"}        = $main::latex;
   $additional_params->{"conf_opendocument_templates"} = $main::opendocument_templates;
 

+  if (%main::debug_options) {
+    map { $additional_params->{'DEBUG_' . uc($_)} = $main::debug_options{$_} } keys %main::debug_options;
+  }
+

   $main::lxdebug->leave_sub();
 
   return $file;
   $main::lxdebug->leave_sub();
 
   return $file;


@@ -578,8 +582,6 @@ sub parse_html_template2 {
   $file = $self->_prepare_html_template($file, $additional_params);
 
   my $template = Template->new({ 'INTERPOLATE' => 0,
   $file = $self->_prepare_html_template($file, $additional_params);
 
   my $template = Template->new({ 'INTERPOLATE' => 0,

-                                 'PRE_CHOMP'   => Template::Constants::CHOMP_COLLAPSE,
-                                 'POST_CHOMP'  => Template::Constants::CHOMP_COLLAPSE,

                                  'EVAL_PERL'   => 0,
                                  'ABSOLUTE'    => 1,
                                  'CACHE_SIZE'  => 0,
                                  'EVAL_PERL'   => 0,
                                  'ABSOLUTE'    => 1,
                                  'CACHE_SIZE'  => 0,


@@ -688,7 +690,9 @@ sub redirect {
 
   if ($self->{callback}) {
 
 
   if ($self->{callback}) {
 

-    ($script, $argv) = split(/\?/, $self->{callback});
+    ($script, $argv) = split(/\?/, $self->{callback}, 2);
+    $script =~ s|.*/||;
+    $script =~ s|[^a-zA-Z_\.]||g;

     exec("perl", "$script", $argv);
 
   } else {
     exec("perl", "$script", $argv);
 
   } else {


@@ -1467,6 +1471,7 @@ sub add_shipto {
 
   my $shipto;
   my @values;
 
   my $shipto;
   my @values;

+

   foreach my $item (qw(name department_1 department_2 street zipcode city country
                        contact phone fax email)) {
     if ($self->{"shipto$item"}) {
   foreach my $item (qw(name department_1 department_2 street zipcode city country
                        contact phone fax email)) {
     if ($self->{"shipto$item"}) {


@@ -1474,6 +1479,7 @@ sub add_shipto {
     }
     push(@values, $self->{"shipto${item}"});
   }
     }
     push(@values, $self->{"shipto${item}"});
   }

+

   if ($shipto) {
     if ($self->{shipto_id}) {
       my $query = qq|UPDATE shipto set
   if ($shipto) {
     if ($self->{shipto_id}) {
       my $query = qq|UPDATE shipto set


@@ -1502,8 +1508,10 @@ sub add_shipto {
                        shiptocontact = ? AND
                        shiptophone = ? AND
                        shiptofax = ? AND
                        shiptocontact = ? AND
                        shiptophone = ? AND
                        shiptofax = ? AND

-                       shiptoemail = ?|;
-      my $insert_check = selectfirst_hashref_query($self, $dbh, $query, @values);
+                       shiptoemail = ? AND
+                       module = ? AND 
+                       trans_id = ?|;
+      my $insert_check = selectfirst_hashref_query($self, $dbh, $query, @values, $module, $id);

       if(!$insert_check){
         $query =
           qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2,
       if(!$insert_check){
         $query =
           qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2,


@@ -2646,8 +2654,14 @@ sub update_defaults {
   my ($var) = $sth->fetchrow_array;
   $sth->finish;
 
   my ($var) = $sth->fetchrow_array;
   $sth->finish;
 

-  $var =~ s/\d+$/ sprintf '%0*d', length($&), $&+1 /e;
-  $var ||= 1;
+  if ($var =~ m/\d+$/) {
+    my $new_var  = (substr $var, $-[0]) * 1 + 1;
+    my $len_diff = length($var) - $-[0] - length($new_var);
+    $var         = substr($var, 0, $-[0]) . ($len_diff > 0 ? '0' x $len_diff : '') . $new_var;
+
+  } else {
+    $var = $var . '1';
+  }

 
   $query = qq|UPDATE defaults SET $fld = ?|;
   do_query($self, $dbh, $query, $var);
 
   $query = qq|UPDATE defaults SET $fld = ?|;
   do_query($self, $dbh, $query, $var);


@@ -2678,8 +2692,15 @@ sub update_business {
        WHERE id = ? FOR UPDATE|;
   my ($var) = selectrow_query($self, $dbh, $query, $business_id);
 
        WHERE id = ? FOR UPDATE|;
   my ($var) = selectrow_query($self, $dbh, $query, $business_id);
 

-  $var =~ s/\d+$/ sprintf '%0*d', length($&), $&+1 /e;
-  
+  if ($var =~ m/\d+$/) {
+    my $new_var  = (substr $var, $-[0]) * 1 + 1;
+    my $len_diff = length($var) - $-[0] - length($new_var);
+    $var         = substr($var, 0, $-[0]) . ($len_diff > 0 ? '0' x $len_diff : '') . $new_var;
+
+  } else {
+    $var = $var . '1';
+  }
+

   $query = qq|UPDATE business
               SET customernumberinit = ?
               WHERE id = ?|;
   $query = qq|UPDATE business
               SET customernumberinit = ?
               WHERE id = ?|;