Fix für r1967 (und r2002) : Steueranzeige unterhalb von Rechnungen, Angeboten, etc...

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 b1df09770cddc1bf0f3fb9206d3774e2def38a56..6c3dae2c923d19f5e12f2262895b8bc8cccbd89f 100644 (file)
--- 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));
     $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"});
     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 5b7c031afade91762466f608237b6d42d7dfce0e..e8756affac59e8ded0b5959c7ae33d8b2cdab951 100644 (file)
--- 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));
     $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"});
     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 1515fa450dda1133dbb539fac95b397fc21d04a2..78a0333e326e929fcb4f6b7d91efe1326b08b2c2 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -558,7 +558,8 @@ sub form_footer {
 
         $tax .= qq|
                <tr>
 
         $tax .= qq|
                <tr>

-                 <th align=right>$form->{"${item}_description"}</th>
+                 <th align=right>$form->{"${item}_description"}&nbsp;|
+                    . $form->{"${item}_rate"} * 100 .qq|%</th>

                  <td align=right>$form->{"${item}_total"}</td>
                </tr>
 |;
                  <td align=right>$form->{"${item}_total"}</td>
                </tr>
 |;


@@ -599,7 +600,8 @@ sub form_footer {
 
         $tax .= qq|
              <tr>
 
         $tax .= qq|
              <tr>

-               <th align=right>Enthaltene $form->{"${item}_description"}</th>
+               <th align=right>Enthaltene $form->{"${item}_description"}&nbsp;|
+                                   . $form->{"${item}_rate"} * 100 .qq|%</th>

                <td align=right>$form->{"${item}_total"}</td>
              </tr>
              <tr>
                <td align=right>$form->{"${item}_total"}</td>
              </tr>
              <tr>

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 30d0a072f5b7aa54ac10689162b523434af59421..9b6da27c60bf5c538ee6ffdbf6ca0f4ccdf40ee0 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -856,7 +856,8 @@ sub form_footer {
 
         $tax .= qq|
              <tr>
 
         $tax .= qq|
              <tr>

-               <th align=right>$form->{"${item}_description"}</th>
+                <th align=right>$form->{"${item}_description"}&nbsp;|
+                                    . $form->{"${item}_rate"} * 100 .qq|%</th>

                <td align=right>$form->{"${item}_total"}</td>
              </tr>
 |;
                <td align=right>$form->{"${item}_total"}</td>
              </tr>
 |;


@@ -895,7 +896,8 @@ sub form_footer {
 
         $tax .= qq|
              <tr>
 
         $tax .= qq|
              <tr>

-               <th align=right>Enthaltene $form->{"${item}_description"}</th>
+               <th align=right>Enthaltene $form->{"${item}_description"}&nbsp;|
+                                   . $form->{"${item}_rate"} * 100 .qq|%</th>

                <td align=right>$form->{"${item}_total"}</td>
              </tr>
              <tr>
                <td align=right>$form->{"${item}_total"}</td>
              </tr>
              <tr>

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 34870fea269936ec068bcee6bf99c08aad9f4df0..3bc2211a36ec10d244106d5555d8f806685d4b81 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -891,7 +891,8 @@ sub form_footer {
 
         $tax .= qq|
              <tr>
 
         $tax .= qq|
              <tr>

-               <th align=right>$form->{"${item}_description"}</th>
+               <th align=right>$form->{"${item}_description"}&nbsp;|
+                                   . $form->{"${item}_rate"} * 100 .qq|%</th>

                <td align=right>$form->{"${item}_total"}</td>
              </tr>
 |;
                <td align=right>$form->{"${item}_total"}</td>
              </tr>
 |;


@@ -930,7 +931,8 @@ sub form_footer {
 
         $tax .= qq|
              <tr>
 
         $tax .= qq|
              <tr>

-               <th align=right>Enthaltene $form->{"${item}_description"}</th>
+               <th align=right>Enthaltene $form->{"${item}_description"}&nbsp;|
+                                   . $form->{"${item}_rate"} * 100 .qq|%</th>

                <td align=right>$form->{"${item}_total"}</td>
              </tr>
              <tr>
                <td align=right>$form->{"${item}_total"}</td>
              </tr>
              <tr>

diff --git a/sql/Pg-upgrade2/tax_description_without_percentage.sql b/sql/Pg-upgrade2/tax_description_without_percentage.sql
new file mode 100644 (file)
index 0000000..d0c3e97
--- /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'
+  )
+;