From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Mon, 6 Jan 2014 16:31:37 +0000 (+0100)
Subject: Kein Automatikkonto auswählen wieder möglich
X-Git-Tag: release-3.1.0beta1~22^2~50
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2766521474b20c77e62d169a1c99efb41cb1c56f;p=kivitendo-erp.git

Kein Automatikkonto auswählen wieder möglich

Fixt #2250.
---

diff --git a/SL/AM.pm b/SL/AM.pm
index 3fdf175cd..8b2d7b292 100644
--- 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};
 
-  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         = ?,
@@ -1670,7 +1670,7 @@ sub save_tax {
   }
   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',
diff --git a/templates/webpages/am/edit_tax.html b/templates/webpages/am/edit_tax.html
index 83a10c428..cb86eb2aa 100644
--- a/templates/webpages/am/edit_tax.html
+++ b/templates/webpages/am/edit_tax.html
@@ -41,7 +41,7 @@
 
    <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>