Typo und Bugs in retrieve_accounts gefixt. Veraltete Aufrufsyntax von retrieve_accoun...

diff --git a/SL/IC.pm b/SL/IC.pm
index 13cf55e00e9d89d7a5e79e6e48cd1eb5dfa3b968..bb8f194cc6be4702922ba637404462bf13b0b351 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -1485,8 +1485,6 @@ sub retrieve_accounts {
   my $dbh      = $form->get_standard_dbh;
   my %args     = @_;     # part_id => index
 
   my $dbh      = $form->get_standard_dbh;
   my %args     = @_;     # part_id => index
 

-  my ($query, $sth);
-

   $form->{taxzone_id} *= 1;
 
   # transdate madness.
   $form->{taxzone_id} *= 1;
 
   # transdate madness.


@@ -1527,7 +1525,7 @@ sub retrieve_accounts {
     WHERE p.id = ?
 SQL
 
     WHERE p.id = ?
 SQL
 

-  my $sth_tx = prepare_query($::form, $dbh, <<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
     SELECT c.accno, t.taxdescription AS description, t.rate, t.taxnumber
     FROM tax t
     LEFT JOIN chart c ON c.id = t.chart_id


@@ -1539,7 +1537,8 @@ SQL
 SQL
 
   while (my ($part_id, $index) = each %args) {
 SQL
 
   while (my ($part_id, $index) = each %args) {

-    my $ref = $sth_accno->fetchrow_hashref($part_id) or next;
+    $sth_accno->execute($part_id);
+    my $ref = $sth_accno->fetchrow_hashref or next;

 
     $ref->{"inventory_accno_id"} = undef unless $ref->{"is_part"};
 
 
     $ref->{"inventory_accno_id"} = undef unless $ref->{"is_part"};
 


@@ -1553,7 +1552,8 @@ SQL
     $form->{"${_}_accno_$index"} = $accounts{"${_}_accno"} for qw(inventory income expense);
 
     my $inc_exp = $form->{"vc"} eq "customer" ? "income" : "expense";
     $form->{"${_}_accno_$index"} = $accounts{"${_}_accno"} for qw(inventory income expense);
 
     my $inc_exp = $form->{"vc"} eq "customer" ? "income" : "expense";

-    $ref = $sth->fetchrow_hashref($accounts{"${inc_exp}_accno_id"}, quote_db_date($transdate)) or next;
+    $sth_tax->execute($accounts{"${inc_exp}_accno_id"}, 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->{"taxaccounts_$index"} = $ref->{"accno"};
     $form->{"taxaccounts"} .= "$ref->{accno} "if $form->{"taxaccounts"} !~ /$ref->{accno}/;


@@ -1561,6 +1561,9 @@ SQL
     $form->{"$ref->{accno}_${_}"} = $ref->{$_} for qw(rate description taxnumber);
   }
 
     $form->{"$ref->{accno}_${_}"} = $ref->{$_} for qw(rate description taxnumber);
   }
 

+  $sth_accno->finish;
+  $sth_tax->finish;
+

   $::lxdebug->leave_sub(2);
 }
 
   $::lxdebug->leave_sub(2);
 }
 

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 6a0d2fc403a0ef94d01520f8361c5c4a17dd3767..c2e4bd45e7abb0699fb1f14ff3f987d2251fb1cd 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1979,7 +1979,7 @@ sub relink_accounts {
 
   for (my $i = 1; $i <= $form->{"rowcount"}; $i++) {
     if ($form->{"id_$i"}) {
 
   for (my $i = 1; $i <= $form->{"rowcount"}; $i++) {
     if ($form->{"id_$i"}) {

-      IC->retrieve_accounts(\%myconfig, $form, $form->{"id_$i"}, $i, 1);
+      IC->retrieve_accounts(\%myconfig, $form, $form->{"id_$i"}, $i);

     }
   }
 
     }
   }
 

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 5ded2b7aa3ba7cd14169bad74b7238d44488bb84..2e9ab7f90e4bafddec54fef44abe14d3db53192e 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -1897,7 +1897,7 @@ sub display_form {
   $form->{"taxaccounts"} = "";
 
   for my $i (1 .. $form->{"rowcount"}) {
   $form->{"taxaccounts"} = "";
 
   for my $i (1 .. $form->{"rowcount"}) {

-    IC->retrieve_accounts(\%myconfig, $form, $form->{"id_$i"}, $i, 1) if $form->{"id_$i"};
+    IC->retrieve_accounts(\%myconfig, $form, $form->{"id_$i"}, $i) if $form->{"id_$i"};

   }
 
   $form->{rowcount}++;
   }
 
   $form->{rowcount}++;