manuelle Bearbeitung der Steuersaetze entfernt, vorerst

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

diff --git a/SL/AM.pm b/SL/AM.pm
index d738dc2..59afada 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
@@ -1009,7 +1013,10 @@ sub get_buchungsgruppe {
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    foreach my $key (split /:/, $ref->{link}) {
+    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},
@@ -1435,12 +1442,12 @@ sub save_preferences {
 
   my ($self, $myconfig, $form, $memberfile, $userspath, $webdav) = @_;
 
-  map { ($form->{$_}) = split /--/, $form->{$_} }
+  map { ($form->{$_}) = split(/--/, $form->{$_}) }
     qw(inventory_accno income_accno expense_accno fxgain_accno fxloss_accno);
 
   my @a;
   $form->{curr} =~ s/ //g;
-  map { push(@a, uc pack "A3", $_) if $_ } split /:/, $form->{curr};
+  map { push(@a, uc pack "A3", $_) if $_ } split(/:/, $form->{curr});
   $form->{curr} = join ':', @a;
 
   # connect to database
@@ -1490,13 +1497,13 @@ sub save_preferences {
              WHERE login = '$form->{login}'|;
   $dbh->do($query) || $form->dberror($query);
 
-  foreach my $item (split / /, $form->{taxaccounts}) {
-    $query = qq|UPDATE tax
-               SET rate = | . ($form->{$item} / 100) . qq|,
-               taxnumber = '$form->{"taxnumber_$item"}'
-               WHERE chart_id = $item|;
-    $dbh->do($query) || $form->dberror($query);
-  }
+#   foreach my $item (split(/ /, $form->{taxaccounts})) {
+#     $query = qq|UPDATE tax
+#              SET rate = | . ($form->{$item} / 100) . qq|,
+#              taxnumber = '$form->{"taxnumber_$item"}'
+#              WHERE chart_id = $item|;
+#     $dbh->do($query) || $form->dberror($query);
+#   }
 
   my $rc = $dbh->commit;
   $dbh->disconnect;
@@ -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