--- lohnrechner.py	2006/01/25 11:45:40	55
+++ trunk/lohnrechner.py	2007/01/25 11:13:08	67
@@ -5,27 +5,27 @@
 # $Id$
 # --------------------------------------------------------------------
 #
-# Copyright (c) 2005,2006 by Intevation GmbH
+# Copyright (c) 2005,2006,2007 by Intevation GmbH
 # Authors:
 # Sascha Wilde <wilde@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 2006"""
+"""Lohn/Gehaltsrechner für das Jahr 2007"""
 
 __version__ = "$Revision$"
 # $Source$
         
 _release_version = "0.%s" % __version__[11:-2]
 
-import LST2006
+import LST2007
 from Tkinter import *
 
-class Lohnrechner(LST2006.LStRechner2006):
+class Lohnrechner(LST2007.LStRechner2007):
 
     def __init__(self, root):
-        LST2006.LStRechner2006.__init__(self)
+        LST2007.LStRechner2007.__init__(self)
 
         # Land, Kirchensteuersatz, Pflegeversicherung AG-Anteil
         self.laender = [("Baden-Württemberg", 8, 0.0085),
@@ -48,7 +48,7 @@
         
         self.root = root
 
-        self.root.title("Lohnrechner 2006 - v%s" % _release_version)
+        self.root.title("Lohnrechner 2007 - v%s" % _release_version)
 
         self.SetupUI()
         self.UpdateLand()
@@ -271,15 +271,15 @@
     def Info(self):
         infowin = Toplevel(self.root)
         infowin.title("Info")
-        Label(infowin, text="Lohnrechner 2006 v%s" % _release_version, 
+        Label(infowin, text="Lohnrechner 2007 v%s" % _release_version, 
               font=("Times", 14, "bold italic")).grid(row=0, pady=20)
         Label(infowin, text=
-              "Copyright (C) 2005,2006 Intevation GmbH \n\n\
-Lohnrechner 2006 comes with ABSOLUTELY NO WARRANTY.\n\
+              "Copyright (C) 2005,2006,2007 Intevation GmbH \n\n\
+Lohnrechner 2007 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 LST2006 %s" % LST2006._ModulVersion()).grid(row=1, padx=10)
+Dieses Programm verwendet LST2007 %s" % LST2007._ModulVersion()).grid(row=1, padx=10)
         Button(infowin, text="Ok", command=infowin.destroy).grid(row=2, pady=10)
 
     #
@@ -293,8 +293,8 @@
         self.RVsatz = 0.195 / 2
         # PVsatz ist in self.laender definiert!
         self.PVkinderlose = 0.0025
-        self.BMG1 = 3525
-        self.BMG2 = 5200
+        self.BMG1 = 3562.5
+        self.BMG2 = 5250
 
     def SetKV(self, value):
         assert value >= 0.0 and value <= 100.0, \