X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/e98e20941b580769e3f4e6e2bcac60a679b7e06b..ac23cb3bc7c7fd50f5a0b02281f233e971b86d78:/SL/Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 4bea5f094..57bd84beb 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -42,6 +42,7 @@ use Cwd;
 use HTML::Template;
 use SL::Template;
 use CGI::Ajax;
+use SL::DBUtils;
 use SL::Menu;
 use CGI;
 
@@ -146,7 +147,7 @@ sub new {
   $self->{action} = lc $self->{action};
   $self->{action} =~ s/( |-|,|\#)/_/g;
 
-  $self->{version}   = "2.4.0";
+  $self->{version}   = "2.4.1";
 
   $main::lxdebug->leave_sub();
 
@@ -409,7 +410,7 @@ function fokus(){document.$self->{fokus}.focus();}
       ($self->{title})
       ? "$self->{title} - $self->{titlebar}"
       : $self->{titlebar};
-    $ajax = "";
+    my $ajax = "";
     foreach $item (@ { $self->{AJAX} }) {
       $ajax .= $item->show_javascript();
     }
@@ -576,31 +577,19 @@ sub write_trigger {
 
   # set dateform for jsscript
   # default
-  $ifFormat = "%d.%m.%Y";
-  if ($myconfig->{dateformat} eq "dd.mm.yy") {
-    $ifFormat = "%d.%m.%Y";
-  } else {
-    if ($myconfig->{dateformat} eq "dd-mm-yy") {
-      $ifFormat = "%d-%m-%Y";
-    } else {
-      if ($myconfig->{dateformat} eq "dd/mm/yy") {
-        $ifFormat = "%d/%m/%Y";
-      } else {
-        if ($myconfig->{dateformat} eq "mm/dd/yy") {
-          $ifFormat = "%m/%d/%Y";
-        } else {
-          if ($myconfig->{dateformat} eq "mm-dd-yy") {
-            $ifFormat = "%m-%d-%Y";
-          } else {
-            if ($myconfig->{dateformat} eq "yyyy-mm-dd") {
-              $ifFormat = "%Y-%m-%d";
-            }
-          }
-        }
-      }
-    }
-  }
+  my %dateformats = (
+    "dd.mm.yy" => "%d.%m.%Y",
+    "dd-mm-yy" => "%d-%m-%Y",
+    "dd/mm/yy" => "%d/%m/%Y",
+    "mm/dd/yy" => "%m/%d/%Y",
+    "mm-dd-yy" => "%m-%d-%Y",
+    "yyyy-mm-dd" => "%Y-%m-%d",
+    );
+
+  my $ifFormat = defined($dateformats{$myconfig{"dateformat"}}) ?
+    $dateformats{$myconfig{"dateformat"}} : "%d.%m.%Y";
 
+  my @triggers;
   while ($#_ >= 2) {
     push @triggers, qq|
        Calendar.setup(
@@ -780,6 +769,7 @@ sub parse_template {
          co_ustid taxnumber duns));
   map({ $self->{"employee_${_}"} =~ s/\\n/\n/g; }
       qw(company address signature));
+  map({ $self->{$_} =~ s/\\n/\n/g; } qw(company address signature));
 
   $self->{copies} = 1 if (($self->{copies} *= 1) <= 0);
 
@@ -839,7 +829,12 @@ sub parse_template {
 
       } else {
 
-        @{ $mail->{attachments} } = ($self->{tmpfile}) unless ($self->{do_not_attach});
+        if (!$self->{"do_not_attach"}) {
+          @{ $mail->{attachments} } =
+            ({ "filename" => $self->{"tmpfile"},
+               "name" => $self->{"attachment_filename"} ?
+                 $self->{"attachment_filename"} : $self->{"tmpfile"} });
+        }
 
         $mail->{message}       =~ s/\r\n/\n/g;
         $myconfig->{signature} =~ s/\\n/\n/g;
@@ -868,10 +863,10 @@ sub parse_template {
           open(OUT, $self->{OUT})
             or $self->error($self->cleanup . "$self->{OUT} : $!");
         } else {
-
+          $self->{attachment_filename} = $self->{tmpfile} if ($self->{attachment_filename} eq '');
           # launch application
           print qq|Content-Type: | . $template->get_mime_type() . qq|
-Content-Disposition: attachment; filename="$self->{tmpfile}"
+Content-Disposition: attachment; filename="$self->{attachment_filename}"
 Content-Length: $numbytes
 
 |;
@@ -1128,23 +1123,70 @@ sub set_payment_options {
 
     my $dbh = $self->dbconnect($myconfig);
 
+    my $query =
+      qq|SELECT p.terms_netto, p.terms_skonto, p.percent_skonto, | .
+      qq|p.description_long | .
+      qq|FROM payment_terms p | .
+      qq|WHERE p.id = ?|;
 
-    my $query = qq|SELECT p.terms_netto, p.terms_skonto, p.percent_skonto, p.description_long FROM payment_terms p
-                  WHERE p.id = $self->{payment_id}|;
-    my $sth = $dbh->prepare($query);
-    $sth->execute || $self->dberror($query);
-  
-    ($self->{terms_netto}, $self->{terms_skonto}, $self->{percent_skonto}, $self->{payment_terms}) = $sth->fetchrow_array;
+    ($self->{terms_netto}, $self->{terms_skonto}, $self->{percent_skonto},
+     $self->{payment_terms}) =
+       selectrow_query($self, $dbh, $query, $self->{payment_id});
 
-    $sth->finish;
-    my $query = qq|SELECT date '$transdate' + $self->{terms_netto} AS netto_date,date '$transdate' + $self->{terms_skonto} AS skonto_date  FROM payment_terms
-                  LIMIT 1|;
-    my $sth = $dbh->prepare($query);
-    $sth->execute || $self->dberror($query);    
-    ($self->{netto_date}, $self->{skonto_date}) = $sth->fetchrow_array;
-    $sth->finish;
+    if ($transdate eq "") {
+      if ($self->{invdate}) {
+        $transdate = $self->{invdate};
+      } else {
+        $transdate = $self->{transdate};
+      }
+    }
+
+    $query =
+      qq|SELECT date '$transdate' + $self->{terms_netto} AS netto_date, | .
+      qq|date '$transdate' + $self->{terms_skonto} AS skonto_date | .
+      qq|FROM payment_terms LIMIT 1|;
+    ($self->{netto_date}, $self->{skonto_date}) =
+      selectrow_query($self, $dbh, $query);
+
+    my $total = ($self->{invtotal}) ? $self->{invtotal} : $self->{ordtotal};
+    my $skonto_amount = $self->parse_amount($myconfig, $total) *
+      $self->{percent_skonto};
+
+    $self->{skonto_amount} =
+      $self->format_amount($myconfig, $skonto_amount, 2);
+
+    if ($self->{"language_id"}) {
+      $query =
+        qq|SELECT t.description_long, | .
+        qq|l.output_numberformat, l.output_dateformat, l.output_longdates | .
+        qq|FROM translation_payment_terms t | .
+        qq|LEFT JOIN language l ON t.language_id = l.id | .
+        qq|WHERE (t.language_id = ?) AND (t.payment_terms_id = ?)|;
+      my ($description_long, $output_numberformat, $output_dateformat,
+        $output_longdates) =
+        selectrow_query($self, $dbh, $query,
+                        $self->{"language_id"}, $self->{"payment_id"});
+
+      $self->{payment_terms} = $description_long if ($description_long);
+
+      if ($output_dateformat) {
+        foreach my $key (qw(netto_date skonto_date)) {
+          $self->{$key} =
+            $main::locale->reformat_date($myconfig, $self->{$key},
+                                         $output_dateformat,
+                                         $output_longdates);
+        }
+      }
 
-    $self->{skonto_amount} = $self->format_amount($myconfig, ($self->parse_amount($myconfig, $self->{subtotal}) * $self->{percent_skonto}), 2);
+      if ($output_numberformat &&
+          ($output_numberformat ne $myconfig->{"numberformat"})) {
+        my $saved_numberformat = $myconfig->{"numberformat"};
+        $myconfig->{"numberformat"} = $output_numberformat;
+        $self->{skonto_amount} =
+          $self->format_amount($myconfig, $skonto_amount, 2);
+        $myconfig->{"numberformat"} = $saved_numberformat;
+      }
+    }
 
     $self->{payment_terms} =~ s/<%netto_date%>/$self->{netto_date}/g;
     $self->{payment_terms} =~ s/<%skonto_date%>/$self->{skonto_date}/g;
@@ -1558,7 +1600,7 @@ sub all_vc {
   # get payment terms
   $query = qq|SELECT id, description
               FROM payment_terms
-	      ORDER BY 1|;
+              ORDER BY sortkey|;
   $sth = $dbh->prepare($query);
   $sth->execute || $self->dberror($query);
 
@@ -1608,7 +1650,7 @@ sub language_payment {
   # get payment terms
   $query = qq|SELECT id, description
               FROM payment_terms
-	      ORDER BY 1|;
+              ORDER BY sortkey|;
   $sth = $dbh->prepare($query);
   $sth->execute || $self->dberror($query);
 
@@ -2403,204 +2445,52 @@ sub audittrail {
 
 }
 
-package Locale;
 
-sub new {
-  $main::lxdebug->enter_sub();
-
-  my ($type, $country, $NLS_file) = @_;
-  my $self = {};
-
-  if ($country && -d "locale/$country") {
-    local *IN;
-    $self->{countrycode} = $country;
-    if (open(IN, "locale/$country/$NLS_file")) {
-      my $code = join("", <IN>);
-      eval($code);
-      close(IN);
-    }
-  }
-
-  $self->{NLS_file} = $NLS_file;
-
-  push @{ $self->{LONG_MONTH} },
-    ("January",   "February", "March",    "April",
-     "May ",      "June",     "July",     "August",
-     "September", "October",  "November", "December");
-  push @{ $self->{SHORT_MONTH} },
-    (qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec));
-
-  $main::lxdebug->leave_sub();
-
-  bless $self, $type;
-}
-
-sub text {
-  my ($self, $text) = @_;
-
-  return (exists $self->{texts}{$text}) ? $self->{texts}{$text} : $text;
-}
-
-sub findsub {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $text) = @_;
-
-  if (exists $self->{subs}{$text}) {
-    $text = $self->{subs}{$text};
-  } else {
-    if ($self->{countrycode} && $self->{NLS_file}) {
-      Form->error(
-         "$text not defined in locale/$self->{countrycode}/$self->{NLS_file}");
-    }
-  }
-
-  $main::lxdebug->leave_sub();
-
-  return $text;
-}
+sub all_years {
+# usage $form->all_years($myconfig, [$dbh])
+# return list of all years where bookings found
+# (@all_years)
 
-sub date {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $date, $longformat) = @_;
-
-  my $longdate  = "";
-  my $longmonth = ($longformat) ? 'LONG_MONTH' : 'SHORT_MONTH';
-
-  if ($date) {
-
-    # get separator
-    $spc = $myconfig->{dateformat};
-    $spc =~ s/\w//g;
-    $spc = substr($spc, 1, 1);
-
-    if ($date =~ /\D/) {
-      if ($myconfig->{dateformat} =~ /^yy/) {
-        ($yy, $mm, $dd) = split /\D/, $date;
-      }
-      if ($myconfig->{dateformat} =~ /^mm/) {
-        ($mm, $dd, $yy) = split /\D/, $date;
-      }
-      if ($myconfig->{dateformat} =~ /^dd/) {
-        ($dd, $mm, $yy) = split /\D/, $date;
-      }
-    } else {
-      $date = substr($date, 2);
-      ($yy, $mm, $dd) = ($date =~ /(..)(..)(..)/);
-    }
-
-    $dd *= 1;
-    $mm--;
-    $yy = ($yy < 70) ? $yy + 2000 : $yy;
-    $yy = ($yy >= 70 && $yy <= 99) ? $yy + 1900 : $yy;
-
-    if ($myconfig->{dateformat} =~ /^dd/) {
-      if (defined $longformat && $longformat == 0) {
-        $mm++;
-        $dd = "0$dd" if ($dd < 10);
-        $mm = "0$mm" if ($mm < 10);
-        $longdate = "$dd$spc$mm$spc$yy";
-      } else {
-        $longdate = "$dd";
-        $longdate .= ($spc eq '.') ? ". " : " ";
-        $longdate .= &text($self, $self->{$longmonth}[$mm]) . " $yy";
-      }
-    } elsif ($myconfig->{dateformat} eq "yyyy-mm-dd") {
-
-      # Use German syntax with the ISO date style "yyyy-mm-dd" because
-      # Lx-Office is mainly used in Germany or German speaking countries.
-      if (defined $longformat && $longformat == 0) {
-        $mm++;
-        $dd = "0$dd" if ($dd < 10);
-        $mm = "0$mm" if ($mm < 10);
-        $longdate = "$yy-$mm-$dd";
-      } else {
-        $longdate = "$dd. ";
-        $longdate .= &text($self, $self->{$longmonth}[$mm]) . " $yy";
-      }
-    } else {
-      if (defined $longformat && $longformat == 0) {
-        $mm++;
-        $dd = "0$dd" if ($dd < 10);
-        $mm = "0$mm" if ($mm < 10);
-        $longdate = "$mm$spc$dd$spc$yy";
-      } else {
-        $longdate = &text($self, $self->{$longmonth}[$mm]) . " $dd, $yy";
-      }
-    }
-
+  my ($self, $myconfig, $dbh) = @_;
+  
+  my $disconnect = 0;
+  if (! $dbh) {
+    $dbh = $self->dbconnect($myconfig);
+    $disconnect = 1;
   }
-
-  $main::lxdebug->leave_sub();
-
-  return $longdate;
-}
-
-sub parse_date {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $date, $longformat) = @_;
-
-  unless ($date) {
-    $main::lxdebug->leave_sub();
-    return ();
+ 
+  # get years
+  my $query = qq|SELECT (SELECT MIN(transdate) FROM acc_trans),
+                     (SELECT MAX(transdate) FROM acc_trans)
+              FROM defaults|;
+  my ($startdate, $enddate) = $dbh->selectrow_array($query);
+
+  if ($myconfig->{dateformat} =~ /^yy/) {
+    ($startdate) = split /\W/, $startdate;
+    ($enddate) = split /\W/, $enddate;
+  } else { 
+    (@_) = split /\W/, $startdate;
+    $startdate = $_[2];
+    (@_) = split /\W/, $enddate;
+    $enddate = $_[2]; 
+  }
+
+  my @all_years;
+  $startdate = substr($startdate,0,4);
+  $enddate = substr($enddate,0,4);
+  
+  while ($enddate >= $startdate) {
+    push @all_years, $enddate--;
   }
 
-  # get separator
-  $spc = $myconfig->{dateformat};
-  $spc =~ s/\w//g;
-  $spc = substr($spc, 1, 1);
-
-  if ($date =~ /\D/) {
-    if ($myconfig->{dateformat} =~ /^yy/) {
-      ($yy, $mm, $dd) = split /\D/, $date;
-    } elsif ($myconfig->{dateformat} =~ /^mm/) {
-      ($mm, $dd, $yy) = split /\D/, $date;
-    } elsif ($myconfig->{dateformat} =~ /^dd/) {
-      ($dd, $mm, $yy) = split /\D/, $date;
-    }
-  } else {
-    $date = substr($date, 2);
-    ($yy, $mm, $dd) = ($date =~ /(..)(..)(..)/);
-  }
+  $dbh->disconnect if $disconnect;
 
-  $dd *= 1;
-  $mm *= 1;
-  $yy = ($yy < 70) ? $yy + 2000 : $yy;
-  $yy = ($yy >= 70 && $yy <= 99) ? $yy + 1900 : $yy;
+  return @all_years;
 
   $main::lxdebug->leave_sub();
-  return ($yy, $mm, $dd);
 }
 
-sub reformat_date {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $date, $output_format, $longformat) = @_;
-
-  $main::lxdebug->leave_sub() and return "" unless ($date);
-
-  my ($yy, $mm, $dd) = $self->parse_date($myconfig, $date);
-
-  $output_format =~ /d+/;
-  substr($output_format, $-[0], $+[0] - $-[0]) =
-    sprintf("%0" . (length($&)) . "d", $dd);
-
-  $output_format =~ /m+/;
-  substr($output_format, $-[0], $+[0] - $-[0]) =
-    sprintf("%0" . (length($&)) . "d", $mm);
-
-  $output_format =~ /y+/;
-  if (length($&) == 2) {
-    $yy -= $yy >= 2000 ? 2000 : 1900;
-  }
-  substr($output_format, $-[0], $+[0] - $-[0]) =
-    sprintf("%0" . (length($&)) . "d", $yy);
-
-  $main::lxdebug->leave_sub();
-
-  return $output_format;
-}
 
 1;