Kreditorenbuchungen: nur zur Kontenkategorie passende Steuerschlüsselauswahl anbieten

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index dc02d137bbe825d1f652aca1aa6a95f2a57c555f..ca88e920cf7c9f8ca93c92102034f56796b2f71b 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -324,11 +324,6 @@ sub form_header {
     $charts{$item->{accno}} = $item;
   }
 
     $charts{$item->{accno}} = $item;
   }
 

-  my %taxcharts = ();
-  foreach my $item (@{ $form->{ALL_TAXCHARTS} }) {
-    $taxcharts{$item->{id}} = $item;
-  }
-

   my $follow_up_vc         =  $form->{vendor};
   $follow_up_vc            =~ s/--.*?//;
   my $follow_up_trans_info =  "$form->{invnumber} ($follow_up_vc)";
   my $follow_up_vc         =  $form->{vendor};
   $follow_up_vc            =~ s/--.*?//;
   my $follow_up_trans_info =  "$form->{invnumber} ($follow_up_vc)";


@@ -348,8 +343,9 @@ sub form_header {
     my ($default_taxchart, $taxchart_to_use);
     my $amount_chart_id   = $form->{"AP_amount_chart_id_$i"} || $default_ap_amount_chart_id;
     my $chart_has_changed = $::form->{"previous_AP_amount_chart_id_$i"} && ($amount_chart_id != $::form->{"previous_AP_amount_chart_id_$i"});
     my ($default_taxchart, $taxchart_to_use);
     my $amount_chart_id   = $form->{"AP_amount_chart_id_$i"} || $default_ap_amount_chart_id;
     my $chart_has_changed = $::form->{"previous_AP_amount_chart_id_$i"} && ($amount_chart_id != $::form->{"previous_AP_amount_chart_id_$i"});

+    my @taxcharts         = GL->get_active_taxes_for_chart($amount_chart_id, $transdate);

 
 

-    foreach my $item ( GL->get_active_taxes_for_chart($amount_chart_id, $transdate) ) {
+    foreach my $item (@taxcharts) {

       my $key             = $item->id . "--" . $item->rate;
       $first_taxchart   //= $item;
       $default_taxchart   = $item if $item->{is_default};
       my $key             = $item->id . "--" . $item->rate;
       $first_taxchart   //= $item;
       $default_taxchart   = $item if $item->{is_default};


@@ -360,6 +356,7 @@ sub form_header {
     my $selected_taxchart            = $taxchart_to_use->id . '--' . $taxchart_to_use->rate;
     $form->{"selected_taxchart_$i"}  = $selected_taxchart;
     $form->{"AP_amount_chart_id_$i"} = $amount_chart_id;
     my $selected_taxchart            = $taxchart_to_use->id . '--' . $taxchart_to_use->rate;
     $form->{"selected_taxchart_$i"}  = $selected_taxchart;
     $form->{"AP_amount_chart_id_$i"} = $amount_chart_id;

+    $form->{"taxcharts_$i"}          = \@taxcharts;

   }
 
   $form->{taxchart_value_title_sub} = sub {
   }
 
   $form->{taxchart_value_title_sub} = sub {

diff --git a/templates/webpages/ap/form_header.html b/templates/webpages/ap/form_header.html
index 8c8a17333a4f2cc164d89c62c7fbf3a0174a1832..9623a712b1ef344be89128c1a6a3979e4c846859 100644 (file)
--- a/templates/webpages/ap/form_header.html
+++ b/templates/webpages/ap/form_header.html
@@ -202,7 +202,8 @@
             </td>
             <td>
               [% temp = 'selected_taxchart_'_ i %]
             </td>
             <td>
               [% temp = 'selected_taxchart_'_ i %]

-              [% L.select_tag('taxchart_'_ i, ALL_TAXCHARTS, value_title_sub = \taxchart_value_title_sub, default = $temp) %]
+              [% taxcharts = 'taxcharts_' _ i %]
+              [% L.select_tag('taxchart_'_ i, $taxcharts, value_title_sub = \taxchart_value_title_sub, default = $temp, style="width: 250px") %]

             </td>
             <td>
               [% temp = "project_id_"_ i %]
             </td>
             <td>
               [% temp = "project_id_"_ i %]