Better references for material type (closes #399)

1 files changed, 6 insertions, 14 deletions

diff --git a/ishtar/ishtar_base/models.py b/ishtar/ishtar_base/models.py
index f23417a86..d8aa73059 100644
--- a/ishtar/ishtar_base/models.py
+++ b/ishtar/ishtar_base/models.py
@@ -943,20 +943,12 @@ class BaseItem(BaseHistorizedItem, OwnPerms):
 
     def material_type_label(self):
         item = self.get_last_item()
-        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,
-                           self.context_record.label,
-                           self.material_index,
-                           self.label)])
-        return lbl + JOINT.join([unicode(it) for it in (
-                           self.context_record.parcel.year,
-                           self.index,
-                           self.context_record.label,
-                           self.material_index,
-                           self.label)])
-
+        items = [item and unicode(item.material_type) or '']
+        ope = self.context_record.operation
+        items += [ope.code_patriarche or \
+                  (unicode(ope.year) + "-" + unicode(ope.operation_code))]
+        items += [self.context_record.label, unicode(self.material_index)]
+        return JOINT.join(items)
 
     def _real_label(self):
         if not self.context_record.parcel.operation.code_patriarche: