Kein Automatikkonto auswählen wieder möglich

Fixt #2250.

diff --git a/SL/AM.pm b/SL/AM.pm
index 3fdf175cdb83015088707d53a2ea25dcc7b10932..8b2d7b292504595c9dd63b3ac51239eaf94fce1b 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -1643,7 +1643,7 @@ sub save_tax {
   $chart_categories .= 'E' if $form->{expense};
   $chart_categories .= 'C' if $form->{costs};
 
   $chart_categories .= 'E' if $form->{expense};
   $chart_categories .= 'C' if $form->{costs};
 

-  my @values = ($form->{taxkey}, $form->{taxdescription}, $form->{rate}, $form->{chart_id}, $form->{chart_id}, $chart_categories);
+  my @values = ($form->{taxkey}, $form->{taxdescription}, $form->{rate}, conv_i($form->{chart_id}), conv_i($form->{chart_id}), $chart_categories);

   if ($form->{id} ne "") {
     $query = qq|UPDATE tax SET
                   taxkey         = ?,
   if ($form->{id} ne "") {
     $query = qq|UPDATE tax SET
                   taxkey         = ?,


@@ -1670,7 +1670,7 @@ sub save_tax {
   }
   push(@values, $form->{id});
   do_query($form, $dbh, $query, @values);
   }
   push(@values, $form->{id});
   do_query($form, $dbh, $query, @values);

-  
+

   foreach my $language_id (keys %{ $form->{translations} }) {
     GenericTranslations->save('dbh'              => $dbh,
                               'translation_type' => 'SL::DB::Tax/taxdescription',
   foreach my $language_id (keys %{ $form->{translations} }) {
     GenericTranslations->save('dbh'              => $dbh,
                               'translation_type' => 'SL::DB::Tax/taxdescription',

diff --git a/templates/webpages/am/edit_tax.html b/templates/webpages/am/edit_tax.html
index 83a10c428e62245f53f2cc9d209c7df9d73b1139..cb86eb2aa0c7cdda37d0796e2cca43e3fc092483 100644 (file)
--- a/templates/webpages/am/edit_tax.html
+++ b/templates/webpages/am/edit_tax.html
@@ -41,7 +41,7 @@
 
    <tr>
     <td>[% 'tax_chartaccno' | $T8 %]</td>
 
    <tr>
     <td>[% 'tax_chartaccno' | $T8 %]</td>

-    <td><select name="chart_id"><option value="0">[% 'None' | $T8 %]</option>[% FOREACH row = ACCOUNTS %]<option value="[% HTML.escape(row.id) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.taxaccount) %]</option>[% END %]</select></td>
+    <td><select name="chart_id"><option value="">[% 'None' | $T8 %]</option>[% FOREACH row = ACCOUNTS %]<option value="[% HTML.escape(row.id) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.taxaccount) %]</option>[% END %]</select></td>

    </tr>
 
     <td>[% 'Account categories' | $T8 %]</td>
    </tr>
 
     <td>[% 'Account categories' | $T8 %]</td>