Prozentangaben in der Steuerbeschreibung wieder hinzugefuegt

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index bb41989..a915146 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -558,8 +558,7 @@ sub form_footer {
 
         $tax .= qq|
                <tr>
-                 <th align=right>$form->{"${item}_description"}&nbsp;|
-                                 . $form->{"${item}_rate"} * 100 .qq|%</th>
+                 <th align=right>$form->{"${item}_description"}</th>
                  <td align=right>$form->{"${item}_total"}</td>
                </tr>
 |;
@@ -600,8 +599,7 @@ sub form_footer {
 
         $tax .= qq|
              <tr>
-               <th align=right>Enthaltene $form->{"${item}_description"}&nbsp;|
-                               . $form->{"${item}_rate"} * 100 .qq|%</th>
+               <th align=right>Enthaltene $form->{"${item}_description"}</th>
                <td align=right>$form->{"${item}_total"}</td>
              </tr>
              <tr>

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index b05c8fd..d50d6d0 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -856,8 +856,7 @@ sub form_footer {
 
         $tax .= qq|
              <tr>
-               <th align=right>$form->{"${item}_description"}&nbsp;|
-               . $form->{"${item}_rate"} * 100 .qq|%</th>
+               <th align=right>$form->{"${item}_description"}</th>
                <td align=right>$form->{"${item}_total"}</td>
              </tr>
 |;
@@ -896,8 +895,7 @@ sub form_footer {
 
         $tax .= qq|
              <tr>
-               <th align=right>Enthaltene $form->{"${item}_description"}&nbsp;|
-                  . $form->{"${item}_rate"} * 100 .qq|%</th>
+               <th align=right>Enthaltene $form->{"${item}_description"}</th>
                <td align=right>$form->{"${item}_total"}</td>
              </tr>
              <tr>

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index c814826..34870fe 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -891,8 +891,7 @@ sub form_footer {
 
         $tax .= qq|
              <tr>
-               <th align=right>$form->{"${item}_description"}&nbsp;|
-                               . $form->{"${item}_rate"} * 100 .qq|%</th>
+               <th align=right>$form->{"${item}_description"}</th>
                <td align=right>$form->{"${item}_total"}</td>
              </tr>
 |;
@@ -931,8 +930,7 @@ sub form_footer {
 
         $tax .= qq|
              <tr>
-               <th align=right>Enthaltene $form->{"${item}_description"}&nbsp;|
-                               . $form->{"${item}_rate"} * 100 .qq|%</th>
+               <th align=right>Enthaltene $form->{"${item}_description"}</th>
                <td align=right>$form->{"${item}_total"}</td>
              </tr>
              <tr>

diff --git a/sql/Pg-upgrade2/fix_taxdescription.sql b/sql/Pg-upgrade2/fix_taxdescription.sql
new file mode 100644 (file)
index 0000000..cd8d1ee
--- /dev/null
+++ b/sql/Pg-upgrade2/fix_taxdescription.sql
@@ -0,0 +1,162 @@
+-- @tag: fix_taxdescription
+-- @description: Durch das Update wurden in der Taxdescription die Prozentangabgen entfernt. Ist ungünstig für die Druckausgabe
+-- @depends: ustva_setup_2007_update_chart_taxkeys_tax
+
+
+
+--#############################################################
+--#
+--# 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 7%' 
+WHERE taxkey = '2'
+  AND
+  EXISTS ( -- update only for SKR03
+    SELECT coa FROM defaults 
+    WHERE defaults.coa='Germany-DATEV-SKR03EU'
+  )
+;
+
+UPDATE tax SET 
+  taxdescription = 'Umsatzsteuer 16%' 
+WHERE taxkey = '3' AND rate=0.16
+  AND
+  EXISTS ( -- update only for SKR03
+    SELECT coa FROM defaults 
+    WHERE defaults.coa='Germany-DATEV-SKR03EU'
+  )
+;
+
+UPDATE tax SET 
+  taxdescription = 'Umsatzsteuer 19%' 
+WHERE taxkey = '3' AND rate=0.19
+  AND
+  EXISTS ( -- update only for SKR03
+    SELECT coa FROM defaults 
+    WHERE defaults.coa='Germany-DATEV-SKR03EU'
+  )
+;
+
+UPDATE tax SET 
+  taxdescription = 'Vorsteuer 7%' 
+WHERE taxkey = '8'
+  AND
+  EXISTS ( -- update only for SKR03
+    SELECT coa FROM defaults 
+    WHERE defaults.coa='Germany-DATEV-SKR03EU'
+  )
+;
+
+UPDATE tax SET 
+  taxdescription = 'Vorsteuer 19%' 
+WHERE taxkey = '9' AND rate=0.19
+  AND
+  EXISTS ( -- update only for SKR03
+    SELECT coa FROM defaults 
+    WHERE defaults.coa='Germany-DATEV-SKR03EU'
+  )
+;
+
+UPDATE tax SET 
+  taxdescription = 'Vorsteuer 16%' 
+WHERE taxkey = '9' AND rate=0.16
+  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 7%' 
+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 16%' 
+WHERE taxkey = '13' AND rate=0.16
+  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 19%' 
+WHERE taxkey = '13' AND rate=0.19
+  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 7%' 
+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 19%'
+WHERE taxkey = '19' and rate=0.19
+  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 16%'
+WHERE taxkey = '19' and rate=0.16
+  AND
+  EXISTS ( -- update only for SKR03
+    SELECT coa FROM defaults 
+    WHERE defaults.coa='Germany-DATEV-SKR03EU'
+  )
+;
\ No newline at end of file