From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 14 May 2009 11:11:46 +0000 (+0000)
Subject: Beim Aufrufen der Dialogbuchenmaske automatisch die richtigen Steuersätze für die... 
X-Git-Tag: release-2.6.0rc1~70
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e325dbd23c2a6321fbe838e8f67bb3e443297b64;p=kivitendo-erp.git

Beim Aufrufen der Dialogbuchenmaske automatisch die richtigen Steuersätze für die vorausgewählten Konten und für neu angezeigte Zeilen ("Erneuern") auswählen.

Teil des Fixes für Bug 960.
---

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 1307a2796..185e2a587 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -793,7 +793,7 @@ sub display_rows {
   my $taxchart_init;
   foreach my $item (@{ $form->{ALL_CHARTS} }) {
     my $key = $item->{accno} . "--" . $item->{tax_id};
-    $taxchart_init = $item->{taxkey_id} unless (@chart_values);
+    $taxchart_init = $item->{tax_id} unless (@chart_values);
     push(@chart_values, $key);
     $chart_labels{$key} = $item->{accno} . "--" . $item->{description};
     $charts{$item->{accno}} = $item;
@@ -804,7 +804,7 @@ sub display_rows {
   my %taxcharts = ();
   foreach my $item (@{ $form->{ALL_TAXCHARTS} }) {
     my $key = $item->{id} . "--" . $item->{rate};
-    $taxchart_init = $key if ($taxchart_init eq $item->{taxkey});
+    $taxchart_init = $key if ($taxchart_init == $item->{id});
     push(@taxchart_values, $key);
     $taxchart_labels{$key} = $item->{taxdescription} . " " . $item->{rate} * 100 . ' %';
     $taxcharts{$item->{id}} = $item;
@@ -839,8 +839,8 @@ sub display_rows {
       $selected_taxchart = "$item->{id}--$item->{rate}";
     }
 
-    $selected_accno = '' if ($init);
-    $selected_taxchart = $taxchart_init unless ($selected_taxchart ne "");
+    $selected_accno      = '' if ($init);
+    $selected_taxchart ||= $taxchart_init;
 
     $accno = qq|<td>| .
       NTI($cgi->popup_menu('-name' => "accno_$i",
@@ -1295,7 +1295,6 @@ $follow_ups_block
     print qq|
         <input class=submit type=submit name=action id=update_button value="| . $locale->text('Update') . qq|">
         <input class=submit type=submit name=action value="| . $locale->text('Post') . qq|">|;
-    print $form->parse_html_template('gl/form_footer_initial_taxkey_selection');
   }
 
   print "
diff --git a/templates/webpages/gl/form_footer_initial_taxkey_selection_de.html b/templates/webpages/gl/form_footer_initial_taxkey_selection_de.html
deleted file mode 100644
index 9b32d2813..000000000
--- a/templates/webpages/gl/form_footer_initial_taxkey_selection_de.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<script type="text/javascript">
- <!--
-   $(document).ready(function() {
-     setTaxkey(1);
-     setTaxkey(2);
-   });
-   -->
-</script>
diff --git a/templates/webpages/gl/form_footer_initial_taxkey_selection_master.html b/templates/webpages/gl/form_footer_initial_taxkey_selection_master.html
deleted file mode 100644
index 9b32d2813..000000000
--- a/templates/webpages/gl/form_footer_initial_taxkey_selection_master.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<script type="text/javascript">
- <!--
-   $(document).ready(function() {
-     setTaxkey(1);
-     setTaxkey(2);
-   });
-   -->
-</script>