Anpassung der Historienfunktion

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

diff --git a/SL/Form.pm b/SL/Form.pm
index 928d75f..b9a13a1 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -375,13 +375,8 @@ sub header {
                         \@page { size:landscape; }
                         </style>|;
     }
-    if ($self->{fokus}) {
-      $fokus = qq|<script type="text/javascript">
-<!--
-function fokus(){document.$self->{fokus}.focus();}
-//-->
-</script>|;
-    }
+
+    my $fokus = qq|  document.$self->{fokus}.focus();| if ($self->{"fokus"});
 
     #Set Calendar
     my $jsscript = "";
@@ -415,7 +410,15 @@ function fokus(){document.$self->{fokus}.focus();}
   $charset
   $jsscript
   $ajax
-  $fokus
+
+  <script type="text/javascript">
+  <!--
+    function fokus() {
+      $fokus
+    }
+  //-->
+  </script>
+
   <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" />
@@ -796,7 +799,7 @@ sub parse_template {
 
       map { $mail->{$_} = $self->{$_} }
         qw(cc bcc subject message version format charset);
-      $mail->{to}     = qq|$self->{email}|;
+      $mail->{to} = $self->{EMAIL_RECIPIENT} ? $self->{EMAIL_RECIPIENT} : $self->{email};
       $mail->{from}   = qq|"$myconfig->{name}" <$myconfig->{email}>|;
       $mail->{fileid} = "$fileid.";
       $myconfig->{signature} =~ s/\\r\\n/\\n/g;
@@ -1469,7 +1472,7 @@ sub _get_printers {
 
   $key = "all_printers" unless ($key);
 
-  my $query = qq|SELECT id, printer_description, printer_command FROM printers|;
+  my $query = qq|SELECT id, printer_description, printer_command, template_code FROM printers|;
 
   $self->{$key} = selectall_hashref_query($self, $dbh, $query);
 
@@ -1538,6 +1541,20 @@ sub _get_business_types {
   $main::lxdebug->leave_sub();
 }
 
+sub _get_languages {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $dbh, $key) = @_;
+
+  $key = "all_languages" unless ($key);
+
+  my $query = qq|SELECT * FROM language ORDER BY id|;
+
+  $self->{$key} = selectall_hashref_query($self, $dbh, $query);
+
+  $main::lxdebug->leave_sub();
+}
+
 sub get_lists {
   $main::lxdebug->enter_sub();
 
@@ -1568,6 +1585,10 @@ sub get_lists {
     $self->_get_printers($dbh, $params{"printers"});
   }
 
+  if ($params{"languages"}) {
+    $self->_get_languages($dbh, $params{"languages"});
+  }
+
   if ($params{"charts"}) {
     $self->_get_charts($dbh, $params{"charts"});
   }
@@ -1822,7 +1843,7 @@ sub create_links {
 
     $sth = $dbh->prepare($query);
 
-    do_statement($form, $sth, $query, '%' . $module . '%');
+    do_statement($self, $sth, $query, '%' . $module . '%');
 
     $self->{accounts} = "";
     while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
@@ -1847,16 +1868,16 @@ sub create_links {
 
   # get taxkeys and description
   $query = qq|SELECT id, taxkey, taxdescription FROM tax|;
-  $self->{TAXKEY} = selectall_hashref_query($form, $dbh, $query);
+  $self->{TAXKEY} = selectall_hashref_query($self, $dbh, $query);
 
   # get tax zones
   $query = qq|SELECT id, description FROM tax_zones|;
-  $self->{TAXZONE} = selectall_hashref_query($form, $dbh, $query);
+  $self->{TAXZONE} = selectall_hashref_query($self, $dbh, $query);
 
   if (($module eq "AP") || ($module eq "AR")) {
     # get tax rates and description
     $query = qq|SELECT * FROM tax|;
-    $self->{TAX} = selectall_hashref_query($form, $dbh, $query);
+    $self->{TAX} = selectall_hashref_query($self, $dbh, $query);
   }
 
   if ($self->{id}) {
@@ -1886,17 +1907,17 @@ sub create_links {
     }
 
     # now get the account numbers
-    $query = qq|
-      SELECT
-        c.accno, c.description, c.link, c.taxkey_id,
-        tk.tax_id
-      FROM chart c
-      LEFT JOIN taxkeys tk ON (tk.chart_id = c.id)
-      WHERE (c.link LIKE ?) AND (tk.chart_id = c.id) AND NOT (c.link LIKE '%_tax%')
-      ORDER BY c.accno|;
+     $query = qq|SELECT c.accno, c.description, c.link, c.taxkey_id, tk.tax_id
+                 FROM chart c, taxkeys tk
+                 WHERE c.link LIKE ? 
+                   AND (    tk.chart_id = c.id OR     c.link LIKE '%_tax%') 
+                   AND (NOT tk.chart_id = c.id OR NOT 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)
+                     OR c.link LIKE '%_tax%')
+                 ORDER BY c.accno|;
 
     $sth = $dbh->prepare($query);
-    do_statement($form, $sth, $query, "%" . $module . "%");
+    do_statement($self, $sth, $query, "%$module%");
 
     $self->{accounts} = "";
     while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
@@ -1941,7 +1962,7 @@ sub create_links {
          AND a.fx_transaction = '0'
          ORDER BY a.oid, a.transdate|;
     $sth = $dbh->prepare($query);
-    do_statement($form, $sth, $query, $self->{id});
+    do_statement($self, $sth, $query, $self->{id});
 
     # get exchangerate for currency
     $self->{exchangerate} =
@@ -2261,10 +2282,10 @@ sub save_history {
   }
 
   my $query =
-    qq|INSERT INTO history_erp (trans_id, employee_id, addition, what_done) | .
-    qq|VALUES (?, ?, ?, ?)|;
+    qq|INSERT INTO history_erp (trans_id, employee_id, addition, what_done, snumbers) | .
+    qq|VALUES (?, ?, ?, ?, ?)|;
   my @values = (conv_i($self->{id}), conv_i($self->{employee_id}),
-                $self->{addition}, $self->{what_done});
+                $self->{addition}, $self->{what_done}, "$self->{snumbers}");
   do_query($self, $dbh, $query, @values);
 
   $main::lxdebug->leave_sub();
@@ -2281,7 +2302,7 @@ sub get_history {
   my $i = 0;
   if ($trans_id ne "") {
     my $query =
-      qq|SELECT h.employee_id, h.itime::timestamp(0) AS itime, h.addition, h.what_done, emp.name | .
+      qq|SELECT h.employee_id, h.itime::timestamp(0) AS itime, h.addition, h.what_done, emp.name, h.snumbers, h.trans_id AS id | .
       qq|FROM history_erp h | .
       qq|LEFT JOIN employee emp ON (emp.id = h.employee_id) | .
       qq|WHERE trans_id = ? |
@@ -2294,9 +2315,10 @@ sub get_history {
     while(my $hash_ref = $sth->fetchrow_hashref()) {
       $hash_ref->{addition} = $main::locale->text($hash_ref->{addition});
       $hash_ref->{what_done} = $main::locale->text($hash_ref->{what_done});
+      $hash_ref->{snumbers} =~ s/^.+_(.*)$/$1/g;
       $tempArray[$i++] = $hash_ref;
     }
-    $main::lxdebug->leave_sub() and return \@tempArray
+    return \@tempArray and $main::lxdebug->leave_sub()
       if ($i > 0 && $tempArray[0] ne "");
   }
   $main::lxdebug->leave_sub();