Anpassung der Routinen von Kreditoren und Debitorenbuchungen auf das neue Steuersystem

[mfinanz.git] / SL / AM.pm

diff --git a/SL/AM.pm b/SL/AM.pm
index 0757ee6d158854cc9b99cb4452ad08f62edc21a2..843d5ea63d1b7ab51439de44b5eb3b63f5ccc011 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -998,6 +998,10 @@ sub get_buchungsgruppe {
     $sth->finish;
 
   }
+
+  $query = "SELECT inventory_accno_id FROM defaults";
+  ($form->{"std_inventory_accno_id"}) = $dbh->selectrow_array($query);
+
   my $module = "IC";
   $query = qq|SELECT c.accno, c.description, c.link, c.id,
               d.inventory_accno_id, d.income_accno_id, d.expense_accno_id
@@ -1010,6 +1014,9 @@ sub get_buchungsgruppe {
   $sth->execute || $form->dberror($query);
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
     foreach my $key (split(/:/, $ref->{link})) {
+      if (!$form->{"std_inventory_accno_id"} && ($key eq "IC")) {
+        $form->{"std_inventory_accno_id"} = $ref->{"id"};
+      }
       if ($key =~ /$module/) {
         if (   ($ref->{id} eq $ref->{inventory_accno_id})
             || ($ref->{id} eq $ref->{income_accno_id})
@@ -1019,7 +1026,7 @@ sub get_buchungsgruppe {
               description => $ref->{description},
               selected    => "selected",
               id          => $ref->{id} };
-            } else {
+        } else {
           push @{ $form->{"${module}_links"}{$key} },
             { accno       => $ref->{accno},
               description => $ref->{description},
@@ -1939,16 +1946,14 @@ sub closebooks {
 
     $query = qq|UPDATE defaults SET closedto = NULL,
                                    revtrans = '1'|;
-  } else {
-    if ($form->{closedto}) {
+  } elsif ($form->{closedto}) {
 
-      $query = qq|UPDATE defaults SET closedto = '$form->{closedto}',
+    $query = qq|UPDATE defaults SET closedto = '$form->{closedto}',
                                      revtrans = '0'|;
-    } else {
+  } else {
 
-      $query = qq|UPDATE defaults SET closedto = NULL,
+    $query = qq|UPDATE defaults SET closedto = NULL,
                                      revtrans = '0'|;
-    }
   }
 
   # set close in defaults