Merge 91ddcc9 into 81fd369

AESSUQAM · Nov 2, 2016 · a2fa99d · a2fa99d
2 parents 81fd369 + 91ddcc9
commit a2fa99d
Show file tree

Hide file tree

Showing 193 changed files with 131,518 additions and 153 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,9 +4,9 @@
 .coverage
 bin
 develop-eggs
-dist
 py_env
 downloads
+env
 eggs
 parts
 src/*.egg-info
@@ -15,7 +15,6 @@ django/*.db
 *~
 *.old
 \#*#
-*.db
 *.sql
 *.db
 encefal_dev

diff --git a/django/EnceFAL/conf.py.edit b/django/EnceFAL/conf.py.edit
@@ -1,6 +1,11 @@
+# -*- encoding: utf-8 -*-
+
 import os
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
+#Les ventes effectués au sein de l'application seront taxables (TPS = 5%, TVQ = 9.975%)
+TAXABLES = True
+
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.

diff --git a/django/EnceFAL/settings.py b/django/EnceFAL/settings.py
@@ -28,9 +28,6 @@
 
 ALLOWED_HOSTS = []
 
-# True => Taxes are calculated
-# False => Taxes aren't calculated
-TAXABLES = True
 
 # Application definition
 # The order is VERY important,
@@ -79,7 +76,7 @@
 				'django.template.context_processors.media',
 				'django.template.context_processors.static',
 				'django.template.context_processors.tz',
-      			'django.template.context_processors.request',
+      			'django.template.context_processors.request', 					
 				'django.contrib.messages.context_processors.messages',
             ],
         },
@@ -122,6 +119,8 @@
     },
 ]
 
+ALLOWED_HOSTS = [ "localhost" ]
+
 # Internationalization
 # https://docs.djangoproject.com/en/1.9/topics/i18n/