diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index d7a4dcc2..90b88c16 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -18,10 +18,10 @@ SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'gxhy(a#5mhp289_=6xx$7jh=eh$ymxg^ymc+di*0c*geiu3p_e' +SECRET_KEY = os.environ.get('SECRET_KEY') if os.environ.get('SECRET_KEY') else 'gxhy(a#5mhp289_=6xx$7jh=eh$ymxg^ymc+di*0c*geiu3p_e' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False +DEBUG = bool(int(os.environ.get('DEBUG'))) if os.environ.get('DEBUG') else True TEMPLATE_DEBUG = True diff --git a/RIGS/static/js/autocompleter.js b/RIGS/static/js/autocompleter.js index 5e6c5653..3f0a8ef1 100644 --- a/RIGS/static/js/autocompleter.js +++ b/RIGS/static/js/autocompleter.js @@ -25,7 +25,7 @@ function refreshUpdateHref(obj) { // console.log('Trying to disable'); targetObject.attr('disabled', true); } else { - // targetObject.attr('href', update_url); + targetObject.attr('href', update_url); targetObject.attr('disabled', false); } } diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/RIGS/event_form.html index 132148c8..df975867 100644 --- a/RIGS/templates/RIGS/event_form.html +++ b/RIGS/templates/RIGS/event_form.html @@ -424,6 +424,13 @@ {% include "RIGS/item_table.html" %} +
+
+ +
+
diff --git a/RIGS/templates/RIGS/event_print.xml b/RIGS/templates/RIGS/event_print.xml index 8afdf11e..03790b13 100644 --- a/RIGS/templates/RIGS/event_print.xml +++ b/RIGS/templates/RIGS/event_print.xml @@ -84,9 +84,9 @@ Portland Building, University Park, Nottingham, NG7 2RD - Phone: (0115) 846 8720 - www.nottinghamtec.co.uk - info@nottinghamtec.co.uk + www.nottinghamtec.co.uk + info@nottinghamtec.co.uk + Phone: (0115) 846 8720 diff --git a/RIGS/templates/RIGS/event_print_page.xml b/RIGS/templates/RIGS/event_print_page.xml index c5a9486b..7529b113 100644 --- a/RIGS/templates/RIGS/event_print_page.xml +++ b/RIGS/templates/RIGS/event_print_page.xml @@ -128,7 +128,7 @@ - VAT may be charged at the current rate date of event ({{ object.vat_rate.as_percent|floatformat:2 }}%) + Total (ex. VAT) £ {{ object.sum_total|floatformat:2 }} diff --git a/RIGS/templates/RIGS/item_table.html b/RIGS/templates/RIGS/item_table.html index e5b93d91..71e20a5a 100644 --- a/RIGS/templates/RIGS/item_table.html +++ b/RIGS/templates/RIGS/item_table.html @@ -1,4 +1,4 @@ -
+