/[lohnrechner]/trunk/lohnrechner2007.py
ViewVC logotype

Diff of /trunk/lohnrechner2007.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 41 by wilde, Wed Nov 2 08:56:13 2005 UTC revision 42 by wilde, Wed Nov 2 10:11:50 2005 UTC
# Line 137  class Lohnrechner(LST2005.LStRechner2005 Line 137  class Lohnrechner(LST2005.LStRechner2005
137          self.kvsatz.bind("<Return>", self.NewInput)          self.kvsatz.bind("<Return>", self.NewInput)
138          self.kvsatz.grid(row=9, column=1, sticky=W)          self.kvsatz.grid(row=9, column=1, sticky=W)
139    
140            Label(frame, text="Krankenkassenzuschlag (0.9%):").grid(row=10, sticky=E)
141            self.kvsoli = IntVar()
142            kvsoliradio = Checkbutton(frame, onvalue=1, offvalue=0,
143                                    command=self.NewInput, variable=self.kvsoli)
144            kvsoliradio.select()
145            kvsoliradio.grid(row=10, column=1, sticky=W)
146    
147    
148          Label(frame, text="Rentenversicherung:").grid(row=4, column=2, sticky=E)          Label(frame, text="Rentenversicherung:").grid(row=4, column=2, sticky=E)
149          self.rv = Entry(frame)          self.rv = Entry(frame)
150          self.rv.grid(row=4, column=3, sticky=W)          self.rv.grid(row=4, column=3, sticky=W)
# Line 160  class Lohnrechner(LST2005.LStRechner2005 Line 168  class Lohnrechner(LST2005.LStRechner2005
168    
169          # Allgemeine UI Elemente          # Allgemeine UI Elemente
170          buttons = Frame(frame)          buttons = Frame(frame)
171          buttons.grid(row=9, column=2, columnspan=2)          buttons.grid(row=9, column=2, rowspan=2, columnspan=2)
172          Button(buttons, text="Quit", command=self.root.quit).pack(side=LEFT)          Button(buttons, text="Quit", command=self.root.quit).pack(side=LEFT)
173          Button(buttons, text="Info", command=self.Info).pack(side=LEFT)          Button(buttons, text="Info", command=self.Info).pack(side=LEFT)
174          Button(buttons, text="Berechnen", command=self.CalcOutput).pack(side=LEFT)          Button(buttons, text="Berechnen", command=self.CalcOutput).pack(side=LEFT)
# Line 197  class Lohnrechner(LST2005.LStRechner2005 Line 205  class Lohnrechner(LST2005.LStRechner2005
205    
206      def ResetInputKVsatz(self):      def ResetInputKVsatz(self):
207          self.kvsatz.delete(0, END)          self.kvsatz.delete(0, END)
208          self.kvsatz.insert(0, "14.7")          self.kvsatz.insert(0, "13.8")
209    
210      def InitCalc(self):      def InitCalc(self):
211          try:          try:
# Line 298  Dieses Programm verwendet LST2005 %s" % Line 306  Dieses Programm verwendet LST2005 %s" %
306          return round(self.sozv.get() * PV, 2)          return round(self.sozv.get() * PV, 2)
307    
308      def GetKV(self):      def GetKV(self):
309          # KVsoli should be setable by the UI          self.KVsoli = self.kvsoli.get()
         self.KVsoli = 1  
310          lohn = self.GetLohn()          lohn = self.GetLohn()
311          if lohn > self.BMG1 : lohn = self.BMG1          if lohn > self.BMG1 : lohn = self.BMG1
312          if self.KVsoli :          if self.KVsoli :

Legend:
Removed from v.41  
changed lines
  Added in v.42

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26