Merge branch 'master' into v0.9

Conflicts:
	install/install.sh

1 files changed, 15 insertions, 2 deletions

diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py
index 4b1134488..7d4eadbf6 100644
--- a/archaeological_finds/models.py
+++ b/archaeological_finds/models.py
@@ -617,6 +617,16 @@ class FindSource(Source):
 
 class TreatmentType(GeneralType):
     virtual = models.BooleanField(_(u"Virtual"))
+    upstream_is_many = models.BooleanField(
+        _(u"Upstream is many"), default=False,
+        help_text=_(
+            u"Check this if for this treatment from many finds you'll get "
+            u"one."))
+    downstream_is_many = models.BooleanField(
+        _(u"Downstream is many"), default=False,
+        help_text=_(
+            u"Check this if for this treatment from one find you'll get "
+            u"many."))
 
     class Meta:
         verbose_name = _(u"Treatment type")
@@ -633,8 +643,11 @@ class Treatment(BaseHistorizedItem, OwnPerms):
     comment = models.TextField(_(u"Comment"), blank=True, null=True)
     treatment_type = models.ForeignKey(TreatmentType,
                                        verbose_name=_(u"Treatment type"))
-    location = models.ForeignKey(Warehouse, verbose_name=_(u"Location"),
-                                 blank=True, null=True)
+    location = models.ForeignKey(
+        Warehouse, verbose_name=_(u"Location"), blank=True, null=True,
+        help_text=_(
+            u"Location where the treatment is done. Target warehouse for "
+            u"a move."))
     other_location = models.CharField(_(u"Other location"), max_length=200,
                                       blank=True, null=True)
     person = models.ForeignKey(