[Lohnrechner-commits] r76 - trunk

[scm-commit@wald.intevation.org]

Author: wilde
Date: 2008-01-16 10:39:58 +0100 (Wed, 16 Jan 2008)
New Revision: 76

Added:
   trunk/lohnrechner2007.py
Modified:
   trunk/lohnrechner.py
Log:
Aktualisierter lohnrechner.py benutzt LST2008 und neue Sozialvers.-Beitr?\195?\164ge.
Die alte Version als lohnrechner2007.py archiviert.


Modified: trunk/lohnrechner.py
===================================================================
--- trunk/lohnrechner.py	2008-01-15 17:43:20 UTC (rev 75)
+++ trunk/lohnrechner.py	2008-01-16 09:39:58 UTC (rev 76)
@@ -5,51 +5,51 @@
 # $Id$
 # --------------------------------------------------------------------
 #
-# Copyright (c) 2005,2006,2007 by Intevation GmbH
+# Copyright (c) 2005,2006,2007,2008 by Intevation GmbH
 # Authors:
 # Sascha Wilde <wilde at intevation.de>
 #
 # This program is free software under the GPL (>=v2)
 # Read the file COPYING coming with this package for details.
 
-"""Lohn/Gehaltsrechner für das Jahr 2007"""
+"""Lohn/Gehaltsrechner für das Jahr 2008"""
 
 __version__ = "$Revision$"
 # $Source$
         
 _release_version = "0.%s" % __version__[11:-2]
 
-import LST2007
+import LST2008
 from Tkinter import *
 
-class Lohnrechner(LST2007.LStRechner2007):
+class Lohnrechner(LST2008.LStRechner2008):
 
     def __init__(self, root):
-        LST2007.LStRechner2007.__init__(self)
+        LST2008.LStRechner2008.__init__(self)
 
         # Land, Kirchensteuersatz, Pflegeversicherung AG-Anteil
-        self.laender = [("Baden-Württemberg", 8, 0.0085, 5250),
-                        ("Bayern", 8, 0.0085, 5250),
-                        ("Berlin (ost)", 9, 0.0085, 4550),
-                        ("Berlin (west)", 9, 0.0085, 5250),
-                        ("Brandenburg", 9, 0.0085, 4550),
-                        ("Bremen", 9, 0.0085, 5250),
-                        ("Bremerhaven", 9, 0.0085, 5250),
-                        ("Hamburg", 9, 0.0085, 5250),
-                        ("Hessen", 9, 0.0085, 5250),
-                        ("Mecklenburg-Vorpommern", 9, 0.0085, 4550),
-                        ("Niedersachsen" ,9, 0.0085, 5250),
-                        ("Nordrhein-Westfalen", 9, 0.0085, 5250),
-                        ("Rheinland-Pfalz", 9, 0.0085, 5250),
-                        ("Saarland", 9, 0.0085, 5250),
-                        ("Sachsen", 9, 0.0135, 4550),
-                        ("Sachsen-Anhalt", 9, 0.0085, 4550),
-                        ("Schleswig-Holstein", 9, 0.0085, 5250),
-                        ("Thüringen", 9, 0.0085, 4550)]
+        self.laender = [("Baden-Württemberg", 8, 0.0085, 5300),
+                        ("Bayern", 8, 0.0085, 5300),
+                        ("Berlin (ost)", 9, 0.0085, 4500),
+                        ("Berlin (west)", 9, 0.0085, 5300),
+                        ("Brandenburg", 9, 0.0085, 4500),
+                        ("Bremen", 9, 0.0085, 5300),
+                        ("Bremerhaven", 9, 0.0085, 5300),
+                        ("Hamburg", 9, 0.0085, 5300),
+                        ("Hessen", 9, 0.0085, 5300),
+                        ("Mecklenburg-Vorpommern", 9, 0.0085, 4500),
+                        ("Niedersachsen" ,9, 0.0085, 5300),
+                        ("Nordrhein-Westfalen", 9, 0.0085, 5300),
+                        ("Rheinland-Pfalz", 9, 0.0085, 5300),
+                        ("Saarland", 9, 0.0085, 5300),
+                        ("Sachsen", 9, 0.0135, 4500),
+                        ("Sachsen-Anhalt", 9, 0.0085, 4500),
+                        ("Schleswig-Holstein", 9, 0.0085, 5300),
+                        ("Thüringen", 9, 0.0085, 4500)]
         
         self.root = root
 
-        self.root.title("Lohnrechner 2007 - v%s" % _release_version)
+        self.root.title("Lohnrechner 2008 - v%s" % _release_version)
 
         self.SetupUI()
         self.UpdateLand()
@@ -281,15 +281,15 @@
     def Info(self):
         infowin = Toplevel(self.root)
         infowin.title("Info")
-        Label(infowin, text="Lohnrechner 2007 v%s" % _release_version, 
+        Label(infowin, text="Lohnrechner 2008 v%s" % _release_version, 
               font=("Times", 14, "bold italic")).grid(row=0, pady=20)
         Label(infowin, text=
-              "Copyright (C) 2005,2006,2007 Intevation GmbH \n\n\
-Lohnrechner 2007 comes with ABSOLUTELY NO WARRANTY.\n\
+              "Copyright (C) 2005,2006,2007,2008 Intevation GmbH \n\n\
+Lohnrechner 2008 comes with ABSOLUTELY NO WARRANTY.\n\
 This is free software, and you are welcome to redistribute it\n\
 under the terms of the GNU General Public License.\n\
 For more information about these matters, see the file named COPYING.\n\n\
-Dieses Programm verwendet LST2007 %s" % LST2007._ModulVersion()).grid(row=1, padx=10)
+Dieses Programm verwendet LST2008 %s" % LST2008._ModulVersion()).grid(row=1, padx=10)
         Button(infowin, text="Ok", command=infowin.destroy).grid(row=2, pady=10)
 
     #
@@ -299,11 +299,11 @@
     #
 
     def InitSozv(self):
-        self.AVsatz = 0.042 / 2
+        self.AVsatz = 0.033 / 2
         self.RVsatz = 0.199 / 2
         # PVsatz ist in self.laender definiert!
         self.PVkinderlose = 0.0025
-        self.BMG1 = 3562.5
+        self.BMG1 = 3600
         # BMG2 für RV und ALV ist in self.laender definiert!
 
     def SetKV(self, value):

Copied: trunk/lohnrechner2007.py (from rev 75, trunk/lohnrechner.py)