X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=5abc672c040dba3b87482ad706cc2e2bb3910683;hb=a43c94fd42214048fc61bcd4404f2800e92c49de;hp=80c1ef72cbe6f4aea7d8f9968b526b5f22fecfc3;hpb=fe0f6f38468da0d737079034f0174c59d526d32c;p=kivitendo-erp.git

diff --git a/SL/Form.pm b/SL/Form.pm
index 80c1ef72c..5abc672c0 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1,4 +1,4 @@
-#=====================================================================
+#====================================================================
 # LX-Office ERP
 # Copyright (C) 2004
 # Based on SQL-Ledger Version 2.1.9
@@ -36,9 +36,17 @@
 #======================================================================
 
 package Form;
+use Data::Dumper;
+
+use Cwd;
+use HTML::Template;
+use SL::Template;
+use CGI::Ajax;
+use SL::Menu;
+use CGI;
 
 sub _input_to_hash {
-  $main::lxdebug->enter_sub();
+  $main::lxdebug->enter_sub(2);
 
   my $input = $_[0];
   my %in    = ();
@@ -49,13 +57,13 @@ sub _input_to_hash {
     $in{$name} = unescape(undef, $value);
   }
 
-  $main::lxdebug->leave_sub();
+  $main::lxdebug->leave_sub(2);
 
   return %in;
 }
 
 sub _request_to_hash {
-  $main::lxdebug->enter_sub();
+  $main::lxdebug->enter_sub(2);
 
   my ($input) = @_;
   my ($i,        $loc,  $key,    $val);
@@ -106,11 +114,11 @@ sub _request_to_hash {
       }
     }
 
-    $main::lxdebug->leave_sub();
+    $main::lxdebug->leave_sub(2);
     return %ATTACH;
 
       } else {
-    $main::lxdebug->leave_sub();
+    $main::lxdebug->leave_sub(2);
     return _input_to_hash($input);
   }
 }
