Merge branch 'master' into develop

Conflicts:
	archaeological_finds/forms_treatments.py

1 files changed, 10 insertions, 11 deletions

diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py
index 30d8e51ae..446d67fc1 100644
--- a/archaeological_finds/forms_treatments.py
+++ b/archaeological_finds/forms_treatments.py
@@ -24,7 +24,6 @@ import logging
 from django import forms
 from django.conf import settings
 from django.core import validators
-from django.db.models import Max
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 
@@ -39,8 +38,7 @@ from archaeological_operations.forms import AdministrativeActOpeForm, \
 
 from ishtar_common.forms import reverse_lazy, TableSelect, FinalForm, \
     ManageOldType, get_form_selection
-from ishtar_common.forms_common import SourceForm, SourceSelect, \
-    SourceDeletionForm
+from ishtar_common.forms_common import SourceSelect
 
 from ishtar_common import widgets
 
@@ -185,7 +183,7 @@ class BaseTreatmentForm(ManageOldType, forms.Form):
         self.fields['treatment_state'].choices = \
             models.TreatmentState.get_types(
                 initial=self.init_data.get('treatment_state'),
-            )
+        )
         self.fields['treatment_state'].help_text = \
             models.TreatmentState.get_help()
         # TODO
@@ -250,6 +248,7 @@ class TreatmentModifyForm(BaseTreatmentForm):
             fields[key] = value
             if key == 'year':
                 fields['index'] = idx
+        fields.pop('target_is_basket')
         self.fields = fields
 
     def clean(self, *args, **kwargs):
@@ -489,9 +488,9 @@ class TreatmentFileForm(ManageOldType, forms.Form):
     creation_date = forms.DateField(label=_(u"Start date"), required=False,
                                     widget=widgets.JQueryDate,
                                     initial=lambda: datetime.datetime.now())
-    reception_date = forms.DateField(label=_(u"Reception date"), required=False,
-                                     widget=widgets.JQueryDate,
-                                     initial=lambda: datetime.datetime.now())
+    reception_date = forms.DateField(
+        label=_(u"Reception date"), required=False, widget=widgets.JQueryDate,
+        initial=lambda: datetime.datetime.now())
     end_date = forms.DateField(label=_(u"Closing date"), required=False,
                                widget=widgets.JQueryDate)
 
@@ -607,8 +606,8 @@ class AdministrativeActTreatmentFileSelect(TableSelect):
         label=_(u"Treatment request index"))
     treatment_file__internal_reference = forms.CharField(
         max_length=200, label=_(u"Treatment request internal reference"))
-    treatment_file__type = forms.ChoiceField(label=_(u"Treatment request type"),
-                                             choices=[])
+    treatment_file__type = forms.ChoiceField(
+        label=_(u"Treatment request type"), choices=[])
     history_modifier = forms.IntegerField(
         label=_(u"Modified by"),
         widget=widgets.JQueryAutoComplete(
@@ -703,8 +702,8 @@ class TreatmentFileSourceSelect(SourceSelect):
         label=_(u"Treatment request index"))
     treatment_file__internal_reference = forms.CharField(
         max_length=200, label=_(u"Treatment request internal reference"))
-    treatment_file__type = forms.ChoiceField(label=_(u"Treatment request type"),
-                                             choices=[])
+    treatment_file__type = forms.ChoiceField(
+        label=_(u"Treatment request type"), choices=[])
 
     def __init__(self, *args, **kwargs):
         super(TreatmentFileSourceSelect, self).__init__(*args, **kwargs)