diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-03-28 18:12:26 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-03-28 18:12:26 +0200 |
| commit | 9de739f126248c9fa0e45209740613432fd4eb20 (patch) | |
| tree | 0f8549112e57bc2089d9280dce695fa826a8cf7f /ishtar/furnitures/models.py | |
| parent | f239aa2dfa20cb5c33826e83c34d31e779471f3c (diff) | |
| download | Ishtar-9de739f126248c9fa0e45209740613432fd4eb20.tar.bz2 Ishtar-9de739f126248c9fa0e45209740613432fd4eb20.zip | |
Adjust context record selection (closes #311)
Diffstat (limited to 'ishtar/furnitures/models.py')
| -rw-r--r-- | ishtar/furnitures/models.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index b32948709..d3269a69d 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -572,8 +572,11 @@ class Unit(GeneralType): return self.label class ContextRecord(BaseHistorizedItem, OwnPerms): - TABLE_COLS = ['parcel.town', 'parcel.section', 'parcel.parcel_number', - 'label',] + TABLE_COLS = ['parcel.town', 'parcel.operation.year', + 'parcel.operation.operation_code', + 'label', 'unit'] + if settings.COUNTRY == 'fr': + 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) @@ -787,7 +790,7 @@ related_name='+', verbose_name=_(u"Person in charge of the scientific part")) if item]) class ContainerType(GeneralType): - lenght = models.IntegerField(_(u"Lenght")) + length = models.IntegerField(_(u"Length")) width = models.IntegerField(_(u"Width")) height = models.IntegerField(_(u"Height")) volume = models.IntegerField(_(u"Volume")) |