@@ -135,13 +143,10 @@ sub new {
   my %parameters = _request_to_hash($_);
   map({ $self->{$_} = $parameters{$_}; } keys(%parameters));
 
-  $self->{menubar} = 1 if $self->{path} =~ /lynx/i;
-
   $self->{action} = lc $self->{action};
-  $self->{action} =~ s/( |-|,|#)/_/g;
+  $self->{action} =~ s/( |-|,|\#)/_/g;
 
-  $self->{version}   = "2.1.2";
-  $self->{dbversion} = "2.1.2";
+  $self->{version}   = "2.4-RC2";
 
   $main::lxdebug->leave_sub();
 
@@ -161,7 +166,7 @@ sub debug {
 }
 
 sub escape {
-  $main::lxdebug->enter_sub();
+  $main::lxdebug->enter_sub(2);
 
   my ($self, $str, $beenthere) = @_;
 
@@ -172,13 +177,13 @@ sub escape {
 
   $str =~ s/([^a-zA-Z0-9_.-])/sprintf("%%%02x", ord($1))/ge;
 
-  $main::lxdebug->leave_sub();
+  $main::lxdebug->leave_sub(2);
 
   return $str;
 }
 
 sub unescape {
-  $main::lxdebug->enter_sub();
+  $main::lxdebug->enter_sub(2);
 
   my ($self, $str) = @_;
 
@@ -187,7 +192,7 @@ sub unescape {
 
   $str =~ s/%([0-9a-fA-Z]{2})/pack("c",hex($1))/eg;
 
-  $main::lxdebug->leave_sub();
+  $main::lxdebug->leave_sub(2);
 
   return $str;
 }
@@ -195,61 +200,71 @@ sub unescape {
 sub quote {
   my ($self, $str) = @_;
 
-  if ($str && ! ref($str)) {
-    $str =~ s/"/"/g;
+  if ($str && !ref($str)) {
+    $str =~ s/\"/"/g;
   }
 
   $str;
 
 }
 
-
 sub unquote {
   my ($self, $str) = @_;
 
-  if ($str && ! ref($str)) {
-    $str =~ s/"/"/g;
+  if ($str && !ref($str)) {
+    $str =~ s/"/\"/g;
   }
 
   $str;
 
 }
 
- 
+sub quote_html {
+  $main::lxdebug->enter_sub(2);
+
+  my ($self, $str) = @_;
+
+  my %replace =
+    ('order' => ['"', '<', '>'],
+     '<'             => '&lt;',
+     '>'             => '&gt;',
+     '"'             => '&quot;',
+    );
+
+  map({ $str =~ s/$_/$replace{$_}/g; } @{ $replace{"order"} });
+
+  $main::lxdebug->leave_sub(2);
+
+  return $str;
+}
+
 sub hide_form {
   my $self = shift;
 
   if (@_) {
-    for (@_) { print qq|<input type=hidden name="$_" value="|.$self->quote($self->{$_}).qq|">\n| }
+    for (@_) {
+      print qq|<input type=hidden name="$_" value="|
+        . $self->quote($self->{$_})
+        . qq|">\n|;
+    }
   } else {
     delete $self->{header};
-    for (sort keys %$self) { print qq|<input type=hidden name="$_" value="|.$self->quote($self->{$_}).qq|">\n| }
+    for (sort keys %$self) {
+      print qq|<input type=hidden name="$_" value="|
+        . $self->quote($self->{$_})
+        . qq|">\n|;
+    }
   }
-  
+
 }
 
 sub error {
   $main::lxdebug->enter_sub();
 
   my ($self, $msg) = @_;
-
   if ($ENV{HTTP_USER_AGENT}) {
     $msg =~ s/\n/<br>/g;
-
-    $self->header;
-
-    print qq|
-    <body>
-
-    <h2 class=error>Error!</h2>
-
-    <p><b>$msg</b>
-
-    </body>
-    </html>
-    |;
-
-    die "Error: $msg\n";
+    $self->show_generic_error($msg);
 
   } else {
 
@@ -376,14 +391,14 @@ function fokus(){document.$self->{fokus}.focus();}
     }
 
     #Set Calendar
-    $jsscript = "";
+    my $jsscript = "";
     if ($self->{jsscript} == 1) {
 
       $jsscript = qq|
         <style type="text/css">\@import url(js/jscalendar/calendar-win2k-1.css);</style>
         <script type="text/javascript" src="js/jscalendar/calendar.js"></script>
-        <script type="text/javascript" src="js/jscalendar/lang/calendar-de.js"></script>
-        <script type="text/javascript" src="js/jscalendar/calendar-setup.js"></script>
+        <script type="text/javascript" src="js/jscalendar/lang/calendar-de.js"></script>
+        <script type="text/javascript" src="js/jscalendar/calendar-setup.js"></script>
         $self->{javascript}
        |;
     }
@@ -392,9 +407,13 @@ function fokus(){document.$self->{fokus}.focus();}
       ($self->{title})
       ? "$self->{title} - $self->{titlebar}"
       : $self->{titlebar};
-
+    $ajax = "";
+    foreach $item (@ { $self->{AJAX} }) {
+      $ajax .= $item->show_javascript();
+    }
     print qq|Content-Type: text/html
 
+<html>
 <head>
   <title>$self->{titlebar}</title>
   $stylesheet
@@ -402,7 +421,22 @@ function fokus(){document.$self->{fokus}.focus();}
   $favicon
   $charset
   $jsscript
+  $ajax
   $fokus
+  <meta name="robots" content="noindex,nofollow" />
+  <script type="text/javascript" src="js/highlight_input.js"></script>
+  <link rel="stylesheet" type="text/css" href="css/tabcontent.css" />
+  
+  <script type="text/javascript" src="js/tabcontent.js">
+  
+  /***********************************************
+  * Tab Content script- © Dynamic Drive DHTML code library (www.dynamicdrive.com)
+  * This notice MUST stay intact for legal use
+  * Visit Dynamic Drive at http://www.dynamicdrive.com/ for full source code
+  ***********************************************/
+  
+  </script>
+
 </head>
 
 |;
@@ -412,14 +446,130 @@ function fokus(){document.$self->{fokus}.focus();}
   $main::lxdebug->leave_sub();
 }
 
-# write Trigger JavaScript-Code ($qty = 1 - only one Trigger)
+sub parse_html_template {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $file, $additional_params) = @_;
+  my $language;
+
+  if (!defined($main::myconfig) || !defined($main::myconfig{"countrycode"})) {
+    $language = $main::language;
+  } else {
+    $language = $main::myconfig{"countrycode"};
+  }
+
+  if (-f "templates/webpages/${file}_${language}.html") {
+    if ((-f ".developer") &&
+        (-f "templates/webpages/${file}_master.html") &&
+        ((stat("templates/webpages/${file}_master.html"))[9] >
+         (stat("templates/webpages/${file}_${language}.html"))[9])) {
+      my $info = "Developper information: templates/webpages/${file}_master.html is newer than the localized version.\n" .
+        "Please re-run 'locales.pl' in 'locale/${language}'.";
+      print(qq|<pre>$info</pre>|);
+      die($info);
+    }
+
+    $file = "templates/webpages/${file}_${language}.html";
+  } elsif (-f "templates/webpages/${file}.html") {
+    $file = "templates/webpages/${file}.html";
+  } else {
+    my $info = "Web page template '${file}' not found.\n" .
+      "Please re-run 'locales.pl' in 'locale/${language}'.";
+    print(qq|<pre>$info</pre>|);
+    die($info);
+  }
+
+  my $template = HTML::Template->new("filename" => $file,
+                                     "die_on_bad_params" => 0,
+                                     "strict" => 0,
+                                     "case_sensitive" => 1,
+                                     "loop_context_vars" => 1,
+                                     "global_vars" => 1);
+
+  $additional_params = {} unless ($additional_params);
+  if ($self->{"DEBUG"}) {
+    $additional_params->{"DEBUG"} = $self->{"DEBUG"};
+  }
+
+  if ($additional_params->{"DEBUG"}) {
+    $additional_params->{"DEBUG"} =
+      "<br><em>DEBUG INFORMATION:</em><pre>" . $additional_params->{"DEBUG"} . "</pre>";
+  }
+
+  if (%main::myconfig) {
+    map({ $additional_params->{"myconfig_${_}"} = $main::myconfig{$_}; } keys(%main::myconfig));
+    my $jsc_dateformat = $main::myconfig{"dateformat"};
+    $jsc_dateformat =~ s/d+/\%d/gi;
+    $jsc_dateformat =~ s/m+/\%m/gi;
+    $jsc_dateformat =~ s/y+/\%Y/gi;
+    $additional_params->{"myconfig_jsc_dateformat"} = $jsc_dateformat;
+  }
+
+  $additional_params->{"conf_jscalendar"} = $main::jscalendar;
+  $additional_params->{"conf_lizenzen"} = $main::lizenzen;
+  $additional_params->{"conf_latex_templates"} = $main::latex;
+  $additional_params->{"conf_opendocument_templates"} = $main::opendocument_templates;
+
+  my @additional_param_names = keys(%{$additional_params});
+  foreach my $key ($template->param()) {
+    my $param = $self->{$key};
+    $param = $additional_params->{$key} if (grep(/^${key}$/, @additional_param_names));
+    $param = [] if (($template->query("name" => $key) eq "LOOP") && (ref($param) ne "ARRAY"));
+    $template->param($key => $param);
+  }
+
+  my $output = $template->output();
+
+  $main::lxdebug->leave_sub();
+
+  return $output;
+}
+
+sub show_generic_error {
+  my ($self, $error, $title, $action) = @_;
+
+  my $add_params = {};
+  $add_params->{"title"} = $title if ($title);
+  $self->{"label_error"} = $error;
+
+  my @vars;
+  if ($action) {
+    map({ delete($self->{$_}); } qw(action));
+    map({ push(@vars, { "name" => $_, "value" => $self->{$_} })
+            if (!ref($self->{$_})); }
+        keys(%{$self}));
+    $add_params->{"SHOW_BUTTON"} = 1;
+    $add_params->{"BUTTON_LABEL"} = $action;
+  }
+  $add_params->{"VARIABLES"} = \@vars;
+
+  $self->header();
+  print($self->parse_html_template("generic/error", $add_params));
+
+  die("Error: $error\n");
+}
+
+sub show_generic_information {
+  my ($self, $error, $title) = @_;
+
+  my $add_params = {};
+  $add_params->{"title"} = $title if ($title);
+  $self->{"label_information"} = $error;
+
+  $self->header();
+  print($self->parse_html_template("generic/information", $add_params));
+
+  die("Information: $error\n");
+}
+
+# write Trigger JavaScript-Code ($qty = quantity of Triggers)
+# changed it to accept an arbitrary number of triggers - sschoeling
 sub write_trigger {
   $main::lxdebug->enter_sub();
 
-  my ($self,         $myconfig, $qty,
-      $inputField_1, $align_1,  $button_1,
-      $inputField_2, $align_2,  $button_2)
-    = @_;
+  my $self     = shift;
+  my $myconfig = shift;
+  my $qty      = shift;
 
   # set dateform for jsscript
   # default
@@ -448,35 +598,21 @@ sub write_trigger {
     }
   }
 
-  $trigger_1 = qq|
+  while ($#_ >= 2) {
+    push @triggers, qq|
        Calendar.setup(
-       {
-         inputField  : "$inputField_1",
-         ifFormat    :"$ifFormat",
-         align    : "$align_1",     
-         button      : "$button_1"
-       }
-       );
+      {
+      inputField : "| . (shift) . qq|",
+      ifFormat :"$ifFormat",
+      align : "| .  (shift) . qq|", 
+      button : "| . (shift) . qq|"
+      }
+      );
        |;
-
-  if ($qty == 2) {
-    $trigger_2 = qq|
-       Calendar.setup(
-       {
-         inputField  : "$inputField_2",
-         ifFormat    :"$ifFormat",
-         align    : "$align_2",     
-         button      : "$button_2"
-       }
-       );
-        |;
   }
-  $jsscript = qq|
+  my $jsscript = qq|
        <script type="text/javascript">
-       <!--
-       $trigger_1
-       $trigger_2
-        //-->
+       <!--| . join("", @triggers) . qq|//-->
         </script>
         |;
 
@@ -514,151 +650,138 @@ sub sort_columns {
 
   return @columns;
 }
-
+#
 sub format_amount {
-  $main::lxdebug->enter_sub();
+  $main::lxdebug->enter_sub(2);
 
   my ($self, $myconfig, $amount, $places, $dash) = @_;
-
-  if ($places =~ /\d/) {
-    $amount = $self->round_amount($amount, $places);
+  
+  if ($amount eq "") {
+    $amount = 0;
   }
+  my $neg = ($amount =~ s/-//);
 
-  # is the amount negative
-  my $negative = ($amount < 0);
-  my $fillup = "";
-
-  if ($amount != 0) {
-    if ($myconfig->{numberformat} && ($myconfig->{numberformat} ne '1000.00'))
-    {
-      my ($whole, $dec) = split /\./, "$amount";
-      $whole =~ s/-//;
-      $amount = join '', reverse split //, $whole;
-      $fillup = "0" x ($places - length($dec));
+  $amount = $self->round_amount($amount, $places) if ($places =~ /\d/);
 
-      if ($myconfig->{numberformat} eq '1,000.00') {
-        $amount =~ s/\d{3,}?/$&,/g;
-        $amount =~ s/,$//;
-        $amount = join '', reverse split //, $amount;
-        $amount .= "\.$dec".$fillup;
-      }
-
-      if ($myconfig->{numberformat} eq '1.000,00') {
-        $amount =~ s/\d{3,}?/$&./g;
-        $amount =~ s/\.$//;
-        $amount = join '', reverse split //, $amount;
-        $amount .= ",$dec" .$fillup;
-      }
+  my @d = map { s/\d//g; reverse split // } my $tmp = $myconfig->{numberformat}; # get delim chars
+  my @p = split(/\./, $amount); # split amount at decimal point
 
-      if ($myconfig->{numberformat} eq '1000,00') {
-        $amount = "$whole";
-        $amount .= ",$dec" .$fillup;
-      }
+  $p[0] =~ s/\B(?=(...)*$)/$d[1]/g if $d[1]; # add 1,000 delimiters
 
-      if ($dash =~ /-/) {
-        $amount = ($negative) ? "($amount)" : "$amount";
-      } elsif ($dash =~ /DRCR/) {
-        $amount = ($negative) ? "$amount DR" : "$amount CR";
-      } else {
-        $amount = ($negative) ? "-$amount" : "$amount";
-      }
-    }
-  } else {
-    if ($dash eq "0" && $places) {
-      if ($myconfig->{numberformat} eq '1.000,00') {
-        $amount = "0" . "," . "0" x $places;
-      } else {
-        $amount = "0" . "." . "0" x $places;
-      }
-    } else {
-      $amount = ($dash ne "") ? "$dash" : "0";
-    }
-  }
+  $amount = $p[0];
+  $amount .= $d[0].$p[1].(0 x ($places - length $p[1])) if ($places || $p[1] ne '');
 
-  $main::lxdebug->leave_sub();
+  $amount = do {
+    ($dash =~ /-/)    ? ($neg ? "($amount)"  : "$amount" )    :
+    ($dash =~ /DRCR/) ? ($neg ? "$amount DR" : "$amount CR" ) :
+                        ($neg ? "-$amount"   : "$amount" )    ;
+  };
+    
 
+  $main::lxdebug->leave_sub(2);
   return $amount;
 }
-
+#
 sub parse_amount {
-  $main::lxdebug->enter_sub();
+  $main::lxdebug->enter_sub(2);
 
   my ($self, $myconfig, $amount) = @_;
 
-  if (!(substr($amount, -3, 1) eq ".")) {
-    if (   ($myconfig->{numberformat} eq '1.000,00')
-        || ($myconfig->{numberformat} eq '1000,00')) {
-      $amount =~ s/\.//g;
-      $amount =~ s/,/\./;
-    }
+  if ($myconfig->{in_numberformat} == 1) {
+    # Extra input number format 1000.00 or 1000,00
+    $amount =~ s/,/\./g;
+    $amount = scalar reverse $amount;
+    $amount =~ s/\./DOT/;
+    $amount =~ s/\.//g;
+    $amount =~ s/DOT/\./;
+    $amount = scalar reverse $amount;
+    $main::lxdebug->leave_sub(2);
+    return ($amount * 1);
+  }
 
-    $amount =~ s/,//g;
+  if (   ($myconfig->{numberformat} eq '1.000,00')
+      || ($myconfig->{numberformat} eq '1000,00')) {
+    $amount =~ s/\.//g;
+    $amount =~ s/,/\./;
   }
 
-  $main::lxdebug->leave_sub();
+  if ($myconfig->{numberformat} eq "1'000.00") {
+    $amount =~ s/\'//g;
+  }
+
+  $amount =~ s/,//g;
+
+  $main::lxdebug->leave_sub(2);
 
   return ($amount * 1);
 }
 
 sub round_amount {
-  $main::lxdebug->enter_sub();
+  $main::lxdebug->enter_sub(2);
 
   my ($self, $amount, $places) = @_;
   my $round_amount;
 
   # Rounding like "Kaufmannsrunden"
   # Descr. http://de.wikipedia.org/wiki/Rundung
-  # Inspired by 
+  # Inspired by
   # http://www.perl.com/doc/FAQs/FAQ/oldfaq-html/Q4.13.html
-  # Version 1.0 try to solve Bug: 189
+  # Solves Bug: 189
   # Udo Spallek
-  $amount       = $amount * (10 ** ($places));
-  $round_amount = int($amount + .5 * ($amount <=> 0))/(10**($places));
-  
-  $main::lxdebug->leave_sub();
+  $amount = $amount * (10**($places));
+  $round_amount = int($amount + .5 * ($amount <=> 0)) / (10**($places));
 
-  return $round_amount;
-}
+  $main::lxdebug->leave_sub(2);
 
+  return $round_amount;
 
+}
 
 sub parse_template {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $userspath) = @_;
-
-  # { Moritz Bunkus
-  # Some variables used for page breaks
-  my ($chars_per_line, $lines_on_first_page, $lines_on_second_page) =
-    (0, 0, 0);
-  my ($current_page, $current_line) = (1, 1);
-  my $pagebreak = "";
-  my $sum       = 0;
-
-  # } Moritz Bunkus
-
-  # Make sure that all *notes* (intnotes, partnotes_*, notes etc) are converted to markup correctly.
-  $self->format_string(grep(/notes/, keys(%{$self})));
+  my $template;
+
+  $self->{"cwd"} = getcwd();
+  $self->{"tmpdir"} = $self->{cwd} . "/${userspath}";
+
+  if ($self->{"format"} =~ /(opendocument|oasis)/i) {
+    $template = OpenDocumentTemplate->new($self->{"IN"}, $self, $myconfig, $userspath);
+  } elsif ($self->{"format"} =~ /(postscript|pdf)/i) {
+    $ENV{"TEXINPUTS"} = ".:" . getcwd() . "/" . $myconfig->{"templates"} . ":" . $ENV{"TEXINPUTS"};
+    $template = LaTeXTemplate->new($self->{"IN"}, $self, $myconfig, $userspath);
+  } elsif (($self->{"format"} =~ /html/i) ||
+           (!$self->{"format"} && ($self->{"IN"} =~ /html$/i))) {
+    $template = HTMLTemplate->new($self->{"IN"}, $self, $myconfig, $userspath);
+  } elsif (($self->{"format"} =~ /xml/i) ||
+             (!$self->{"format"} && ($self->{"IN"} =~ /xml$/i))) {
+    $template = XMLTemplate->new($self->{"IN"}, $self, $myconfig, $userspath);
+  } elsif ( $self->{"format"} =~ /elsterwinston/i ) {
+    $template = XMLTemplate->new($self->{"IN"}, $self, $myconfig, $userspath);  
+  } elsif ( $self->{"format"} =~ /elstertaxbird/i ) {
+    $template = XMLTemplate->new($self->{"IN"}, $self, $myconfig, $userspath);
+  } elsif ( defined $self->{'format'}) {
+    $self->error("Outputformat not defined. This may be a future feature: $self->{'format'}");
+  } elsif ( $self->{'format'} eq '' ) {
+    $self->error("No Outputformat given: $self->{'format'}");
+  } else { #Catch the rest
+    $self->error("Outputformat not defined: $self->{'format'}");  
+  }
 
   # Copy the notes from the invoice/sales order etc. back to the variable "notes" because that is where most templates expect it to be.
   $self->{"notes"} = $self->{ $self->{"formname"} . "notes" };
 
   map({ $self->{"employee_${_}"} = $myconfig->{$_}; }
-      qw(email tel fax name signature));
-
-  open(IN, "$self->{templates}/$self->{IN}")
-    or $self->error("$self->{IN} : $!");
-
-  @_ = <IN>;
-  close(IN);
+      qw(email tel fax name signature company address businessnumber));
 
   $self->{copies} = 1 if (($self->{copies} *= 1) <= 0);
 
   # OUT is used for the media, screen, printer, email
   # for postscript we store a copy in a temporary file
   my $fileid = time;
-  $self->{tmpfile} = "$userspath/${fileid}.$self->{IN}";
-  if ($self->{format} =~ /(postscript|pdf)/ || $self->{media} eq 'email') {
+  $self->{tmpfile} = "$userspath/${fileid}.$self->{IN}" if ( $self->{tmpfile} eq '' );
+  if ($template->uses_temp_file() || $self->{media} eq 'email') {
     $out = $self->{OUT};
     $self->{OUT} = ">$self->{tmpfile}";
   }
@@ -670,231 +793,17 @@ sub parse_template {
     $self->header;
   }
 
-  # Do we have to run LaTeX two times? This is needed if
-  # the template contains page references.
-  $two_passes = 0;
-
-  # first we generate a tmpfile
-  # read file and replace <%variable%>
-  while ($_ = shift) {
-
-    $par = "";
-    $var = $_;
-
-    $two_passes = 1 if (/\\pageref/);
-
-    # { Moritz Bunkus
-    # detect pagebreak block and its parameters
-    if (/\s*<%pagebreak ([0-9]+) ([0-9]+) ([0-9]+)%>/) {
-      $chars_per_line       = $1;
-      $lines_on_first_page  = $2;
-      $lines_on_second_page = $3;
-
-      while ($_ = shift) {
-        last if (/\s*<%end pagebreak%>/);
-        $pagebreak .= $_;
-      }
-    }
-
-    # } Moritz Bunkus
-
-    if (/\s*<%foreach /) {
-
-      # this one we need for the count
-      chomp $var;
-      $var =~ s/\s*<%foreach (.+?)%>/$1/;
-      while ($_ = shift) {
-        last if (/\s*<%end /);
-
-        # store line in $par
-        $par .= $_;
-      }
-
-      # display contents of $self->{number}[] array
-      for $i (0 .. $#{ $self->{$var} }) {
-
-        # { Moritz Bunkus
-        # Try to detect whether a manual page break is necessary
-        # but only if there was a <%pagebreak ...%> block before
-
-        if ($chars_per_line) {
-          my $lines =
-            int(length($self->{"description"}[$i]) / $chars_per_line + 0.95);
-          my $lpp;
-
-          my $_description = $self->{"description"}[$i];
-          while ($_description =~ /\\newline/) {
-            $lines++;
-            $_description =~ s/\\newline//;
-          }
-          $self->{"description"}[$i] =~ s/(\\newline\s?)*$//;
-
-          if ($current_page == 1) {
-            $lpp = $lines_on_first_page;
-          } else {
-            $lpp = $lines_on_second_page;
-          }
-
-          # Yes we need a manual page break
-          if (($current_line + $lines) > $lpp) {
-            my $pb = $pagebreak;
-
-            # replace the special variables <%sumcarriedforward%>
-            # and <%lastpage%>
-
-            my $psum = $self->format_amount($myconfig, $sum, 2);
-            $pb =~ s/<%sumcarriedforward%>/$psum/g;
-            $pb =~ s/<%lastpage%>/$current_page/g;
-
-            # only "normal" variables are supported here
-            # (no <%if, no <%foreach, no <%include)
-
-            $pb =~ s/<%(.+?)%>/$self->{$1}/g;
-
-            # page break block is ready to rock
-            print(OUT $pb);
-            $current_page++;
-            $current_line = 1;
-          }
-          $current_line += $lines;
-        }
-        $sum += $self->parse_amount($myconfig, $self->{"linetotal"}[$i]);
-
-        # } Moritz Bunkus
-
-        # don't parse par, we need it for each line
-        $_ = $par;
-        s/<%(.+?)%>/$self->{$1}[$i]/mg;
-        print OUT;
-      }
-      next;
-    }
-
-    # if not comes before if!
-    if (/\s*<%if not /) {
-
-      # check if it is not set and display
-      chop;
-      s/\s*<%if not (.+?)%>/$1/;
-
-      unless ($self->{$_}) {
-        while ($_ = shift) {
-          last if (/\s*<%end /);
-
-          # store line in $par
-          $par .= $_;
-        }
-
-        $_ = $par;
-
-      } else {
-        while ($_ = shift) {
-          last if (/\s*<%end /);
-        }
-        next;
-      }
-    }
-
-    if (/\s*<%if /) {
-
-      # check if it is set and display
-      chop;
-      s/\s*<%if (.+?)%>/$1/;
-
-      if ($self->{$_}) {
-        while ($_ = shift) {
-          last if (/\s*<%end /);
-
-          # store line in $par
-          $par .= $_;
-        }
-
-        $_ = $par;
-
-      } else {
-        while ($_ = shift) {
-          last if (/\s*<%end /);
-        }
-        next;
-      }
-    }
-
-    # check for <%include filename%>
-    if (/\s*<%include /) {
-
-      # get the filename
-      chomp $var;
-      $var =~ s/\s*<%include (.+?)%>/$1/;
-
-      # mangle filename
-      $var =~ s/(\/|\.\.)//g;
-
-      # prevent the infinite loop!
-      next if ($self->{"$var"});
-
-      open(INC, "$self->{templates}/$var")
-        or $self->error($self->cleanup . "$self->{templates}/$var : $!");
-      unshift(@_, <INC>);
-      close(INC);
-
-      $self->{"$var"} = 1;
-
-      next;
-    }
-
-    s/<%(.+?)%>/$self->{$1}/g;
-    print OUT;
+  if (!$template->parse(*OUT)) {
+    $self->cleanup();
+    $self->error("$self->{IN} : " . $template->get_error());
   }
 
   close(OUT);
+  
+  use Data::Dumper;
+  #print(STDERR Dumper($self));
 
-  # { Moritz Bunkus
-  # Convert the tex file to postscript
-  if ($self->{format} =~ /(postscript|pdf)/) {
-
-    use Cwd;
-    $self->{cwd}    = cwd();
-    $self->{tmpdir} = "$self->{cwd}/$userspath";
-
-    chdir("$userspath") or $self->error($self->cleanup . "chdir : $!");
-
-    $self->{tmpfile} =~ s/$userspath\///g;
-
-    if ($self->{format} eq 'postscript') {
-      system(
-        "latex --interaction=nonstopmode $self->{tmpfile} > $self->{tmpfile}.err"
-      );
-      $self->error($self->cleanup) if ($?);
-      if ($two_passes) {
-        system(
-          "latex --interaction=nonstopmode $self->{tmpfile} > $self->{tmpfile}.err"
-        );
-        $self->error($self->cleanup) if ($?);
-      }
-
-      $self->{tmpfile} =~ s/tex$/dvi/;
-
-      system("dvips $self->{tmpfile} -o -q > /dev/null");
-      $self->error($self->cleanup . "dvips : $!") if ($?);
-      $self->{tmpfile} =~ s/dvi$/ps/;
-    }
-    if ($self->{format} eq 'pdf') {
-      system(
-        "pdflatex --interaction=nonstopmode $self->{tmpfile} > $self->{tmpfile}.err"
-      );
-      $self->error($self->cleanup) if ($?);
-      if ($two_passes) {
-        system(
-          "pdflatex --interaction=nonstopmode $self->{tmpfile} > $self->{tmpfile}.err"
-        );
-        $self->error($self->cleanup) if ($?);
-      }
-      $self->{tmpfile} =~ s/tex$/pdf/;
-    }
-
-  }
-
-  if ($self->{format} =~ /(postscript|pdf)/ || $self->{media} eq 'email') {
+  if ($template->uses_temp_file() || $self->{media} eq 'email') {
 
     if ($self->{media} eq 'email') {
 
@@ -907,6 +816,7 @@ sub parse_template {
       $mail->{to}     = qq|$self->{email}|;
       $mail->{from}   = qq|"$myconfig->{name}" <$myconfig->{email}>|;
       $mail->{fileid} = "$fileid.";
+      $myconfig->{signature} =~ s/\\r\\n/\\n/g;
 
       # if we send html or plain text inline
       if (($self->{format} eq 'html') && ($self->{sendmode} eq 'inline')) {
@@ -914,7 +824,7 @@ sub parse_template {
 
         $mail->{message}       =~ s/\r\n/<br>\n/g;
         $myconfig->{signature} =~ s/\\n/<br>\n/g;
-        $mail->{message} .= "<br>\n--<br>\n$myconfig->{signature}\n<br>";
+        $mail->{message} .= "<br>\n-- <br>\n$myconfig->{signature}\n<br>";
 
         open(IN, $self->{tmpfile})
           or $self->error($self->cleanup . "$self->{tmpfile} : $!");
@@ -926,10 +836,11 @@ sub parse_template {
 
       } else {
 
-        @{ $mail->{attachments} } = ($self->{tmpfile});
+        @{ $mail->{attachments} } = ($self->{tmpfile}) unless ($form->{do_not_attach});
 
-        $myconfig->{signature} =~ s/\\n/\r\n/g;
-        $mail->{message} .= "\r\n--\r\n$myconfig->{signature}";
+        $mail->{message}       =~ s/\r\n/\n/g;
+        $myconfig->{signature} =~ s/\\n/\n/g;
+        $mail->{message} .= "\n-- \n$myconfig->{signature}";
 
       }
 
@@ -947,7 +858,8 @@ sub parse_template {
       $self->{copies} = 1 unless $self->{media} eq 'printer';
 
       chdir("$self->{cwd}");
-
+      #print(STDERR "Kopien $self->{copies}\n");
+      #print(STDERR "OUT $self->{OUT}\n");
       for my $i (1 .. $self->{copies}) {
         if ($self->{OUT}) {
           open(OUT, $self->{OUT})
@@ -955,7 +867,7 @@ sub parse_template {
         } else {
 
           # launch application
-          print qq|Content-Type: application/$self->{format}
+          print qq|Content-Type: | . $template->get_mime_type() . qq|
 Content-Disposition: attachment; filename="$self->{tmpfile}"
 Content-Length: $numbytes
 
@@ -977,10 +889,10 @@ Content-Length: $numbytes
       close(IN);
     }
 
-    $self->cleanup;
-
   }
 
+  $self->cleanup;
+
   chdir("$self->{cwd}");
   $main::lxdebug->leave_sub();
 }
@@ -1000,7 +912,7 @@ sub cleanup {
   }
 
   if ($self->{tmpfile}) {
-
+    $self->{tmpfile} =~ s|.*/||g;
     # strip extension
     $self->{tmpfile} =~ s/\.\w+$//g;
     my $tmpfile = $self->{tmpfile};
@@ -1014,91 +926,6 @@ sub cleanup {
   return "@err";
 }
 
-sub format_string {
-  $main::lxdebug->enter_sub();
-
-  my ($self, @fields) = @_;
-  my %unique_fields;
-
-  %unique_fields = map({ $_ => 1 } @fields);
-  @fields = keys(%unique_fields);
-  my $format = $self->{format};
-  if ($self->{format} =~ /(postscript|pdf)/) {
-    $format = 'tex';
-  }
-
-  my %replace = (
-    'order' => {
-      'html' => [
-        '<', '>', quotemeta('\n'), '
-'
-      ],
-      'tex' => [
-        '&', quotemeta('\n'), '
-',
-        '"', '\$', '%', '_', '#', quotemeta('^'),
-        '{', '}',  '<', '>', '£', "\r"
-      ]
-    },
-    'html' => {
-      '<'             => '&lt;',
-      '>'             => '&gt;',
-      quotemeta('\n') => '<br>',
-      '
-' => '<br>'
-    },
-    'tex' => {
-      '"'             => "''",
-      '&'             => '\&',
-      '\$'            => '\$',
-      '%'             => '\%',
-      '_'             => '\_',
-      '#'             => '\#',
-      quotemeta('^')  => '\^\\',
-      '{'             => '\{',
-      '}'             => '\}',
-      '<'             => '$<$',
-      '>'             => '$>$',
-      quotemeta('\n') => '\newline ',
-      '
-'          => '\newline ',
-      '£'  => '\pounds ',
-      "\r" => ""
-    });
-
-  foreach my $key (@{ $replace{order}{$format} }) {
-    map { $self->{$_} =~ s/$key/$replace{$format}{$key}/g; } @fields;
-  }
-
-  # Allow some HTML markup to be converted into the output format's
-  # corresponding markup code, e.g. bold or italic.
-  if ('html' eq $format) {
-    my @markup_replace = ('b', 'i', 's', 'u');
-
-    foreach my $key (@markup_replace) {
-      map({ $self->{$_} =~ s/\&lt;(\/?)${key}\&gt;/<$1${key}>/g } @fields);
-    }
-
-  } elsif ('tex' eq $format) {
-    my %markup_replace = ('b' => 'textbf',
-                          'i' => 'textit',
-                          'u' => 'underline');
-
-    foreach my $field (@fields) {
-      if ($field =~ /descrip/) {
-        print(STDERR "QFT: ${field}: " . $self->{$field} . "\n");
-      }
-      foreach my $key (keys(%markup_replace)) {
-        my $new = $markup_replace{$key};
-        $self->{$field} =~
-          s/\$\<\$${key}\$\>\$(.*?)\$<\$\/${key}\$>\$/\\${new}\{$1\}/gi;
-      }
-    }
-  }
-
-  $main::lxdebug->leave_sub();
-}
-
 sub datetonum {
   $main::lxdebug->enter_sub();
 
@@ -1266,6 +1093,11 @@ sub get_exchangerate {
 
   my ($self, $dbh, $curr, $transdate, $fld) = @_;
 
+  unless ($transdate) {
+    $main::lxdebug->leave_sub();
+    return "";
+  }
+
   my $query = qq|SELECT e.$fld FROM exchangerate e
                  WHERE e.curr = '$curr'
 		 AND e.transdate = '$transdate'|;
@@ -1275,11 +1107,53 @@ sub get_exchangerate {
   my ($exchangerate) = $sth->fetchrow_array;
   $sth->finish;
 
+  if ($exchangerate == 0) {
+    $exchangerate = 1;
+  }
+
   $main::lxdebug->leave_sub();
 
   return $exchangerate;
 }
 
+sub set_payment_options {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $transdate) = @_;
+
+  if ($self->{payment_id}) {
+
+    my $dbh = $self->dbconnect($myconfig);
+
+
+    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;
+
+    $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;
+
+    $self->{skonto_amount} = $self->format_amount($myconfig, ($self->parse_amount($myconfig, $self->{subtotal}) * $self->{percent_skonto}), 2);
+
+    $self->{payment_terms} =~ s/<%netto_date%>/$self->{netto_date}/g;
+    $self->{payment_terms} =~ s/<%skonto_date%>/$self->{skonto_date}/g;
+    $self->{payment_terms} =~ s/<%skonto_amount%>/$self->{skonto_amount}/g;
+
+    $dbh->disconnect;
+  }
+
+  $main::lxdebug->leave_sub();
+
+}
+
 sub check_exchangerate {
   $main::lxdebug->enter_sub();
 
@@ -1307,30 +1181,128 @@ sub check_exchangerate {
   return $exchangerate;
 }
 
+sub get_template_language {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig) = @_;
+
+  my $template_code = "";
+
+  if ($self->{language_id}) {
+
+    my $dbh = $self->dbconnect($myconfig);
+
+
+    my $query = qq|SELECT l.template_code FROM language l
+                  WHERE l.id = $self->{language_id}|;
+    my $sth = $dbh->prepare($query);
+    $sth->execute || $self->dberror($query);
+  
+    ($template_code) = $sth->fetchrow_array;
+    $sth->finish;
+    $dbh->disconnect;
+  }
+
+  $main::lxdebug->leave_sub();
+
+  return $template_code;
+}
+
+sub get_printer_code {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig) = @_;
+
+  my $template_code = "";
+
+  if ($self->{printer_id}) {
+
+    my $dbh = $self->dbconnect($myconfig);
+
+
+    my $query = qq|SELECT p.template_code,p.printer_command FROM printers p
+                  WHERE p.id = $self->{printer_id}|;
+    my $sth = $dbh->prepare($query);
+    $sth->execute || $self->dberror($query);
+  
+    ($template_code, $self->{printer_command}) = $sth->fetchrow_array;
+    $sth->finish;
+    $dbh->disconnect;
+  }
+
+  $main::lxdebug->leave_sub();
+
+  return $template_code;
+}
+
+sub get_shipto {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig) = @_;
+
+  my $template_code = "";
+
+  if ($self->{shipto_id}) {
+
+    my $dbh = $self->dbconnect($myconfig);
+
+
+    my $query = qq|SELECT s.* FROM shipto s
+                  WHERE s.shipto_id = $self->{shipto_id}|;
+    my $sth = $dbh->prepare($query);
+    $sth->execute || $self->dberror($query);
+    $ref = $sth->fetchrow_hashref(NAME_lc);
+    map { $form->{$_} = $ref->{$_} } keys %$ref;
+    $sth->finish;  
+    $dbh->disconnect;
+  }
+
+  $main::lxdebug->leave_sub();
+
+}
+
 sub add_shipto {
   $main::lxdebug->enter_sub();
 
-  my ($self, $dbh, $id) = @_;
+  my ($self, $dbh, $id, $module) = @_;
 ##LINET
   my $shipto;
-  foreach
-    my $item (qw(name department_1 department_2 street zipcode city country contact phone fax email)) {
+  foreach my $item (
+    qw(name department_1 department_2 street zipcode city country contact phone fax email)
+    ) {
     if ($self->{"shipto$item"}) {
       $shipto = 1 if ($self->{$item} ne $self->{"shipto$item"});
     }
     $self->{"shipto$item"} =~ s/\'/\'\'/g;
   }
-
   if ($shipto) {
-    my $query = qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2, shiptostreet,
+    if ($self->{shipto_id}) {
+      my $query = qq| UPDATE shipto set
+                      shiptoname = '$self->{shiptoname}',
+                      shiptodepartment_1 = '$self->{shiptodepartment_1}',
+                      shiptodepartment_2 = '$self->{shiptodepartment_2}',
+                      shiptostreet = '$self->{shiptostreet}',
+                      shiptozipcode = '$self->{shiptozipcode}',
+                      shiptocity = '$self->{shiptocity}',
+                      shiptocountry = '$self->{shiptocountry}',
+                      shiptocontact = '$self->{shiptocontact}',
+                      shiptophone = '$self->{shiptophone}',
+                      shiptofax = '$self->{shiptofax}',
+                      shiptoemail = '$self->{shiptoemail}'
+                      WHERE shipto_id = $self->{shipto_id}|;
+      $dbh->do($query) || $self->dberror($query);
+    } else {
+      my $query =
+      qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2, shiptostreet,
                    shiptozipcode, shiptocity, shiptocountry, shiptocontact,
-		   shiptophone, shiptofax, shiptoemail) VALUES ($id,
+		   shiptophone, shiptofax, shiptoemail, module) VALUES ($id,
 		   '$self->{shiptoname}', '$self->{shiptodepartment_1}', '$self->{shiptodepartment_2}', '$self->{shiptostreet}',
 		   '$self->{shiptozipcode}', '$self->{shiptocity}',
 		   '$self->{shiptocountry}', '$self->{shiptocontact}',
 		   '$self->{shiptophone}', '$self->{shiptofax}',
-		   '$self->{shiptoemail}')|;
-    $dbh->do($query) || $self->dberror($query);
+		   '$self->{shiptoemail}', '$module')|;
+      $dbh->do($query) || $self->dberror($query);
+    }
   }
 ##/LINET
   $main::lxdebug->leave_sub();
@@ -1380,7 +1352,7 @@ sub get_contacts {
 
   my ($self, $dbh, $id) = @_;
 
-  my $query = qq|SELECT c.cp_id, c.cp_cv_id, c.cp_name, c.cp_givenname
+  my $query = qq|SELECT c.cp_id, c.cp_cv_id, c.cp_name, c.cp_givenname, c.cp_abteilung
               FROM contacts c
               WHERE cp_cv_id=$id|;
   my $sth = $dbh->prepare($query);
@@ -1393,7 +1365,7 @@ sub get_contacts {
   }
 
   if ($i == 0) {
-    push @{ $self->{all_contacts} }, { { "", "", "", "", "" } };
+    push @{ $self->{all_contacts} }, { { "", "", "", "", "", "" } };
   }
   $sth->finish;
   $main::lxdebug->leave_sub();
@@ -1530,6 +1502,105 @@ sub all_vc {
   }
   $sth->finish;
 
+  # get languages
+  $query = qq|SELECT id, description
+              FROM language
+	      ORDER BY 1|;
+  $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+
+  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+    push @{ $self->{languages} }, $ref;
+  }
+  $sth->finish;
+
+  # get printer
+  $query = qq|SELECT printer_description, id
+              FROM printers
+	      ORDER BY 1|;
+  $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+
+  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+    push @{ $self->{printers} }, $ref;
+  }
+  $sth->finish;
+
+
+  # get payment terms
+  $query = qq|SELECT id, description
+              FROM payment_terms
+	      ORDER BY 1|;
+  $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+
+  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+    push @{ $self->{payment_terms} }, $ref;
+  }
+  $sth->finish;
+  $dbh->disconnect;
+  $main::lxdebug->leave_sub();
+}
+
+
+sub language_payment {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig) = @_;
+  undef $self->{languages};
+  undef $self->{payment_terms};
+  undef $self->{printers};
+
+  my $ref;
+  my $dbh = $self->dbconnect($myconfig);
+  # get languages
+  my $query = qq|SELECT id, description
+              FROM language
+	      ORDER BY 1|;
+  my $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+
+  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+    push @{ $self->{languages} }, $ref;
+  }
+  $sth->finish;
+
+  # get printer
+  $query = qq|SELECT printer_description, id
+              FROM printers
+	      ORDER BY 1|;
+  $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+
+  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+    push @{ $self->{printers} }, $ref;
+  }
+  $sth->finish;
+
+  # get payment terms
+  $query = qq|SELECT id, description
+              FROM payment_terms
+	      ORDER BY 1|;
+  $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+
+  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+    push @{ $self->{payment_terms} }, $ref;
+  }
+  $sth->finish;
+
+  # get buchungsgruppen
+  $query = qq|SELECT id, description
+              FROM buchungsgruppen|;
+  $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+
+  $self->{BUCHUNGSGRUPPEN} = [];
+  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+    push @{ $self->{BUCHUNGSGRUPPEN} }, $ref;
+  }
+  $sth->finish;
+
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
 }
@@ -1577,36 +1648,69 @@ sub create_links {
   my ($query, $sth);
 
   my $dbh = $self->dbconnect($myconfig);
-
   my %xkeyref = ();
 
-  # now get the account numbers
-  $query =
-    qq|SELECT c.accno, SUBSTRING(c.description,1,50) as description, c.link, c.taxkey_id
-              FROM chart c
-	      WHERE c.link LIKE '%$module%'
-	      ORDER BY c.accno|;
+  if (!$self->{id}) {
 
+    my $transdate = "current_date";
+    if ($self->{transdate}) {
+      $transdate = qq|'$self->{transdate}'|;
+    }
+  
+    # now get the account numbers
+    $query = qq|SELECT c.accno, c.description, c.link, c.taxkey_id, tk.tax_id
+                FROM chart c, taxkeys tk
+                WHERE c.link LIKE '%$module%' AND c.id=tk.chart_id AND tk.id = (SELECT id from taxkeys where taxkeys.chart_id =c.id AND startdate<=$transdate ORDER BY startdate desc LIMIT 1)
+                ORDER BY c.accno|;
+  
+    $sth = $dbh->prepare($query);
+    $sth->execute || $self->dberror($query);
+  
+    $self->{accounts} = "";
+    while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+  
+      foreach my $key (split(/:/, $ref->{link})) {
+        if ($key =~ /$module/) {
+  
+          # cross reference for keys
+          $xkeyref{ $ref->{accno} } = $key;
+  
+          push @{ $self->{"${module}_links"}{$key} },
+            { accno       => $ref->{accno},
+              description => $ref->{description},
+              taxkey      => $ref->{taxkey_id},
+              tax_id      => $ref->{tax_id} };
+  
+          $self->{accounts} .= "$ref->{accno} " unless $key =~ /tax/;
+        }
+      }
+    }
+  }
+
+  # get taxkeys and description
+  $query = qq|SELECT id, taxkey, taxdescription
+              FROM tax|;
   $sth = $dbh->prepare($query);
   $sth->execute || $self->dberror($query);
 
-  $self->{accounts} = "";
+  $ref = $sth->fetchrow_hashref(NAME_lc);
+
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+    push @{ $self->{TAXKEY} }, $ref;
+  }
 
-    foreach my $key (split /:/, $ref->{link}) {
-      if ($key =~ /$module/) {
+  $sth->finish;
 
-        # cross reference for keys
-        $xkeyref{ $ref->{accno} } = $key;
 
-        push @{ $self->{"${module}_links"}{$key} },
-          { accno       => $ref->{accno},
-            description => $ref->{description},
-            taxkey      => $ref->{taxkey_id} };
+  # get tax zones
+  $query = qq|SELECT id, description
+              FROM tax_zones|;
+  $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
 
-        $self->{accounts} .= "$ref->{accno} " unless $key =~ /tax/;
-      }
-    }
+
+  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+    push @{ $self->{TAXZONE} }, $ref;
   }
   $sth->finish;
 
@@ -1616,7 +1720,7 @@ sub create_links {
     $query = qq| SELECT * FROM tax t|;
     $sth   = $dbh->prepare($query);
     $sth->execute || $self->dberror($query);
-    $form->{TAX} = ();
+    $self->{TAX} = ();
     while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
       push @{ $self->{TAX} }, $ref;
     }
@@ -1631,7 +1735,7 @@ sub create_links {
 		a.taxincluded, a.curr AS currency, a.notes, a.intnotes,
 		c.name AS $table, a.department_id, d.description AS department,
 		a.amount AS oldinvtotal, a.paid AS oldtotalpaid,
-		a.employee_id, e.name AS employee, a.gldate
+		a.employee_id, e.name AS employee, a.gldate, a.type
 		FROM $arap a
 		JOIN $table c ON (a.${table}_id = c.id)
 		LEFT JOIN employee e ON (e.id = a.employee_id)
@@ -1646,16 +1750,52 @@ sub create_links {
     }
     $sth->finish;
 
+
+    my $transdate = "current_date";
+    if ($self->{transdate}) {
+      $transdate = qq|'$self->{transdate}'|;
+    }
+  
+    # now get the account numbers
+    $query = qq|SELECT c.accno, c.description, c.link, c.taxkey_id, tk.tax_id
+                FROM chart c, taxkeys tk
+                WHERE c.link LIKE '%$module%' AND (((tk.chart_id=c.id) AND NOT(c.link like '%_tax%')) OR (NOT(tk.chart_id=c.id) AND (c.link like '%_tax%'))) AND (((tk.id = (SELECT id from taxkeys where taxkeys.chart_id =c.id AND startdate<=$transdate ORDER BY startdate desc LIMIT 1)) AND NOT(c.link like '%_tax%')) OR (c.link like '%_tax%'))
+                ORDER BY c.accno|;
+  
+    $sth = $dbh->prepare($query);
+    $sth->execute || $self->dberror($query);
+  
+    $self->{accounts} = "";
+    while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+  
+      foreach my $key (split(/:/, $ref->{link})) {
+        if ($key =~ /$module/) {
+  
+          # cross reference for keys
+          $xkeyref{ $ref->{accno} } = $key;
+  
+          push @{ $self->{"${module}_links"}{$key} },
+            { accno       => $ref->{accno},
+              description => $ref->{description},
+              taxkey      => $ref->{taxkey_id},
+              tax_id      => $ref->{tax_id} };
+  
+          $self->{accounts} .= "$ref->{accno} " unless $key =~ /tax/;
+        }
+      }
+    }
+
+
     # get amounts from individual entries
     $query = qq|SELECT c.accno, c.description, a.source, a.amount, a.memo,
-                a.transdate, a.cleared, a.project_id, p.projectnumber, a.taxkey, t.rate
+                a.transdate, a.cleared, a.project_id, p.projectnumber, a.taxkey, t.rate, t.id
 		FROM acc_trans a
 		JOIN chart c ON (c.id = a.chart_id)
 		LEFT JOIN project p ON (p.id = a.project_id)
-		LEFT Join tax t ON (a.taxkey = t.taxkey)
-		WHERE a.trans_id = $self->{id}
+                LEFT JOIN tax t ON (t.id=(SELECT tk.tax_id from taxkeys tk WHERE (tk.taxkey_id=a.taxkey) AND ((CASE WHEN a.chart_id IN (SELECT chart_id FROM taxkeys WHERE taxkey_id=a.taxkey) THEN tk.chart_id=a.chart_id ELSE 1=1 END) OR (c.link='%tax%')) AND startdate <=a.transdate ORDER BY startdate DESC LIMIT 1)) 
+                WHERE a.trans_id = $self->{id}
 		AND a.fx_transaction = '0'
-		ORDER BY a.transdate|;
+		ORDER BY a.oid,a.transdate|;
     $sth = $dbh->prepare($query);
     $sth->execute || $self->dberror($query);
 
@@ -1665,17 +1805,25 @@ sub create_links {
     $self->{exchangerate} =
       $self->get_exchangerate($dbh, $self->{currency}, $self->{transdate},
                               $fld);
+    my $index = 0;
 
     # store amounts in {acc_trans}{$key} for multiple accounts
     while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
       $ref->{exchangerate} =
         $self->get_exchangerate($dbh, $self->{currency}, $ref->{transdate},
                                 $fld);
+      if (!($xkeyref{ $ref->{accno} } =~ /tax/)) {
+        $index++;
+      }
+      if (($xkeyref{ $ref->{accno} } =~ /paid/) && ($self->{type} eq "credit_note")) {
+        $ref->{amount} *= -1;
+      }
+      $ref->{index} = $index;
 
       push @{ $self->{acc_trans}{ $xkeyref{ $ref->{accno} } } }, $ref;
     }
-    $sth->finish;
 
+    $sth->finish;
     $query = qq|SELECT d.curr AS currencies, d.closedto, d.revtrans,
                   (SELECT c.accno FROM chart c
 		   WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
@@ -1709,7 +1857,7 @@ sub create_links {
     if ($self->{"$self->{vc}_id"}) {
 
       # only setup currency
-      ($self->{currency}) = split /:/, $self->{currencies};
+      ($self->{currency}) = split(/:/, $self->{currencies});
 
     } else {
 
@@ -1726,6 +1874,8 @@ sub create_links {
 
   }
 
+  $sth->finish;
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
@@ -1748,10 +1898,9 @@ sub lastname_used {
     $where = "quotation = '1'";
   }
 
-  my $query = qq|SELECT id FROM $arap
-                 WHERE id IN (SELECT MAX(id) FROM $arap
+  my $query = qq|SELECT MAX(id) FROM $arap
 		              WHERE $where
-			      AND ${table}_id > 0)|;
+			      AND ${table}_id > 0|;
   my $sth = $dbh->prepare($query);
   $sth->execute || $self->dberror($query);
 
@@ -1987,7 +2136,7 @@ sub update_defaults {
 
   $query = qq|UPDATE defaults
               SET $fld = '$var'|;
-  $dbh->do($query) || $form->dberror($query);
+  $dbh->do($query) || $self->dberror($query);
 
   $dbh->commit;
   $dbh->disconnect;
@@ -2015,7 +2164,7 @@ sub update_business {
   }
   $query = qq|UPDATE business
               SET customernumberinit = '$var' WHERE id=$business_id|;
-  $dbh->do($query) || $form->dberror($query);
+  $dbh->do($query) || $self->dberror($query);
 
   $dbh->commit;
   $dbh->disconnect;
@@ -2104,92 +2253,126 @@ sub get_partsgroup {
   $main::lxdebug->leave_sub();
 }
 
+sub get_pricegroup {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $p) = @_;
+
+  my $dbh = $self->dbconnect($myconfig);
+
+  my $query = qq|SELECT p.id, p.pricegroup
+                 FROM pricegroup p|;
+
+  $query .= qq|
+		 ORDER BY pricegroup|;
+
+  if ($p->{all}) {
+    $query = qq|SELECT id, pricegroup FROM pricegroup
+                ORDER BY pricegroup|;
+  }
+
+  my $sth = $dbh->prepare($query);
+  $sth->execute || $self->dberror($query);
+
+  $self->{all_pricegroup} = ();
+  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+    push @{ $self->{all_pricegroup} }, $ref;
+  }
+  $sth->finish;
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
 
 sub audittrail {
   my ($self, $dbh, $myconfig, $audittrail) = @_;
-  
-# table, $reference, $formname, $action, $id, $transdate) = @_;
+
+  # table, $reference, $formname, $action, $id, $transdate) = @_;
 
   my $query;
   my $rv;
   my $disconnect;
 
-  if (! $dbh) {
-    $dbh = $self->dbconnect($myconfig);
+  if (!$dbh) {
+    $dbh        = $self->dbconnect($myconfig);
     $disconnect = 1;
   }
-    
+
   # if we have an id add audittrail, otherwise get a new timestamp
-  
+
   if ($audittrail->{id}) {
-    
+
     $query = qq|SELECT audittrail FROM defaults|;
-    
+
     if ($dbh->selectrow_array($query)) {
       my ($null, $employee_id) = $self->get_employee($dbh);
 
       if ($self->{audittrail} && !$myconfig) {
-	chop $self->{audittrail};
-	
-	my @a = split /\|/, $self->{audittrail};
-	my %newtrail = ();
-	my $key;
-	my $i;
-	my @flds = qw(tablename reference formname action transdate);
-
-	# put into hash and remove dups
-	while (@a) {
-	  $key = "$a[2]$a[3]";
-	  $i = 0;
-	  $newtrail{$key} = { map { $_ => $a[$i++] } @flds };
-	  splice @a, 0, 5;
-	}
-	
-	$query = qq|INSERT INTO audittrail (trans_id, tablename, reference,
+        chop $self->{audittrail};
+
+        my @a = split /\|/, $self->{audittrail};
+        my %newtrail = ();
+        my $key;
+        my $i;
+        my @flds = qw(tablename reference formname action transdate);
+
+        # put into hash and remove dups
+        while (@a) {
+          $key = "$a[2]$a[3]";
+          $i   = 0;
+          $newtrail{$key} = { map { $_ => $a[$i++] } @flds };
+          splice @a, 0, 5;
+        }
+
+        $query = qq|INSERT INTO audittrail (trans_id, tablename, reference,
 		    formname, action, employee_id, transdate)
 	            VALUES ($audittrail->{id}, ?, ?,
 		    ?, ?, $employee_id, ?)|;
-	my $sth = $dbh->prepare($query) || $self->dberror($query);
-
-	foreach $key (sort { $newtrail{$a}{transdate} cmp $newtrail{$b}{transdate} } keys %newtrail) {
-	  $i = 1;
-	  for (@flds) { $sth->bind_param($i++, $newtrail{$key}{$_}) }
-
-	  $sth->execute || $self->dberror;
-	  $sth->finish;
-	}
+        my $sth = $dbh->prepare($query) || $self->dberror($query);
+
+        foreach $key (
+          sort {
+            $newtrail{$a}{transdate} cmp $newtrail{$b}{transdate}
+          } keys %newtrail
+          ) {
+          $i = 1;
+          for (@flds) { $sth->bind_param($i++, $newtrail{$key}{$_}) }
+
+          $sth->execute || $self->dberror;
+          $sth->finish;
+        }
       }
 
-     
       if ($audittrail->{transdate}) {
-	$query = qq|INSERT INTO audittrail (trans_id, tablename, reference,
+        $query = qq|INSERT INTO audittrail (trans_id, tablename, reference,
 		    formname, action, employee_id, transdate) VALUES (
 		    $audittrail->{id}, '$audittrail->{tablename}', |
-		    .$dbh->quote($audittrail->{reference}).qq|',
+          . $dbh->quote($audittrail->{reference}) . qq|,
 		    '$audittrail->{formname}', '$audittrail->{action}',
 		    $employee_id, '$audittrail->{transdate}')|;
       } else {
-	$query = qq|INSERT INTO audittrail (trans_id, tablename, reference,
+        $query = qq|INSERT INTO audittrail (trans_id, tablename, reference,
 		    formname, action, employee_id) VALUES ($audittrail->{id},
 		    '$audittrail->{tablename}', |
-		    .$dbh->quote($audittrail->{reference}).qq|,
+          . $dbh->quote($audittrail->{reference}) . qq|,
 		    '$audittrail->{formname}', '$audittrail->{action}',
 		    $employee_id)|;
       }
       $dbh->do($query);
     }
   } else {
-    
+
     $query = qq|SELECT current_timestamp FROM defaults|;
     my ($timestamp) = $dbh->selectrow_array($query);
 
-    $rv = "$audittrail->{tablename}|$audittrail->{reference}|$audittrail->{formname}|$audittrail->{action}|$timestamp|";
+    $rv =
+      "$audittrail->{tablename}|$audittrail->{reference}|$audittrail->{formname}|$audittrail->{action}|$timestamp|";
   }
 
   $dbh->disconnect if $disconnect;
-  
+
   $rv;
-  
+
 }
 
 package Locale;
@@ -2200,10 +2383,14 @@ sub new {
   my ($type, $country, $NLS_file) = @_;
   my $self = {};
 
-  %self = ();
   if ($country && -d "locale/$country") {
+    local *IN;
     $self->{countrycode} = $country;
-    eval { require "locale/$country/$NLS_file"; };
+    if (open(IN, "locale/$country/$NLS_file")) {
+      my $code = join("", <IN>);
+      eval($code);
+      close(IN);
+    }
   }
 
   $self->{NLS_file} = $NLS_file;
@@ -2223,7 +2410,7 @@ sub new {
 sub text {
   my ($self, $text) = @_;
 
-  return (exists $self{texts}{$text}) ? $self{texts}{$text} : $text;
+  return (exists $self->{texts}{$text}) ? $self->{texts}{$text} : $text;
 }
 
 sub findsub {
@@ -2231,8 +2418,8 @@ sub findsub {
 
   my ($self, $text) = @_;
 
-  if (exists $self{subs}{$text}) {
-    $text = $self{subs}{$text};
+  if (exists $self->{subs}{$text}) {
+    $text = $self->{subs}{$text};
   } else {
     if ($self->{countrycode} && $self->{NLS_file}) {
       Form->error(