fix timezone +datamaster upgrade + django 1.3

diff --git a/buildout.cfg b/buildout.cfg
index afdb512..1483602 100644 (file)
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -48,7 +48,7 @@ eggs =
 
 [versions]
 django-admin-tools = 0.4.0
-django = 1.2.5
+django = 1.3.1
 south = 0.7
 auf.django.skin = 0.17dev
 auf.django.auth = 0.5.5dev
@@ -63,6 +63,7 @@ auf.django.permissions = 0.1
 django-alphafilter = 0.5.3auf4
 auf.django.emploi = 0.5dev
 django-urldecorators = 0.3
+datamaster-modeles = 0.1.14
 #reportlab = 2.5
 #html5lib = 0.90
 #pyPDF = 1.13

diff --git a/project/settings.py b/project/settings.py
index 1e414cd..aa898ff 100644 (file)
--- a/project/settings.py
+++ b/project/settings.py
@@ -15,7 +15,7 @@ ADMINS = (
 
 MANAGERS = ADMINS
 
-TIME_ZONE = 'Canada/Montreal'
+TIME_ZONE = 'America/Montreal'
 DATE_FORMAT = 'd-m-Y'
 DATE_INPUT_FORMATS = (
     '%d-%m-%Y', '%d/%m/%Y', '%d %m %Y',