Beim Anlegen von Buchungsgruppen die in den Benutzereinstellungen ausgewählten Standa...

diff --git a/SL/AM.pm b/SL/AM.pm
index a9179e65de60095d5e5c82f99db45a3734f481ba..a9018d74c9d4d87acc4ff55407e4bb67b0e34c5d 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -1050,8 +1050,10 @@ sub get_buchungsgruppe {
 
   }
 
 
   }
 

-  $query = "SELECT inventory_accno_id FROM defaults";
-  ($form->{"std_inventory_accno_id"}) = $dbh->selectrow_array($query);
+  $query = "SELECT inventory_accno_id, income_accno_id, expense_accno_id ".
+    "FROM defaults";
+  ($form->{"std_inventory_accno_id"}, $form->{"std_income_accno_id"},
+   $form->{"std_expense_accno_id"}) = $dbh->selectrow_array($query);

 
   my $module = "IC";
   $query = qq|SELECT c.accno, c.description, c.link, c.id,
 
   my $module = "IC";
   $query = qq|SELECT c.accno, c.description, c.link, c.id,

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 5b43c787cb878616c4756412d0c693706c1dac46..d8d034ed2d0244787534bb44671bdda03c728770 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -1780,8 +1780,10 @@ 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"};
+  $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"};
+  for (my $i = 0; 4 > $i; $i++) {
+    map({ $form->{"${_}_accno_id_$i"} = $form->{"std_${_}_accno_id"}; }
+        qw(income expense));

   }
 
   &buchungsgruppe_header;
   }
 
   &buchungsgruppe_header;