Conflicts solved

[SVBaL.git] / python / eh_util / eh_app / AWK / routines.py

diff --git a/python/eh_util/eh_app/AWK/routines.py b/python/eh_util/eh_app/AWK/routines.py
index fffbfaa50962ec660ac72c9584364bf8b635ed2e..9fccdc7bfed8b8b5037b33aa1c21aa01d6700190 100644 (file)
--- a/python/eh_util/eh_app/AWK/routines.py
+++ b/python/eh_util/eh_app/AWK/routines.py
@@ -9,6 +9,7 @@ def handle_uploaded_file(csv_file):
         for chunk in csv_file.chunks():
             destination.write(chunk)
 '''
+
 def aktualisiere_config(config, data, file):
 
     if file:
@@ -19,10 +20,10 @@ def aktualisiere_config(config, data, file):
             for chunk in file.chunks():
                 destination.write(chunk)
         config.setConfig("briefpapier", uploaded_file)
-
+    if data["vorlage"]:
+        config.setConfig("vorlage", data["vorlage"])
     if data["basisbeitrag"]:
         config.setConfig("beitrag_basis", data["basisbeitrag"])
-
     if data["zusatzbeitrag"]:
         config.setConfig("beitrag_zusatz", data["zusatzbeitrag"])