diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2013-04-30 10:45:14 +0000 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2013-04-30 10:45:14 +0000 |
| commit | 670e4c633a4fc0d66d10ac6e88b27ff6fb494328 (patch) | |
| tree | 53e045e9f05bc0e0252dbf059def75d26f3710ae /archaeological_operations/models.py | |
| parent | 62d3eae1706a6bde8b0437ef765cf31983a88540 (diff) | |
| parent | 7436163934fcfc94c69fc97bd70466b251fbba77 (diff) | |
| download | Ishtar-670e4c633a4fc0d66d10ac6e88b27ff6fb494328.tar.bz2 Ishtar-670e4c633a4fc0d66d10ac6e88b27ff6fb494328.zip | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
Diffstat (limited to 'archaeological_operations/models.py')
| -rw-r--r-- | archaeological_operations/models.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index d7dc18b3c..60ee06a9c 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -113,6 +113,13 @@ class Operation(BaseHistorizedItem, OwnPerms): _(u"Prescription on large area"), blank=True, null=True) geoarchaeological_context_prescription = models.NullBooleanField( _(u"Prescription on geoarchaeological context"), blank=True, null=True) + cira_rapporteur = models.ForeignKey(Person, related_name='+', null=True, + blank=True, verbose_name=u"Rapporteur CIRA") + negative_result = models.NullBooleanField( + u"Résultat considéré comme négatif", blank=True, null=True) + cira_date = models.DateField(u"Date avis CIRA", null=True, blank=True) + eas_number = models.CharField(u"Numéro de l'EA", max_length=20, + null=True, blank=True) operator_reference = models.CharField(_(u"Operator reference"), max_length=20, null=True, blank=True) common_name = models.CharField(_(u"Generic name"), max_length=120, @@ -288,7 +295,8 @@ related_name='+', verbose_name=_(u"Person in charge of the scientific part")) null=True) act_object = models.CharField(_(u"Object"), max_length=200) if settings.COUNTRY == 'fr': - ref_sra = models.CharField(u"Référence SRA", max_length=15) + ref_sra = models.CharField(u"Référence SRA", max_length=15, blank=True, + null=True) history = HistoricalRecords() class Meta: |