diff options
Diffstat (limited to 'ishtar/ishtar_base')
| -rw-r--r-- | ishtar/ishtar_base/forms_operations.py | 2 | ||||
| -rw-r--r-- | ishtar/ishtar_base/models.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ishtar/ishtar_base/forms_operations.py b/ishtar/ishtar_base/forms_operations.py index 93e7ff432..17df6ac4a 100644 --- a/ishtar/ishtar_base/forms_operations.py +++ b/ishtar/ishtar_base/forms_operations.py @@ -275,7 +275,7 @@ class OperationFormReference(forms.Form): pk = forms.IntegerField(required=False, widget=forms.HiddenInput) hidden_year = forms.IntegerField(widget=forms.HiddenInput) operation_code = forms.IntegerField(label=_(u"Operation code")) - common_name = forms.CharField(label=_(u"Common name"), required=False, + common_name = forms.CharField(label=_(u"Generic name"), required=False, max_length=120) if settings.COUNTRY == 'fr': code_patriarche = forms.IntegerField(label=u"Code PATRIARCHE", diff --git a/ishtar/ishtar_base/models.py b/ishtar/ishtar_base/models.py index 3d619e256..67dad81b7 100644 --- a/ishtar/ishtar_base/models.py +++ b/ishtar/ishtar_base/models.py @@ -506,8 +506,8 @@ class OperationDashboard: 'recorded':_(u"Recorded"), 'effective':_(u"Effective"), 'active':_(u"Active"), - 'field':_(u"Field"), - 'documented':_(u"Documented"), + 'field':_(u"Field completed"), + 'documented':_(u"Associated report"), 'closed':_(u"Closed"), 'documented_closed':_(u"Documented and closed"), } @@ -1373,7 +1373,7 @@ class Operation(BaseHistorizedItem, OwnPerms): _(u"Prescription on geoarchaeological context"), blank=True, null=True) operator_reference = models.CharField(_(u"Operator reference"), max_length=20, null=True, blank=True) - common_name = models.CharField(_(u"Common name"), max_length=120, null=True, + common_name = models.CharField(_(u"Generic name"), max_length=120, null=True, blank=True) comment = models.TextField(_(u"Comment"), null=True, blank=True) history = HistoricalRecords() |