pydev-s6git

diff --git a/python/eh_util/eh_app/AWK/routines.py b/python/eh_util/eh_app/AWK/routines.py
index c60832830e1c364e12e8a4d96ad5ed5f8ab93927..e68b74aed315cc55c9138ee6ef0918b6e6118128 100644 (file)
--- a/python/eh_util/eh_app/AWK/routines.py
+++ b/python/eh_util/eh_app/AWK/routines.py
@@ -55,11 +55,11 @@ def erstelle_ehmeldung(data):
     can.drawString(205, 500, versichertes_object)
     can.drawString(193, 466, str(data["AnzahlWohnungen"]))
     if data["Selbstgenutzt"]:
     can.drawString(205, 500, versichertes_object)
     can.drawString(193, 466, str(data["AnzahlWohnungen"]))
     if data["Selbstgenutzt"]:

-        can.drawString(350, 466, "X")
+        can.drawString(360, 466, "X")

     if data["Eigentumswohnung"]:
     if data["Eigentumswohnung"]:

-        can.drawString(188, 449, "X")
+        can.drawString(192, 449, "X")

     if data["Gewerblich"]:
     if data["Gewerblich"]:

-        can.drawString(350, 449, "X")
+        can.drawString(360, 449, "X")

     can.drawString(140, 376, date.today().strftime('%d.%m.%Y'))
     can.drawString(350, 376, "Maschinell erstellt.")
         
     can.drawString(140, 376, date.today().strftime('%d.%m.%Y'))
     can.drawString(350, 376, "Maschinell erstellt.")
         

diff --git a/python/eh_util/eh_app/forms.py b/python/eh_util/eh_app/forms.py
index 0b71c693e90190669dec985f642fcf626bc09195..bf19011018ec6ed8ee8f0ff10a9e84f1ad190ff5 100644 (file)
--- a/python/eh_util/eh_app/forms.py
+++ b/python/eh_util/eh_app/forms.py
@@ -25,13 +25,13 @@ https://docs.djangoproject.com/en/2.2/ref/forms/fields/
 '''
 class KassenbriefForm(forms.Form):
     #briefpapier   = forms.FileField(label='Briefpapier ändern:', required=False)
 '''
 class KassenbriefForm(forms.Form):
     #briefpapier   = forms.FileField(label='Briefpapier ändern:', required=False)

-    template      = forms.ChoiceField(choices=[('AB', 'ab'),('BC','bc')])
+    template      = forms.ChoiceField(choices=())

     basisbeitrag  = forms.IntegerField()
     zusatzbeitrag = forms.IntegerField(label="Beitrag für Zusatzgrundstück")
     def __init__(self, *args, templates=[('AB', 'ab'),('BC','bc')], **kwargs):
     basisbeitrag  = forms.IntegerField()
     zusatzbeitrag = forms.IntegerField(label="Beitrag für Zusatzgrundstück")
     def __init__(self, *args, templates=[('AB', 'ab'),('BC','bc')], **kwargs):

-        self.templates = templates
-        KassenbriefForm.template      = forms.ChoiceField(choices=templates)
+        #self.templates = templates

         super().__init__(*args, **kwargs)
         super().__init__(*args, **kwargs)

+        self.fields['template'].choices = templates

 
 class EhmeldungForm(forms.Form):
     VorZuname = forms.CharField(
 
 class EhmeldungForm(forms.Form):
     VorZuname = forms.CharField(