From: Udo Spallek Date: Sun, 25 Feb 2007 13:09:28 +0000 (+0000) Subject: Fix für r1967 (und r2002) : Steueranzeige unterhalb von Rechnungen, Angeboten, etc... X-Git-Tag: release-2.4.3^2~662 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/5e59cc54dd5e2d69f71828541795a29ed51a96f0?ds=inline Fix für r1967 (und r2002) : Steueranzeige unterhalb von Rechnungen, Angeboten, etc. an die neuen Taxkeys angepasst. Der Steuersatz wird nicht mehr in der 'description' redundant gefuehrt, sondern aus der 'rate' generiert. Getestet bei den Eingabemasken Verkauf: Rechnung, Gutschrift, Auftrag, Angebot Einkauf: Einkaufsrechnung, Lieferantenauftrag, Preisanfrage Fibu: Dialogbuchen, Debitorenbuchung, Kreditorenbuchung und getestet bei allen LATEX- und sofern vorhanden HTML-Ausgaben der jeweiligen Masken. --- 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' + ) +;