[Lohnrechner-commits] r77 - trunk

[scm-commit@wald.intevation.org]

Author: frank
Date: 2008-01-29 20:00:16 +0100 (Tue, 29 Jan 2008)
New Revision: 77

Modified:
   trunk/LST2008.py
Log:
Bugfixes bei Berechnung Lohnsteuer f?\195?\188r sonstige Bez?\195?\188ge.


Modified: trunk/LST2008.py
===================================================================
--- trunk/LST2008.py	2008-01-16 09:39:58 UTC (rev 76)
+++ trunk/LST2008.py	2008-01-29 19:00:16 UTC (rev 77)
@@ -658,8 +658,8 @@
             self.BKS = 0
         else:
             self._MOSONST()
-            self._ZRE4J = (self._ZRE4 + self.SONSTB) / 100
-            self._ZVBEZJ = (self._ZVBEZ + self.VBS) / 100
+            self._ZRE4J = (self.JRE4 + self.SONSTB) / 100
+            self._ZVBEZJ = (self.JVBEZ + self.VBS) / 100
             self._MRE4SONST()
             self._MLSTJAHR()
             self._LSTSO = self._ST * 100
@@ -722,9 +722,9 @@
             self.SOLZV = 0
             self.BKV = 0
 
-    def _MOSONST():
-        self._ZRE4J = self._ZRE4 / 100
-        self._ZVBEZJ = self._ZVBEZ / 100
+    def _MOSONST(self):
+        self._ZRE4J = self.JRE4 / 100
+        self._ZVBEZJ = self.JVBEZ / 100
         self._JLFREIB = self.JFREIB / 100
         self._JLHINZU = self.JHINZU / 100
         self._MRE4()
@@ -733,7 +733,7 @@
         self._MLSTJAHR()
         self._LSTOSO = self._ST * 100
 
-    def _MRE4SONST():
+    def _MRE4SONST(self):
         self._MRE4()
         self._FVBSO = self._FVB
         self._MRE4ABZ()