Label changes (closes #440)

2 files changed, 9 insertions, 9 deletions

diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py
index 152439b6f..5553be28c 100644
--- a/ishtar/furnitures/forms.py
+++ b/ishtar/furnitures/forms.py
@@ -1867,7 +1867,7 @@ class RecordFormGeneral(forms.Form):
     form_label = _("General")
     associated_models = {'parcel':models.Parcel, 'unit':models.Unit}
     parcel = forms.ChoiceField(label=_("Parcel"), choices=[])
-    label = forms.CharField(label=_(u"Label"),
+    label = forms.CharField(label=_(u"ID"),
                             validators=[validators.MaxLengthValidator(200)])
     description = forms.CharField(label=_(u"Description"),
                                   widget=forms.Textarea, required=False)
@@ -2002,7 +2002,7 @@ class ItemWizard(Wizard):
 class ItemFormBase(forms.Form):
     form_label = _("Base item")
     base_model = 'base_items'
-    base_items__label = forms.CharField(label=_(u"General label"),
+    base_items__label = forms.CharField(label=_(u"General ID"),
                       validators=[validators.MaxLengthValidator(60)])
     base_items__description = forms.CharField(label=_("General description"),
                                   widget=forms.Textarea)
@@ -2012,7 +2012,7 @@ class ItemFormBase(forms.Form):
 class ItemForm(forms.Form):
     form_label = _("Item")
     associated_models = {'material_type':models.MaterialType,}
-    label = forms.CharField(label=_(u"Label"),
+    label = forms.CharField(label=_(u"ID"),
                       validators=[validators.MaxLengthValidator(60)])
     description = forms.CharField(label=_("Precise description"),
                                   widget=forms.Textarea, required=False)
@@ -2146,7 +2146,7 @@ def check_treatment(form_name, type_key, type_list=[], not_type_list=[]):
 class ResultItemForm(forms.Form):
     form_label = _("Resulting item")
     associated_models = {'material_type':models.MaterialType}
-    label = forms.CharField(label=_(u"Label"),
+    label = forms.CharField(label=_(u"ID"),
                       validators=[validators.MaxLengthValidator(60)])
     description = forms.CharField(label=_("Precise description"),
                                   widget=forms.Textarea)
diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py
index 1e0072c45..17f18a79d 100644
--- a/ishtar/furnitures/models.py
+++ b/ishtar/furnitures/models.py
@@ -125,7 +125,7 @@ class GeneralType(models.Model):
     Abstract class for "types"
     """
     label = models.CharField(_(u"Label"), max_length=100)
-    txt_idx = models.CharField(_(u"Textual identifier"),
+    txt_idx = models.CharField(_(u"Textual ID"),
                          validators=[validate_slug], max_length=30, unique=True)
     comment = models.TextField(_(u"Comment"), blank=True, null=True)
     available = models.BooleanField(_(u"Available"))
@@ -708,7 +708,7 @@ class ContextRecord(BaseHistorizedItem, OwnPerms):
         TABLE_COLS.insert(1, 'parcel.operation.code_patriarche')
     parcel = models.ForeignKey(Parcel, verbose_name=_(u"Parcel"),
                                related_name='context_record')
-    label = models.CharField(_(u"Label"), max_length=200)
+    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)
@@ -798,7 +798,7 @@ class MaterialType(GeneralType):
         verbose_name_plural = _(u"Material types")
 
 class BaseItem(BaseHistorizedItem, OwnPerms):
-    label = models.CharField(_(u"Label"), max_length=60)
+    label = models.CharField(_(u"ID"), max_length=60)
     description = models.TextField(_(u"Description"))
     context_record = models.ForeignKey(ContextRecord,
               related_name='base_items', verbose_name=_(u"Context Record"))
@@ -832,7 +832,7 @@ class BaseItem(BaseHistorizedItem, OwnPerms):
 
     def material_type_label(self):
         item = self.get_last_item()
-        lbl = item and (unicode(item.material_type) + unicode(_(": "))) or ''
+        lbl = item and (unicode(item.material_type) + unicode(_(":"))) or ''
         if self.context_record.parcel.operation.code_patriarche:
             return lbl + JOINT.join([unicode(it) for it in (
                            self.context_record.parcel.operation.code_patriarche,
@@ -876,7 +876,7 @@ class Item(BaseHistorizedItem, OwnPerms):
     base_items = models.ManyToManyField(BaseItem, verbose_name=_(u"Base item"),
                                         related_name='item')
     order = models.IntegerField(_(u"Order"))
-    label = models.CharField(_(u"Label"), max_length=60)
+    label = models.CharField(_(u"ID"), max_length=60)
     description = models.TextField(_(u"Description"), blank=True, null=True)
     material_type = models.ForeignKey(MaterialType,
                               verbose_name = _(u"Material type"))