Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp

diff --git a/SL/AM.pm b/SL/AM.pm
index bf5c97d0ce91fd5258d0660cfac9c8bc2c9a97c4..a4db43992ee743e76a14b64344a4794c91a92c52 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -378,6 +378,21 @@ sub save_account {
 
   }
 
+  # Update chart.taxkey_id to the latest from taxkeys for this chart.
+  $query = <<SQL;
+    UPDATE chart
+    SET taxkey_id = (
+      SELECT taxkey_id
+      FROM taxkeys
+      WHERE taxkeys.chart_id = chart.id
+      ORDER BY startdate DESC
+      LIMIT 1
+    )
+    WHERE id = ?
+SQL
+
+  do_query($form, $dbh, $query, $form->{id});
+
   # commit
   my $rc = $dbh->commit;
   $dbh->disconnect;

diff --git a/SL/Form.pm b/SL/Form.pm
index 31020aebc86940fe706b5bb7a6ca38be5f2adb84..b63421750cdb9bf055616e1eccb618d8c591c8ea 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -996,17 +996,13 @@ sub redirect {
   my ($self, $msg) = @_;
 
   if (!$self->{callback}) {
-
     $self->info($msg);
-    ::end_of_request();
-  }
 
-#  my ($script, $argv) = split(/\?/, $self->{callback}, 2);
-#  $script =~ s|.*/||;
-#  $script =~ s|[^a-zA-Z0-9_\.]||g;
-#  exec("perl", "$script", $argv);
+  } else {
+    print $::form->redirect_header($self->{callback});
+  }
 
-  print $::form->redirect_header($self->{callback});
+  ::end_of_request();
 
   $main::lxdebug->leave_sub();
 }

diff --git a/SL/Iconv.pm b/SL/Iconv.pm
index d6ea0cbdf1202e2d6ef3fdb2be4b9d7a15513250..19b8ca169839cb8eb90fd8b3f0c6974b61264f48 100644 (file)
--- a/SL/Iconv.pm
+++ b/SL/Iconv.pm
@@ -37,7 +37,10 @@ sub convert {
   $to_charset   ||= Common::DEFAULT_CHARSET;
 
   my $converter = _get_converter($from_charset, $to_charset);
-  return $converter->convert($text);
+  $text         = $converter->convert($text);
+  $text         = decode("utf-8-strict", $text) if ($to_charset =~ m/^utf-?8$/i) && !Encode::is_utf8($text);
+
+  return $text;
 }
 
 sub _convert {

diff --git a/SL/RP.pm b/SL/RP.pm
index d875fb162c97ace9205522d3a9d7c0294de8114e..113e9dd42b389dd43fee56e2993902b6a3348c51 100644 (file)
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -1193,10 +1193,12 @@ sub aging {
   }
 
   my $dpt_join;
+  my $where_dpt;
   if ($form->{department}) {
     my ($null, $department_id) = split /--/, $form->{department};
     $dpt_join = qq| JOIN department d ON (a.department_id = d.id) |;
     $where .= qq| AND (a.department_id = | . conv_i($department_id, 'NULL') . qq|)|;
+    $where_dpt = qq| AND (${arap}.department_id = | . conv_i($department_id, 'NULL') . qq|)|;
   }
   my $review_of_aging_list;
   if ($form->{review_of_aging_list}) {
@@ -1226,6 +1228,7 @@ sub aging {
     WHERE ((paid != amount) OR (datepaid > (date $todate) AND datepaid is not null))
       AND NOT COALESCE (${arap}.storno, 'f')
       AND (${arap}.${ct}_id = ${ct}.id)
+      $where_dpt 
       AND (${ct}.id = ?)
       AND (transdate <= (date $todate) $fromwhere )
       $review_of_aging_list

diff --git a/sql/Pg-upgrade2/chart_taxkey_id_from_taxkeys.sql b/sql/Pg-upgrade2/chart_taxkey_id_from_taxkeys.sql
new file mode 100644 (file)
index 0000000..5301735
--- /dev/null
+++ b/sql/Pg-upgrade2/chart_taxkey_id_from_taxkeys.sql
@@ -0,0 +1,12 @@
+-- @tag: chart_taxkey_id_from_taxkeys
+-- @description: chart.taxkey_id aus taxkeys aktualisieren
+-- @depends: release_2_6_2
+-- @charset: utf-8
+UPDATE chart
+SET taxkey_id = (
+  SELECT taxkey_id
+  FROM taxkeys
+  WHERE taxkeys.chart_id = chart.id
+  ORDER BY startdate DESC
+  LIMIT 1
+);