commit bevor kassenschreiben merge

diff --git a/python/eh_util/eh_app/AWK/routines.py b/python/eh_util/eh_app/AWK/routines.py
index c60832830e1c364e12e8a4d96ad5ed5f8ab93927..3909448f96ad0f6ac0683f4c86aa7a6dc916b737 100644 (file)
--- a/python/eh_util/eh_app/AWK/routines.py
+++ b/python/eh_util/eh_app/AWK/routines.py
@@ -9,7 +9,7 @@ def handle_uploaded_file(csv_file):
             destination.write(chunk)
 '''
 def aktualisiere_config(config, data, file):
             destination.write(chunk)
 '''
 def aktualisiere_config(config, data, file):

-    
+

     if file:
         uploaded_file = file.name
         data_path = config.requireConfig("data_path")
     if file:
         uploaded_file = file.name
         data_path = config.requireConfig("data_path")


@@ -18,10 +18,10 @@ def aktualisiere_config(config, data, file):
             for chunk in file.chunks():
                 destination.write(chunk)
         config.setConfig("briefpapier", uploaded_file)
             for chunk in file.chunks():
                 destination.write(chunk)
         config.setConfig("briefpapier", uploaded_file)

-    
+

     if data["basisbeitrag"]:
         config.setConfig("beitrag_basis", data["basisbeitrag"])
     if data["basisbeitrag"]:
         config.setConfig("beitrag_basis", data["basisbeitrag"])

-        
+

     if data["zusatzbeitrag"]:
         config.setConfig("beitrag_zusatz", data["zusatzbeitrag"])
     
     if data["zusatzbeitrag"]:
         config.setConfig("beitrag_zusatz", data["zusatzbeitrag"])
     

diff --git a/python/eh_util/eh_util/settings.py b/python/eh_util/eh_util/settings.py
index 1264b3cef16f50749adc82d595cc9b1c3bcd3ffd..0517206a20140e21455460496df94a6047a96a88 100644 (file)
--- a/python/eh_util/eh_util/settings.py
+++ b/python/eh_util/eh_util/settings.py
@@ -79,7 +79,7 @@ WSGI_APPLICATION = 'eh_util.wsgi.application'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',

-        'NAME': '/var/django/eh_util.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),

     }
 }
 
     }
 }