From 2302fc97e44f3464c58a049f6f4b882c45f5f2ec Mon Sep 17 00:00:00 2001
From: "G. Richardson" <grichardson@kivitec.de>
Date: Fri, 26 Jun 2020 10:37:23 +0200
Subject: [PATCH] =?utf8?q?Steuerschl=C3=BCssel=20in=20Dropdowns=20anzeigen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

bei Dialog-, Debitoren- und Kreditorenbuchungen.

Damit man z.B. durch die Mehrwertsteuerumstellung des Konjunkturpakets
die Vorsteuer 16% des alten Steuerschlüssels 7 von dem des aktuellen
Steuerschlüssels 9 unterscheiden kann.
---
 bin/mozilla/ap.pl                              | 2 +-
 bin/mozilla/ar.pl                              | 2 +-
 bin/mozilla/gl.pl                              | 2 +-
 templates/webpages/gl/update_tax_accounts.html | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 704ae4c78..e3a92675c 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -501,7 +501,7 @@ sub form_header {
     my $item = shift;
     return [
       $item->{id} .'--'. $item->{rate},
-      $item->{taxdescription} .' '. ($item->{rate} * 100) .' %',
+      $item->{taxkey} . ' - ' . $item->{taxdescription} .' '. ($item->{rate} * 100) .' %',
     ];
   };
 
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index faabe5015..a6e041f70 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -438,7 +438,7 @@ sub form_header {
       $taxchart_to_use    = $item if $key eq $form->{"taxchart_$i"};
 
       push(@taxchart_values, $key);
-      $taxchart_labels{$key} = $item->taxdescription . " " . $item->rate * 100 . ' %';
+      $taxchart_labels{$key} = $item->taxkey . " - " . $item->taxdescription . " " . $item->rate * 100 . ' %';
     }
 
     $taxchart_to_use    //= $default_taxchart // $first_taxchart;
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 4d7ab19d0..1c29b832e 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -835,7 +835,7 @@ sub display_rows {
       $taxchart_to_use    = $item if $key eq $form->{"taxchart_$i"};
 
       push(@taxchart_values, $key);
-      $taxchart_labels{$key} = $item->taxdescription . " " . $item->rate * 100 . ' %';
+      $taxchart_labels{$key} = $item->taxkey . " - " . $item->taxdescription . " " . $item->rate * 100 . ' %';
     }
 
     $taxchart_to_use    //= $default_taxchart // $first_taxchart;
diff --git a/templates/webpages/gl/update_tax_accounts.html b/templates/webpages/gl/update_tax_accounts.html
index 88d866861..72ce6ef7e 100644
--- a/templates/webpages/gl/update_tax_accounts.html
+++ b/templates/webpages/gl/update_tax_accounts.html
@@ -1,4 +1,4 @@
 [% USE L %][%- USE LxERP -%]
 [% FOR row = TAX_ACCOUNTS %]
-<option value='[% row.id %]--[% row.rate %]'[% IF row.is_default %] selected[% END %]>[% row.taxdescription %] [% LxERP.round_amount(row.rate * 100) %] %</option>
+<option value='[% row.id %]--[% row.rate %]'[% IF row.is_default %] selected[% END %]>[% row.taxkey _ " - " _ row.taxdescription %] [% LxERP.round_amount(row.rate * 100) %] %</option>
 [% END %]
-- 
2.20.1