From: G. Richardson Date: Fri, 26 Jun 2020 08:37:23 +0000 (+0200) Subject: Steuerschlüssel in Dropdowns anzeigen X-Git-Tag: release-3.5.6.1~160^2~11 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2302fc97e44f3464c58a049f6f4b882c45f5f2ec;p=kivitendo-erp.git Steuerschlüssel in Dropdowns anzeigen 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. --- 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 %] - + [% END %]