Correction on calendar integration

2 files changed, 14 insertions, 9 deletions

diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py
index 998de126a..c5284e46d 100644
--- a/ishtar/furnitures/forms.py
+++ b/ishtar/furnitures/forms.py
@@ -25,14 +25,15 @@ import datetime
 from django.core.urlresolvers import reverse
 from django.core.validators import MaxLengthValidator
 from django.core.exceptions import ObjectDoesNotExist
+from django.utils import formats
+from django.utils.functional import lazy
 from django.utils.translation import ugettext_lazy as _
-from django.template import Context, RequestContext
 from django.shortcuts import render_to_response
-from django.forms.formsets import formset_factory, BaseFormSet, \
-                                  DELETION_FIELD_NAME
+from django.template import Context, RequestContext
 from django.db.models import Max
-
 from django import forms
+from django.forms.formsets import formset_factory, BaseFormSet, \
+                                  DELETION_FIELD_NAME
 
 from formwizard.forms import NamedUrlSessionFormWizard
 
@@ -40,8 +41,6 @@ import models
 import widgets
 from ishtar import settings
 
-from django.utils.functional import lazy
-
 reverse_lazy = lazy(reverse, unicode)
 
 class FinalForm(forms.Form):
@@ -289,6 +288,11 @@ class FileWizard(Wizard):
                 parcel.save()
         return res
 
+def get_now():
+    format = formats.get_format('DATE_INPUT_FORMATS')[0]
+    value = datetime.datetime.now().strftime(format)
+    return value
+
 class FileForm1(forms.Form):
     form_label = _("General")
     associated_models = {'in_charge':models.Person,
@@ -302,7 +306,7 @@ class FileForm1(forms.Form):
     internal_reference = forms.CharField(label=_(u"Internal reference"),
 max_length=60, validators=[models.is_unique(models.File, 'internal_reference')])
     creation_date = forms.DateField(label=_(u"Creation date"),
-                        initial=datetime.datetime.now, widget=widgets.JQueryDate)
+                                    initial=get_now, widget=widgets.JQueryDate)
     file_type = forms.ChoiceField(label=_("File type"),
                                   choices=models.FileType.get_types())
     comment = forms.CharField(label=_(u"Comment"), widget=forms.Textarea,
@@ -403,7 +407,8 @@ class FileForm4(forms.Form):
     if settings.COUNTRY == 'fr':
         saisine_type = forms.ChoiceField(label=_("Saisine type"),
                                   choices=models.SaisineType.get_types())
-    reception_date = forms.DateField(label=_(u"Reception date"))
+    reception_date = forms.DateField(label=_(u"Reception date"),
+                                     initial=get_now, widget=widgets.JQueryDate)
 
 def is_preventive(form_name, file_type_key='file_type'):
     def func(self, request, storage):
diff --git a/static/media/style.css b/static/media/style.css
index bb8816bdb..3d1768702 100644
--- a/static/media/style.css
+++ b/static/media/style.css
@@ -185,7 +185,7 @@ div.form .errorlist{
     padding:6px;
 }
 
-.modify td{
+.modify td, .submit td{
     text-align:center;
 }