From 5e59cc54dd5e2d69f71828541795a29ed51a96f0 Mon Sep 17 00:00:00 2001 From: Udo Spallek Date: Sun, 25 Feb 2007 13:09:28 +0000 Subject: [PATCH] =?utf8?q?Fix=20f=C3=BCr=20r1967=20(und=20r2002)=20:=20Ste?= =?utf8?q?ueranzeige=20unterhalb=20von=20Rechnungen,=20Angeboten,=20etc.?= =?utf8?q?=20an=20die=20neuen=20Taxkeys=20angepasst.=20Der=20Steuersatz=20?= =?utf8?q?wird=20nicht=20mehr=20in=20der=20'description'=20redundant=20gef?= =?utf8?q?uehrt,=20sondern=20aus=20der=20'rate'=20generiert.=20Getestet=20?= =?utf8?q?bei=20den=20Eingabemasken=20Verkauf:=20Rechnung,=20Gutschrift,?= =?utf8?q?=20Auftrag,=20Angebot=20Einkauf:=20Einkaufsrechnung,=20Lieferant?= =?utf8?q?enauftrag,=20Preisanfrage=20Fibu:=20Dialogbuchen,=20Debitorenbuc?= =?utf8?q?hung,=20Kreditorenbuchung=20und=20getestet=20bei=20allen=20LATEX?= =?utf8?q?-=20und=20sofern=20vorhanden=20HTML-Ausgaben=20der=20jeweiligen?= =?utf8?q?=20Masken.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/IS.pm | 2 +- SL/OE.pm | 2 +- bin/mozilla/ir.pl | 6 +- bin/mozilla/is.pl | 6 +- bin/mozilla/oe.pl | 6 +- .../tax_description_without_percentage.sql | 124 ++++++++++++++++++ 6 files changed, 138 insertions(+), 8 deletions(-) create mode 100644 sql/Pg-upgrade2/tax_description_without_percentage.sql diff --git a/SL/IS.pm b/SL/IS.pm index b1df09770..6c3dae2c9 100644 --- a/SL/IS.pm +++ b/SL/IS.pm @@ -365,7 +365,7 @@ sub invoice_details { $tax += $taxamount = $form->round_amount($taxaccounts{$item}, 2); push(@{ $form->{tax} }, $form->format_amount($myconfig, $taxamount, 2)); - push(@{ $form->{taxdescription} }, $form->{"${item}_description"}); + push(@{ $form->{taxdescription} }, $form->{"${item}_description"} . q{ } . 100 * $form->{"${item}_rate"} . q{%}); push(@{ $form->{taxrate} }, $form->format_amount($myconfig, $form->{"${item}_rate"} * 100)); push(@{ $form->{taxnumber} }, $form->{"${item}_taxnumber"}); diff --git a/SL/OE.pm b/SL/OE.pm index 5b7c031af..e8756affa 100644 --- a/SL/OE.pm +++ b/SL/OE.pm @@ -1167,7 +1167,7 @@ sub order_details { $tax += $taxamount = $form->round_amount($taxaccounts{$item}, 2); push(@{ $form->{tax} }, $form->format_amount($myconfig, $taxamount, 2)); - push(@{ $form->{taxdescription} }, $form->{"${item}_description"}); + push(@{ $form->{taxdescription} }, $form->{"${item}_description"} . q{ } . 100 * $form->{"${item}_rate"} . q{%}); push(@{ $form->{taxrate} }, $form->format_amount($myconfig, $form->{"${item}_rate"} * 100)); push(@{ $form->{taxnumber} }, $form->{"${item}_taxnumber"}); diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index 1515fa450..78a0333e3 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -558,7 +558,8 @@ sub form_footer { $tax .= qq| - $form->{"${item}_description"} + $form->{"${item}_description"} | + . $form->{"${item}_rate"} * 100 .qq|% $form->{"${item}_total"} |; @@ -599,7 +600,8 @@ sub form_footer { $tax .= qq| - Enthaltene $form->{"${item}_description"} + Enthaltene $form->{"${item}_description"} | + . $form->{"${item}_rate"} * 100 .qq|% $form->{"${item}_total"} diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 30d0a072f..9b6da27c6 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -856,7 +856,8 @@ sub form_footer { $tax .= qq| - $form->{"${item}_description"} + $form->{"${item}_description"} | + . $form->{"${item}_rate"} * 100 .qq|% $form->{"${item}_total"} |; @@ -895,7 +896,8 @@ sub form_footer { $tax .= qq| - Enthaltene $form->{"${item}_description"} + Enthaltene $form->{"${item}_description"} | + . $form->{"${item}_rate"} * 100 .qq|% $form->{"${item}_total"} diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 34870fea2..3bc2211a3 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -891,7 +891,8 @@ sub form_footer { $tax .= qq| - $form->{"${item}_description"} + $form->{"${item}_description"} | + . $form->{"${item}_rate"} * 100 .qq|% $form->{"${item}_total"} |; @@ -930,7 +931,8 @@ sub form_footer { $tax .= qq| - Enthaltene $form->{"${item}_description"} + Enthaltene $form->{"${item}_description"} | + . $form->{"${item}_rate"} * 100 .qq|% $form->{"${item}_total"} diff --git a/sql/Pg-upgrade2/tax_description_without_percentage.sql b/sql/Pg-upgrade2/tax_description_without_percentage.sql new file mode 100644 index 000000000..d0c3e9742 --- /dev/null +++ b/sql/Pg-upgrade2/tax_description_without_percentage.sql @@ -0,0 +1,124 @@ +-- @tag: tax_description_without_percentage +-- @description: SKR03: Die Prozentangaben aus der tax.taxdescription entfernen. (Unter Berücksichtigung der Druckausgabe.) +-- @depends: fix_taxdescription + + + +--############################################################# +--# +--# Taxdescription setzen +--# +--############################################################# + +UPDATE tax SET + taxdescription = 'USt-frei' +WHERE taxkey = '1' + AND + EXISTS ( -- update only for SKR03 + SELECT coa FROM defaults + WHERE defaults.coa='Germany-DATEV-SKR03EU' + ) +; + +UPDATE tax SET + taxdescription = 'Umsatzsteuer' +WHERE taxkey = '2' + AND + EXISTS ( -- update only for SKR03 + SELECT coa FROM defaults + WHERE defaults.coa='Germany-DATEV-SKR03EU' + ) +; + +UPDATE tax SET + taxdescription = 'Umsatzsteuer' +WHERE taxkey = '3' + AND + EXISTS ( -- update only for SKR03 + SELECT coa FROM defaults + WHERE defaults.coa='Germany-DATEV-SKR03EU' + ) +; + + +UPDATE tax SET + taxdescription = 'Vorsteuer' +WHERE taxkey = '8' + AND + EXISTS ( -- update only for SKR03 + SELECT coa FROM defaults + WHERE defaults.coa='Germany-DATEV-SKR03EU' + ) +; + +UPDATE tax SET + taxdescription = 'Vorsteuer' +WHERE taxkey = '9' + AND + EXISTS ( -- update only for SKR03 + SELECT coa FROM defaults + WHERE defaults.coa='Germany-DATEV-SKR03EU' + ) +; + +UPDATE tax SET + taxdescription = 'Im anderen EU-Staat steuerpflichtige Lieferung' +WHERE taxkey = '10' + AND + EXISTS ( -- update only for SKR03 + SELECT coa FROM defaults + WHERE defaults.coa='Germany-DATEV-SKR03EU' + ) +; + +UPDATE tax SET + taxdescription = 'Steuerfreie innergem. Lieferung an Abnehmer mit Id.-Nr.' +WHERE taxkey = '11' + AND + EXISTS ( -- update only for SKR03 + SELECT coa FROM defaults + WHERE defaults.coa='Germany-DATEV-SKR03EU' + ) +; + +UPDATE tax SET + taxdescription = 'Steuerpflichtige EG-Lieferung zum ermäßigten Steuersatz' +WHERE taxkey = '12' + AND + EXISTS ( -- update only for SKR03 + SELECT coa FROM defaults + WHERE defaults.coa='Germany-DATEV-SKR03EU' + ) +; + + +UPDATE tax SET + taxdescription = 'Steuerpflichtige EG-Lieferung zum vollen Steuersatz' +WHERE taxkey = '13' + AND + EXISTS ( -- update only for SKR03 + SELECT coa FROM defaults + WHERE defaults.coa='Germany-DATEV-SKR03EU' + ) +; + + +UPDATE tax SET + taxdescription = 'Steuerpflichtiger innergem. Erwerb zum ermäßigten Steuersatz' +WHERE taxkey = '18' + AND + EXISTS ( -- update only for SKR03 + SELECT coa FROM defaults + WHERE defaults.coa='Germany-DATEV-SKR03EU' + ) +; + +UPDATE tax SET + taxdescription = 'Steuerpflichtiger innergem. Erwerb zum vollen Steuersatz' +WHERE taxkey = '19' + AND + EXISTS ( -- update only for SKR03 + SELECT coa FROM defaults + WHERE defaults.coa='Germany-DATEV-SKR03EU' + ) +; -- 2.20.1