X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/dd01162144167f57d67e5af7d0085367c72bbc18..f9676efea9ccfa01df2a57dca9c45cc8fde0d09e:/SL/IC.pm

diff --git a/SL/IC.pm b/SL/IC.pm
index 61543ae6e..3845017f3 100644
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -1,4 +1,4 @@
-#=====================================================================
+  #=====================================================================
 # LX-Office ERP
 # Copyright (C) 2004
 # Based on SQL-Ledger Version 2.1.9
@@ -1453,17 +1453,17 @@ sub follow_account_chain {
 
   my ($query, $sth);
 
-  $query =
-    qq|SELECT c.new_chart_id, date($transdate) >= c.valid_from AS is_valid, | .
-    qq|  cnew.accno | .
-    qq|FROM chart c | .
-    qq|LEFT JOIN chart cnew ON c.new_chart_id = cnew.id | .
-    qq|WHERE (c.id = ?) AND NOT c.new_chart_id IS NULL AND (c.new_chart_id > 0)|;
-  $sth = prepare_query($form, $dbh, $query);
+  $form->{ACCOUNT_CHAIN_BY_ID} ||= {
+    map { $_->{id} => $_ }
+      selectall_hashref_query($form, $dbh, <<SQL, $transdate) };
+    SELECT c.id, c.new_chart_id, date(?) >= c.valid_from AS is_valid, cnew.accno
+    FROM chart c
+    LEFT JOIN chart cnew ON c.new_chart_id = cnew.id
+    WHERE NOT c.new_chart_id IS NULL AND (c.new_chart_id > 0)
+SQL
 
   while (1) {
-    do_statement($form, $sth, $query, $accno_id);
-    my $ref = $sth->fetchrow_hashref();
+    my $ref = $form->{ACCOUNT_CHAIN_BY_ID}->{$accno_id};
     last unless ($ref && $ref->{"is_valid"} &&
                  !grep({ $_ == $ref->{"new_chart_id"} } @visited_accno_ids));
     $accno_id = $ref->{"new_chart_id"};
@@ -1477,16 +1477,19 @@ sub follow_account_chain {
 }
 
 sub retrieve_accounts {
-  $main::lxdebug->enter_sub(2);
-
-  my ($self, $myconfig, $form, $parts_id, $index) = @_;
+  $main::lxdebug->enter_sub;
 
-  my ($query, $sth);
+  my $self     = shift;
+  my $myconfig = shift;
+  my $form     = shift;
+  my $dbh      = $form->get_standard_dbh;
+  my %args     = @_;     # index => part_id
 
   $form->{taxzone_id} *= 1;
 
-  my $dbh = $form->get_standard_dbh;
+  return unless grep $_, values %args; # shortfuse if no part_id supplied
 
+  # transdate madness.
   my $transdate = "";
   if ($form->{type} eq "invoice") {
     if (($form->{vc} eq "vendor") || !$form->{deliverydate}) {
@@ -1505,10 +1508,16 @@ sub retrieve_accounts {
   } else {
     $transdate = $dbh->quote($transdate);
   }
+  #/transdate
+  my $inc_exp = $form->{"vc"} eq "customer" ? "income_accno_id" : "expense_accno_id";
+
+  my @part_ids = grep { $_ } values %args;
+  my $in       = join ',', ('?') x @part_ids;
 
-  $query = <<SQL;
+  my %accno_by_part = map { $_->{id} => $_ }
+    selectall_hashref_query($form, $dbh, <<SQL, @part_ids);
     SELECT
-      p.inventory_accno_id AS is_part,
+      p.id, p.inventory_accno_id AS is_part,
       bg.inventory_accno_id,
       bg.income_accno_id_$form->{taxzone_id} AS income_accno_id,
       bg.expense_accno_id_$form->{taxzone_id} AS expense_accno_id,
@@ -1520,30 +1529,10 @@ sub retrieve_accounts {
     LEFT JOIN chart c1 ON bg.inventory_accno_id = c1.id
     LEFT JOIN chart c2 ON bg.income_accno_id_$form->{taxzone_id} = c2.id
     LEFT JOIN chart c3 ON bg.expense_accno_id_$form->{taxzone_id} = c3.id
-    WHERE p.id = ?
+    WHERE p.id IN ($in)
 SQL
-  my $ref = selectfirst_hashref_query($form, $dbh, $query, $parts_id);
-
-  return $main::lxdebug->leave_sub(2) if (!$ref);
-
-  $ref->{"inventory_accno_id"} = undef unless ($ref->{"is_part"});
-
-  my %accounts;
-  foreach my $type (qw(inventory income expense)) {
-    next unless ($ref->{"${type}_accno_id"});
-    ($accounts{"${type}_accno_id"}, $accounts{"${type}_accno"}) =
-      $self->follow_account_chain($form, $dbh, $transdate,
-                                  $ref->{"${type}_accno_id"},
-                                  $ref->{"${type}_accno"});
-  }
 
-  map { $form->{"${_}_accno_$index"} = $accounts{"${_}_accno"} }
-      qw(inventory income expense);
-
-  my $inc_exp = $form->{"vc"} eq "customer" ? "income" : "expense";
-  my $accno_id = $accounts{"${inc_exp}_accno_id"};
-
-  $query = <<SQL;
+  my $sth_tax = prepare_query($::form, $dbh, <<SQL);
     SELECT c.accno, t.taxdescription AS description, t.rate, t.taxnumber
     FROM tax t
     LEFT JOIN chart c ON c.id = t.chart_id
@@ -1553,20 +1542,33 @@ SQL
        WHERE tk.chart_id = ? AND startdate <= ?
        ORDER BY startdate DESC LIMIT 1)
 SQL
-  $ref = selectfirst_hashref_query($form, $dbh, $query, $accno_id, quote_db_date($transdate));
 
-  unless ($ref) {
-    $::lxdebug->leave_sub(2);
-    return;
-  }
+  while (my ($index => $part_id) = each %args) {
+    my $ref = $accno_by_part{$part_id} or next;
+
+    $ref->{"inventory_accno_id"} = undef unless $ref->{"is_part"};
 
-  $form->{"taxaccounts_$index"} = $ref->{"accno"};
-  if ($form->{"taxaccounts"} !~ /$ref->{accno}/) {
-    $form->{"taxaccounts"} .= "$ref->{accno} ";
+    my %accounts;
+    for my $type (qw(inventory income expense)) {
+      next unless $ref->{"${type}_accno_id"};
+      ($accounts{"${type}_accno_id"}, $accounts{"${type}_accno"}) =
+        $self->follow_account_chain($form, $dbh, $transdate, $ref->{"${type}_accno_id"}, $ref->{"${type}_accno"});
+    }
+
+    $form->{"${_}_accno_$index"} = $accounts{"${_}_accno"} for qw(inventory income expense);
+
+    $sth_tax->execute($accounts{$inc_exp}, quote_db_date($transdate));
+    $ref = $sth_tax->fetchrow_hashref or next;
+
+    $form->{"taxaccounts_$index"} = $ref->{"accno"};
+    $form->{"taxaccounts"} .= "$ref->{accno} "if $form->{"taxaccounts"} !~ /$ref->{accno}/;
+
+    $form->{"$ref->{accno}_${_}"} = $ref->{$_} for qw(rate description taxnumber);
   }
-  map { $form->{"$ref->{accno}_${_}"} = $ref->{$_}; } qw(rate description taxnumber);
 
-  $::lxdebug->leave_sub(2);
+  $sth_tax->finish;
+
+  $::lxdebug->leave_sub;
 }
 
 sub get_basic_part_info {