Manage units (closes #447)

1 files changed, 15 insertions, 15 deletions

diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py
index 437189464..3012511de 100644
--- a/ishtar/furnitures/models.py
+++ b/ishtar/furnitures/models.py
@@ -485,10 +485,10 @@ class File(BaseHistorizedItem, OwnPerms):
                                          verbose_name= u"Type de saisine")
         reference_number = models.IntegerField(_(u"Reference number"),
                                                blank=True, null=True)
-    total_surface = models.IntegerField(_(u"Total surface"),
+    total_surface = models.IntegerField(_(u"Total surface (m²)"),
                                         blank=True, null=True)
-    total_developed_surface = models.IntegerField(_(u"Total developed surface"),
-                                                  blank=True, null=True)
+    total_developed_surface = models.IntegerField(
+            _(u"Total developed surface (m²)"), blank=True, null=True)
     address = models.TextField(_(u"Main address"), null=True, blank=True)
     address_complement = models.TextField(_(u"Main address - complement"),
                                           null=True, blank=True)
@@ -584,7 +584,7 @@ class Operation(BaseHistorizedItem, OwnPerms):
     surface = models.IntegerField(_(u"Surface (m²)"), blank=True, null=True)
     remains = models.ManyToManyField("RemainType", verbose_name=_(u'Remains'))
     towns = models.ManyToManyField("Town", verbose_name=_(u"Towns"))
-    cost = models.IntegerField(_(u"Cost"), blank=True, null=True)
+    cost = models.IntegerField(_(u"Cost (€)"), blank=True, null=True)
     periods = models.ManyToManyField('Period', verbose_name=_(u"Periods"))
     if settings.COUNTRY == 'fr':
         code_patriarche = models.IntegerField(u"Code PATRIARCHE", null=True,
@@ -754,10 +754,10 @@ class ContextRecord(BaseHistorizedItem, OwnPerms):
                                related_name='context_record')
     label = models.CharField(_(u"ID"), max_length=200)
     description = models.TextField(_("Description"), blank=True, null=True)
-    length = models.IntegerField(_(u"Length"), blank=True, null=True)
-    width = models.IntegerField(_(u"Width"), blank=True, null=True)
-    thickness = models.IntegerField(_(u"Thickness"), blank=True, null=True)
-    depth = models.IntegerField(_(u"Depth"), blank=True, null=True)
+    length = models.IntegerField(_(u"Length (cm)"), blank=True, null=True)
+    width = models.IntegerField(_(u"Width (cm)"), blank=True, null=True)
+    thickness = models.IntegerField(_(u"Thickness (cm)"), blank=True, null=True)
+    depth = models.IntegerField(_(u"Depth (cm)"), blank=True, null=True)
     location = models.CharField(_(u"Location"), blank=True, null=True,
      max_length=200,
      help_text=_(u"A short description of the location of the context record"))
@@ -923,8 +923,8 @@ class Item(BaseHistorizedItem, OwnPerms):
     description = models.TextField(_(u"Description"), blank=True, null=True)
     material_type = models.ForeignKey(MaterialType,
                               verbose_name = _(u"Material type"))
-    volume = models.FloatField(_(u"Volume"), blank=True, null=True)
-    weight = models.FloatField(_(u"Weight"), blank=True, null=True)
+    volume = models.FloatField(_(u"Volume (l)"), blank=True, null=True)
+    weight = models.FloatField(_(u"Weight (g)"), blank=True, null=True)
     item_number = models.IntegerField(_("Item number"), blank=True, null=True)
     upstream_treatment = models.ForeignKey("Treatment", blank=True, null=True,
       related_name='downstream_treatment', verbose_name=_("Upstream treatment"))
@@ -1073,10 +1073,10 @@ related_name='+', verbose_name=_(u"Person in charge of the scientific part"))
           if item])
 
 class ContainerType(GeneralType):
-    length = models.IntegerField(_(u"Length"))
-    width = models.IntegerField(_(u"Width"))
-    height = models.IntegerField(_(u"Height"))
-    volume = models.IntegerField(_(u"Volume"))
+    length = models.IntegerField(_(u"Length (mm)"))
+    width = models.IntegerField(_(u"Width (mm)"))
+    height = models.IntegerField(_(u"Height (mm)"))
+    volume = models.IntegerField(_(u"Volume (l)"))
     reference = models.CharField(_(u"Reference"), max_length=30)
 
     class Meta:
@@ -1111,7 +1111,7 @@ if settings.COUNTRY == 'fr':
 
 class Town(models.Model):
     name = models.CharField(_(u"Name"), max_length=100)
-    surface = models.IntegerField(_(u"Surface"), blank=True, null=True)
+    surface = models.IntegerField(_(u"Surface (m²)"), blank=True, null=True)
     center = models.PointField(_(u"Localisation"), srid=settings.SRID,
                                blank=True, null=True)
     if settings.COUNTRY == 'fr':