Buchungsgruppen: Bei aktivierter EUR muss das Inventarkonto automatisch ausgewaehlt...

diff --git a/SL/AM.pm b/SL/AM.pm
index 01167eebebfddfb02f2a43d25e414a47f6f25a70..843d5ea63d1b7ab51439de44b5eb3b63f5ccc011 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -998,6 +998,10 @@ sub get_buchungsgruppe {
     $sth->finish;
 
   }
     $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
   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})) {
   $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})
       if ($key =~ /$module/) {
         if (   ($ref->{id} eq $ref->{inventory_accno_id})
             || ($ref->{id} eq $ref->{income_accno_id})

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index e7d7db206e6964be41ce0375ccff1a2f9e831882..fcf7d018b65b57392380f737a49b3739ea9c3344 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -1712,6 +1712,9 @@ sub add_buchungsgruppe {
     "$form->{script}?action=add_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
   AM->get_buchungsgruppe(\%myconfig, \%$form);
     "$form->{script}?action=add_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
   AM->get_buchungsgruppe(\%myconfig, \%$form);

+  if ($eur) {
+    $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"};
+  }

 
   &buchungsgruppe_header;
   &form_footer;
 
   &buchungsgruppe_header;
   &form_footer;