[code gen] Annotation (almost) everywhere.
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Fri, 08 Jul 2016 15:07:09 +0200
changeset 1404 2be8a24cef91
parent 1372 187b2c8dd288
child 1405 c8bc72d54540
[code gen] Annotation (almost) everywhere. For UX reason, don't add it when there is no user_cardinality as well (so we can consistently edit annotation). Related to #14157055
entities/generated.py
i18n/en.po
i18n/fr.po
schema/seda2.py
views/uicfg.py
xsd2uicfg.py
xsd2yams.py
--- a/entities/generated.py	Fri Jul 08 13:51:03 2016 +0200
+++ b/entities/generated.py	Fri Jul 08 15:07:09 2016 +0200
@@ -24,7 +24,7 @@
 
 class SEDAComment(AnyEntity):
     __regid__ = 'SEDAComment'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'comment'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'comment', 'user_annotation'])
     value_attr = 'comment'
 
 class SEDASignature(AnyEntity):
@@ -34,7 +34,7 @@
 
 class SEDAArchivalAgreement(AnyEntity):
     __regid__ = 'SEDAArchivalAgreement'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'archival_agreement'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'archival_agreement', 'user_annotation'])
     value_attr = 'archival_agreement'
 
 class SEDARelatedTransferReference(AnyEntity):
@@ -59,7 +59,7 @@
 
 class SEDAServiceLevel(AnyEntity):
     __regid__ = 'SEDAServiceLevel'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'service_level'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'service_level', 'user_annotation'])
     value_attr = 'service_level'
 
 class SEDAStorageRule(AnyEntity):
@@ -89,12 +89,12 @@
 
 class SEDAClassificationRule(AnyEntity):
     __regid__ = 'SEDAClassificationRule'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'classification_owner'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'classification_owner', 'user_annotation'])
     value_attr = 'classification_owner'
 
 class SEDANeedAuthorization(AnyEntity):
     __regid__ = 'SEDANeedAuthorization'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'need_authorization'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'need_authorization', 'user_annotation'])
     value_attr = 'need_authorization'
 
 class SEDASeqClassificationRuleRule(AnyEntity):
@@ -114,7 +114,7 @@
 
 class SEDANeedReassessingAuthorization(AnyEntity):
     __regid__ = 'SEDANeedReassessingAuthorization'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'need_reassessing_authorization'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'need_reassessing_authorization', 'user_annotation'])
     value_attr = 'need_reassessing_authorization'
 
 class SEDAPreventInheritance(AnyEntity):
@@ -214,12 +214,12 @@
 
 class SEDArestrictionRuleIdRef(AnyEntity):
     __regid__ = 'SEDArestrictionRuleIdRef'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'restriction_rule_id_ref'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'restriction_rule_id_ref', 'user_annotation'])
     value_attr = 'restriction_rule_id_ref'
 
 class SEDArestrictionValue(AnyEntity):
     __regid__ = 'SEDArestrictionValue'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'restriction_value'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'restriction_value', 'user_annotation'])
     value_attr = 'restriction_value'
 
 class SEDArestrictionEndDate(AnyEntity):
@@ -229,12 +229,12 @@
 
 class SEDATitle(AnyEntity):
     __regid__ = 'SEDATitle'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'title'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'title', 'user_annotation'])
     value_attr = 'title'
 
 class SEDAFilePlanPosition(AnyEntity):
     __regid__ = 'SEDAFilePlanPosition'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'file_plan_position'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'file_plan_position', 'user_annotation'])
     value_attr = 'file_plan_position'
 
 class SEDASystemId(AnyEntity):
@@ -249,32 +249,32 @@
 
 class SEDAArchivalAgencyArchiveUnitIdentifier(AnyEntity):
     __regid__ = 'SEDAArchivalAgencyArchiveUnitIdentifier'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'archival_agency_archive_unit_identifier'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'archival_agency_archive_unit_identifier', 'user_annotation'])
     value_attr = 'archival_agency_archive_unit_identifier'
 
 class SEDAOriginatingAgencyArchiveUnitIdentifier(AnyEntity):
     __regid__ = 'SEDAOriginatingAgencyArchiveUnitIdentifier'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'originating_agency_archive_unit_identifier'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'originating_agency_archive_unit_identifier', 'user_annotation'])
     value_attr = 'originating_agency_archive_unit_identifier'
 
 class SEDATransferringAgencyArchiveUnitIdentifier(AnyEntity):
     __regid__ = 'SEDATransferringAgencyArchiveUnitIdentifier'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'transferring_agency_archive_unit_identifier'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'transferring_agency_archive_unit_identifier', 'user_annotation'])
     value_attr = 'transferring_agency_archive_unit_identifier'
 
 class SEDADescription(AnyEntity):
     __regid__ = 'SEDADescription'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'description'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'description', 'user_annotation'])
     value_attr = 'description'
 
 class SEDAType(AnyEntity):
     __regid__ = 'SEDAType'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'type'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'type', 'user_annotation'])
     value_attr = 'type'
 
 class SEDADocumentType(AnyEntity):
     __regid__ = 'SEDADocumentType'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'document_type'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'document_type', 'user_annotation'])
     value_attr = 'document_type'
 
 class SEDALanguage(AnyEntity):
@@ -289,17 +289,17 @@
 
 class SEDAStatus(AnyEntity):
     __regid__ = 'SEDAStatus'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'status'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'status', 'user_annotation'])
     value_attr = 'status'
 
 class SEDAVersion(AnyEntity):
     __regid__ = 'SEDAVersion'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'version'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'version', 'user_annotation'])
     value_attr = 'version'
 
 class SEDATag(AnyEntity):
     __regid__ = 'SEDATag'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'tag'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'tag', 'user_annotation'])
     value_attr = 'tag'
 
 class SEDAKeyword(AnyEntity):
@@ -339,7 +339,7 @@
 
 class SEDASource(AnyEntity):
     __regid__ = 'SEDASource'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'source'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'source', 'user_annotation'])
     value_attr = 'source'
 
 class SEDACreatedDate(AnyEntity):
@@ -499,17 +499,17 @@
 
 class SEDASpatial(AnyEntity):
     __regid__ = 'SEDASpatial'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'spatial'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'spatial', 'user_annotation'])
     value_attr = 'spatial'
 
 class SEDATemporal(AnyEntity):
     __regid__ = 'SEDATemporal'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'temporal'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'temporal', 'user_annotation'])
     value_attr = 'temporal'
 
 class SEDAJuridictional(AnyEntity):
     __regid__ = 'SEDAJuridictional'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'juridictional'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'juridictional', 'user_annotation'])
     value_attr = 'juridictional'
 
 class SEDAKeywordContent(AnyEntity):
@@ -529,7 +529,7 @@
 
 class SEDACustodialHistoryItem(AnyEntity):
     __regid__ = 'SEDACustodialHistoryItem'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'custodial_history_item'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'custodial_history_item', 'user_annotation'])
     value_attr = 'custodial_history_item'
 
 class SEDACustodialHistoryFile(AnyEntity):
@@ -604,17 +604,17 @@
 
 class SEDACompressed(AnyEntity):
     __regid__ = 'SEDACompressed'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'compressed'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'compressed', 'user_annotation'])
     value_attr = 'compressed'
 
 class SEDACreatingApplicationName(AnyEntity):
     __regid__ = 'SEDACreatingApplicationName'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'creating_application_name'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'creating_application_name', 'user_annotation'])
     value_attr = 'creating_application_name'
 
 class SEDACreatingApplicationVersion(AnyEntity):
     __regid__ = 'SEDACreatingApplicationVersion'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'creating_application_version'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'creating_application_version', 'user_annotation'])
     value_attr = 'creating_application_version'
 
 class SEDADateCreatedByApplication(AnyEntity):
@@ -624,12 +624,12 @@
 
 class SEDACreatingOs(AnyEntity):
     __regid__ = 'SEDACreatingOs'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'creating_os'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'creating_os', 'user_annotation'])
     value_attr = 'creating_os'
 
 class SEDACreatingOsVersion(AnyEntity):
     __regid__ = 'SEDACreatingOsVersion'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'creating_os_version'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'creating_os_version', 'user_annotation'])
     value_attr = 'creating_os_version'
 
 class SEDALastModified(AnyEntity):
@@ -639,7 +639,7 @@
 
 class SEDAFormatLitteral(AnyEntity):
     __regid__ = 'SEDAFormatLitteral'
-    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'format_litteral'])
+    fetch_attrs, cw_fetch_order = fetch_config(['user_cardinality', 'format_litteral', 'user_annotation'])
     value_attr = 'format_litteral'
 
 class SEDAMimeType(AnyEntity):
--- a/i18n/en.po	Fri Jul 08 13:51:03 2016 +0200
+++ b/i18n/en.po	Fri Jul 08 15:07:09 2016 +0200
@@ -520,7 +520,10 @@
 msgid "Relationship target of"
 msgstr ""
 
-msgid "SEDA 2.0 export"
+msgid "SEDA 2.0 RNG export"
+msgstr ""
+
+msgid "SEDA 2.0 XSD export"
 msgstr ""
 
 msgid "SEDA profile tree"
@@ -7309,6 +7312,62 @@
 msgid "user_annotation"
 msgstr ""
 
+msgctxt "SEDAAccessRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAccessRuleCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAcquiredDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAddressee"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAltAccessRulePreventInheritance"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAltAppraisalRulePreventInheritance"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAltClassificationRulePreventInheritance"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAltDisseminationRulePreventInheritance"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAltReuseRulePreventInheritance"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAltStorageRulePreventInheritance"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAppraisalRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAppraisalRuleCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAArchivalAgencyArchiveUnitIdentifier"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAArchivalAgreement"
+msgid "user_annotation"
+msgstr ""
+
 msgctxt "SEDAArchiveTransfer"
 msgid "user_annotation"
 msgstr ""
@@ -7317,18 +7376,446 @@
 msgid "user_annotation"
 msgstr ""
 
+msgctxt "SEDAAuthorizedAgent"
+msgid "user_annotation"
+msgstr ""
+
 msgctxt "SEDABinaryDataObject"
 msgid "user_annotation"
 msgstr ""
 
+msgctxt "SEDAClassificationReassessingDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAClassificationRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAClassificationRuleCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAComment"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDACompressed"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDACompressionAlgorithmCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
 msgctxt "SEDAContent"
 msgid "user_annotation"
 msgstr ""
 
+msgctxt "SEDACreatedDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDACreatingApplicationName"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDACreatingApplicationVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDACreatingOs"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDACreatingOsVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDACustodialHistoryFile"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDACustodialHistoryItem"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADataObjectReference"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADataObjectVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADataObjectVersionCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADateCreatedByApplication"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADepth"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADescription"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADescriptionLanguage"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADiameter"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADisseminationRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADisseminationRuleCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADocumentType"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAEncoding"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAEncodingCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAEndDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAEvent"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAEventDetail"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAEventIdentifier"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAEventType"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAFilePlanPosition"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAFormatId"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAFormatLitteral"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAGpsAltitude"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAGpsAltitudeRef"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAGpsDateStamp"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAGpsLatitude"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAGpsLatitudeRef"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAGpsLongitude"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAGpsLongitudeRef"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAGpsVersionID"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAHeight"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAIsPartOf"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAIsVersionOf"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAJuridictional"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAKeyword"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAKeywordReference"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAKeywordType"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDALanguage"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDALastModified"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDALength"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAMimeType"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAMimeTypeCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDANeedAuthorization"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDANeedReassessingAuthorization"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDANumberOfPage"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAOriginatingAgency"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAOriginatingAgencyArchiveUnitIdentifier"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAOriginatingSystemId"
+msgid "user_annotation"
+msgstr ""
+
 msgctxt "SEDAPhysicalDataObject"
 msgid "user_annotation"
 msgstr ""
 
+msgctxt "SEDAReceivedDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDARecipient"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDARefNonRuleId"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAReferences"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDARegisteredDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDARelatedTransferReference"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDARelationship"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDARelationshipCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAReplaces"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDARequires"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAReuseRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAReuseRuleCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASentDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASeqAccessRuleRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASeqAppraisalRuleRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASeqClassificationRuleRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASeqDisseminationRuleRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASeqReuseRuleRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASeqStorageRuleRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAServiceLevel"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAShape"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASignature"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASource"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASpatial"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAStartDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAStatus"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAStorageRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAStorageRuleCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASubmissionAgency"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASystemId"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDATag"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDATemporal"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAThickness"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDATitle"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDATransactedDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDATransferRequestReplyIdentifier"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDATransferringAgencyArchiveUnitIdentifier"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAType"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAWeight"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAWidth"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAWriter"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDArestrictionEndDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDArestrictionRuleIdRef"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDArestrictionValue"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAwhen"
+msgid "user_annotation"
+msgstr ""
+
 msgid "user_cardinality"
 msgstr ""
 
--- a/i18n/fr.po	Fri Jul 08 13:51:03 2016 +0200
+++ b/i18n/fr.po	Fri Jul 08 15:07:09 2016 +0200
@@ -523,7 +523,10 @@
 msgid "Relationship target of"
 msgstr "Cible des relations"
 
-msgid "SEDA 2.0 export"
+msgid "SEDA 2.0 RNG export"
+msgstr ""
+
+msgid "SEDA 2.0 XSD export"
 msgstr ""
 
 msgid "SEDA profile tree"
@@ -7317,6 +7320,62 @@
 msgid "user_annotation"
 msgstr "annotation"
 
+msgctxt "SEDAAccessRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAccessRuleCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAcquiredDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAddressee"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAltAccessRulePreventInheritance"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAltAppraisalRulePreventInheritance"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAltClassificationRulePreventInheritance"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAltDisseminationRulePreventInheritance"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAltReuseRulePreventInheritance"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAltStorageRulePreventInheritance"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAppraisalRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAAppraisalRuleCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAArchivalAgencyArchiveUnitIdentifier"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAArchivalAgreement"
+msgid "user_annotation"
+msgstr ""
+
 msgctxt "SEDAArchiveTransfer"
 msgid "user_annotation"
 msgstr ""
@@ -7325,18 +7384,446 @@
 msgid "user_annotation"
 msgstr ""
 
+msgctxt "SEDAAuthorizedAgent"
+msgid "user_annotation"
+msgstr ""
+
 msgctxt "SEDABinaryDataObject"
 msgid "user_annotation"
 msgstr ""
 
+msgctxt "SEDAClassificationReassessingDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAClassificationRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAClassificationRuleCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAComment"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDACompressed"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDACompressionAlgorithmCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
 msgctxt "SEDAContent"
 msgid "user_annotation"
 msgstr ""
 
+msgctxt "SEDACreatedDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDACreatingApplicationName"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDACreatingApplicationVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDACreatingOs"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDACreatingOsVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDACustodialHistoryFile"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDACustodialHistoryItem"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADataObjectReference"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADataObjectVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADataObjectVersionCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADateCreatedByApplication"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADepth"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADescription"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADescriptionLanguage"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADiameter"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADisseminationRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADisseminationRuleCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDADocumentType"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAEncoding"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAEncodingCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAEndDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAEvent"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAEventDetail"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAEventIdentifier"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAEventType"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAFilePlanPosition"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAFormatId"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAFormatLitteral"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAGpsAltitude"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAGpsAltitudeRef"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAGpsDateStamp"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAGpsLatitude"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAGpsLatitudeRef"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAGpsLongitude"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAGpsLongitudeRef"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAGpsVersionID"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAHeight"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAIsPartOf"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAIsVersionOf"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAJuridictional"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAKeyword"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAKeywordReference"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAKeywordType"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDALanguage"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDALastModified"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDALength"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAMimeType"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAMimeTypeCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDANeedAuthorization"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDANeedReassessingAuthorization"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDANumberOfPage"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAOriginatingAgency"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAOriginatingAgencyArchiveUnitIdentifier"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAOriginatingSystemId"
+msgid "user_annotation"
+msgstr ""
+
 msgctxt "SEDAPhysicalDataObject"
 msgid "user_annotation"
 msgstr ""
 
+msgctxt "SEDAReceivedDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDARecipient"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDARefNonRuleId"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAReferences"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDARegisteredDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDARelatedTransferReference"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDARelationship"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDARelationshipCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAReplaces"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDARequires"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAReuseRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAReuseRuleCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASentDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASeqAccessRuleRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASeqAppraisalRuleRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASeqClassificationRuleRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASeqDisseminationRuleRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASeqReuseRuleRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASeqStorageRuleRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAServiceLevel"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAShape"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASignature"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASource"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASpatial"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAStartDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAStatus"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAStorageRule"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAStorageRuleCodeListVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASubmissionAgency"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDASystemId"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDATag"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDATemporal"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAThickness"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDATitle"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDATransactedDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDATransferRequestReplyIdentifier"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDATransferringAgencyArchiveUnitIdentifier"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAType"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAVersion"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAWeight"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAWidth"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAWriter"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDArestrictionEndDate"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDArestrictionRuleIdRef"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDArestrictionValue"
+msgid "user_annotation"
+msgstr ""
+
+msgctxt "SEDAwhen"
+msgid "user_annotation"
+msgstr ""
+
 msgid "user_cardinality"
 msgstr "cardinalité"
 
--- a/schema/seda2.py	Fri Jul 08 13:51:03 2016 +0200
+++ b/schema/seda2.py	Fri Jul 08 15:07:09 2016 +0200
@@ -34,7 +34,7 @@
 
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAComment(EntityType):
     u""""""
     comment = String()
@@ -50,7 +50,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDASignature(EntityType):
     u""""""
 
@@ -65,7 +65,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAArchivalAgreement(EntityType):
     u""""""
     archival_agreement = String()
@@ -81,7 +81,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDARelatedTransferReference(EntityType):
     u""""""
 
@@ -96,7 +96,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDATransferRequestReplyIdentifier(EntityType):
     u""""""
 
@@ -162,7 +162,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAServiceLevel(EntityType):
     u""""""
     service_level = String()
@@ -178,7 +178,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAStorageRule(EntityType):
     u""""""
 
@@ -193,7 +193,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAAppraisalRule(EntityType):
     u""""""
 
@@ -208,7 +208,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAAccessRule(EntityType):
     u""""""
 
@@ -223,7 +223,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDADisseminationRule(EntityType):
     u""""""
 
@@ -238,7 +238,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAReuseRule(EntityType):
     u""""""
 
@@ -253,7 +253,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAClassificationRule(EntityType):
     u""""""
     classification_owner = String()
@@ -269,7 +269,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDANeedAuthorization(EntityType):
     u""""""
     need_authorization = Boolean()
@@ -285,7 +285,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDASeqClassificationRuleRule(EntityType):
     u""""""
 
@@ -300,7 +300,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAAltClassificationRulePreventInheritance(EntityType):
     u""""""
 
@@ -324,7 +324,7 @@
     constraints = [RQLConstraint('O in_scheme CS, CS scheme_relation_type CR, CR name "seda_classification_level"')]
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAClassificationReassessingDate(EntityType):
     u""""""
 
@@ -339,7 +339,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDANeedReassessingAuthorization(EntityType):
     u""""""
     need_reassessing_authorization = Boolean()
@@ -371,7 +371,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['1..n', '1'], default_cardinality='1..n',
-                      annotable=False)
+                      annotable=True)
 class SEDARefNonRuleId(EntityType):
     u""""""
 
@@ -404,7 +404,7 @@
     constraints = [RQLConstraint('O in_scheme CS, CACLV seda_classification_rule_code_list_version_from AT, CACLV seda_classification_rule_code_list_version_to CS,S container AT')]
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAStartDate(EntityType):
     u""""""
 
@@ -419,7 +419,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDASeqReuseRuleRule(EntityType):
     u""""""
 
@@ -434,7 +434,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAAltReuseRulePreventInheritance(EntityType):
     u""""""
 
@@ -458,7 +458,7 @@
     constraints = [RQLConstraint('O in_scheme CS, CACLV seda_reuse_rule_code_list_version_from AT, CACLV seda_reuse_rule_code_list_version_to CS,S container AT')]
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDASeqDisseminationRuleRule(EntityType):
     u""""""
 
@@ -473,7 +473,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAAltDisseminationRulePreventInheritance(EntityType):
     u""""""
 
@@ -497,7 +497,7 @@
     constraints = [RQLConstraint('O in_scheme CS, CACLV seda_dissemination_rule_code_list_version_from AT, CACLV seda_dissemination_rule_code_list_version_to CS,S container AT')]
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDASeqAccessRuleRule(EntityType):
     u""""""
 
@@ -512,7 +512,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAAltAccessRulePreventInheritance(EntityType):
     u""""""
 
@@ -536,7 +536,7 @@
     constraints = [RQLConstraint('O in_scheme CS, CACLV seda_access_rule_code_list_version_from AT, CACLV seda_access_rule_code_list_version_to CS,S container AT')]
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDASeqAppraisalRuleRule(EntityType):
     u""""""
 
@@ -551,7 +551,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAAltAppraisalRulePreventInheritance(EntityType):
     u""""""
 
@@ -584,7 +584,7 @@
     constraints = [RQLConstraint('O in_scheme CS, CACLV seda_appraisal_rule_code_list_version_from AT, CACLV seda_appraisal_rule_code_list_version_to CS,S container AT')]
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDASeqStorageRuleRule(EntityType):
     u""""""
 
@@ -599,7 +599,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAAltStorageRulePreventInheritance(EntityType):
     u""""""
 
@@ -726,7 +726,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDADataObjectReference(EntityType):
     u""""""
 
@@ -750,7 +750,7 @@
     constraints = [RQLConstraint('S container C, O container C')]
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDArestrictionRuleIdRef(EntityType):
     u""""""
     restriction_rule_id_ref = String()
@@ -766,7 +766,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDArestrictionValue(EntityType):
     u""""""
     restriction_value = String()
@@ -782,7 +782,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDArestrictionEndDate(EntityType):
     u""""""
 
@@ -806,7 +806,7 @@
     constraints = [RQLConstraint('O in_scheme CS, CS scheme_relation_type CR, CR name "seda_description_level"')]
 
 @seda_profile_element(cardinalities=['1..n', '1'], default_cardinality='1..n',
-                      annotable=False)
+                      annotable=True)
 class SEDATitle(EntityType):
     u""""""
     title = String()
@@ -822,7 +822,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAFilePlanPosition(EntityType):
     u""""""
     file_plan_position = String()
@@ -838,7 +838,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDASystemId(EntityType):
     u""""""
 
@@ -853,7 +853,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAOriginatingSystemId(EntityType):
     u""""""
 
@@ -868,7 +868,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAArchivalAgencyArchiveUnitIdentifier(EntityType):
     u""""""
     archival_agency_archive_unit_identifier = String()
@@ -884,7 +884,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAOriginatingAgencyArchiveUnitIdentifier(EntityType):
     u""""""
     originating_agency_archive_unit_identifier = String()
@@ -900,7 +900,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDATransferringAgencyArchiveUnitIdentifier(EntityType):
     u""""""
     transferring_agency_archive_unit_identifier = String()
@@ -916,7 +916,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDADescription(EntityType):
     u""""""
     description = String()
@@ -932,7 +932,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAType(EntityType):
     u""""""
     type = String()
@@ -948,7 +948,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDADocumentType(EntityType):
     u""""""
     document_type = String()
@@ -964,7 +964,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDALanguage(EntityType):
     u""""""
 
@@ -988,7 +988,7 @@
     constraints = [RQLConstraint('O in_scheme CS, CS scheme_relation_type CR, CR name "seda_language_to"')]
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDADescriptionLanguage(EntityType):
     u""""""
 
@@ -1012,7 +1012,7 @@
     constraints = [RQLConstraint('O in_scheme CS, CS scheme_relation_type CR, CR name "seda_description_language_to"')]
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAStatus(EntityType):
     u""""""
     status = String()
@@ -1028,7 +1028,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAVersion(EntityType):
     u""""""
     version = String()
@@ -1044,7 +1044,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDATag(EntityType):
     u""""""
     tag = String()
@@ -1060,7 +1060,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAKeyword(EntityType):
     u""""""
 
@@ -1075,7 +1075,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAOriginatingAgency(EntityType):
     u""""""
 
@@ -1099,7 +1099,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDASubmissionAgency(EntityType):
     u""""""
 
@@ -1123,7 +1123,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAAuthorizedAgent(EntityType):
     u""""""
 
@@ -1147,7 +1147,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAWriter(EntityType):
     u""""""
 
@@ -1171,7 +1171,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAAddressee(EntityType):
     u""""""
 
@@ -1195,7 +1195,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDARecipient(EntityType):
     u""""""
 
@@ -1219,7 +1219,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDASource(EntityType):
     u""""""
     source = String()
@@ -1235,7 +1235,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDACreatedDate(EntityType):
     u""""""
 
@@ -1250,7 +1250,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDATransactedDate(EntityType):
     u""""""
 
@@ -1265,7 +1265,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAAcquiredDate(EntityType):
     u""""""
 
@@ -1280,7 +1280,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDASentDate(EntityType):
     u""""""
 
@@ -1295,7 +1295,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAReceivedDate(EntityType):
     u""""""
 
@@ -1310,7 +1310,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDARegisteredDate(EntityType):
     u""""""
 
@@ -1334,7 +1334,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAEndDate(EntityType):
     u""""""
 
@@ -1349,7 +1349,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAEvent(EntityType):
     u""""""
 
@@ -1364,7 +1364,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAGpsVersionID(EntityType):
     u""""""
 
@@ -1379,7 +1379,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAGpsAltitude(EntityType):
     u""""""
 
@@ -1394,7 +1394,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAGpsAltitudeRef(EntityType):
     u""""""
 
@@ -1409,7 +1409,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAGpsLatitude(EntityType):
     u""""""
 
@@ -1424,7 +1424,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAGpsLatitudeRef(EntityType):
     u""""""
 
@@ -1439,7 +1439,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAGpsLongitude(EntityType):
     u""""""
 
@@ -1454,7 +1454,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAGpsLongitudeRef(EntityType):
     u""""""
 
@@ -1469,7 +1469,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAGpsDateStamp(EntityType):
     u""""""
 
@@ -1484,7 +1484,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAEventIdentifier(EntityType):
     u""""""
 
@@ -1499,7 +1499,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAEventType(EntityType):
     u""""""
 
@@ -1523,7 +1523,7 @@
     constraints = [RQLConstraint('O in_scheme CS, CS scheme_relation_type CR, CR name "seda_event_type_to"')]
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAEventDetail(EntityType):
     u""""""
 
@@ -1538,7 +1538,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAIsVersionOf(EntityType):
     u""""""
 
@@ -1553,7 +1553,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAReplaces(EntityType):
     u""""""
 
@@ -1568,7 +1568,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDARequires(EntityType):
     u""""""
 
@@ -1583,7 +1583,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAIsPartOf(EntityType):
     u""""""
 
@@ -1598,7 +1598,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAReferences(EntityType):
     u""""""
 
@@ -1763,7 +1763,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDASpatial(EntityType):
     u""""""
     spatial = String()
@@ -1779,7 +1779,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDATemporal(EntityType):
     u""""""
     temporal = String()
@@ -1795,7 +1795,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAJuridictional(EntityType):
     u""""""
     juridictional = String()
@@ -1827,7 +1827,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAKeywordReference(EntityType):
     u""""""
 
@@ -1851,7 +1851,7 @@
     constraints = [RQLConstraint('O in_scheme CS, S seda_keyword_reference_to_scheme CS')]
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAKeywordType(EntityType):
     u""""""
 
@@ -1875,7 +1875,7 @@
     constraints = [RQLConstraint('O in_scheme CS, CS scheme_relation_type CR, CR name "seda_keyword_type_to"')]
 
 @seda_profile_element(cardinalities=['1..n', '1'], default_cardinality='1..n',
-                      annotable=False)
+                      annotable=True)
 class SEDACustodialHistoryItem(EntityType):
     u""""""
     custodial_history_item = String()
@@ -1891,7 +1891,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDACustodialHistoryFile(EntityType):
     u""""""
 
@@ -1915,7 +1915,7 @@
     constraints = [RQLConstraint('S container C, O container C')]
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAwhen(EntityType):
     u""""""
 
@@ -1984,7 +1984,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '0..n', '1', '1..n'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDARelationship(EntityType):
     u""""""
 
@@ -1999,7 +1999,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDADataObjectVersion(EntityType):
     u""""""
 
@@ -2023,7 +2023,7 @@
     constraints = [RQLConstraint('O in_scheme CS, CACLV seda_data_object_version_code_list_version_from AT, CACLV seda_data_object_version_code_list_version_to CS,S container AT')]
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAWidth(EntityType):
     u""""""
 
@@ -2038,7 +2038,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAHeight(EntityType):
     u""""""
 
@@ -2053,7 +2053,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDADepth(EntityType):
     u""""""
 
@@ -2068,7 +2068,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAShape(EntityType):
     u""""""
 
@@ -2083,7 +2083,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDADiameter(EntityType):
     u""""""
 
@@ -2098,7 +2098,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDALength(EntityType):
     u""""""
 
@@ -2113,7 +2113,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAThickness(EntityType):
     u""""""
 
@@ -2128,7 +2128,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAWeight(EntityType):
     u""""""
 
@@ -2143,7 +2143,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDANumberOfPage(EntityType):
     u""""""
 
@@ -2263,7 +2263,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDACompressed(EntityType):
     u""""""
     compressed = Boolean()
@@ -2279,7 +2279,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDACreatingApplicationName(EntityType):
     u""""""
     creating_application_name = String()
@@ -2295,7 +2295,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDACreatingApplicationVersion(EntityType):
     u""""""
     creating_application_version = String()
@@ -2311,7 +2311,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDADateCreatedByApplication(EntityType):
     u""""""
 
@@ -2326,7 +2326,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDACreatingOs(EntityType):
     u""""""
     creating_os = String()
@@ -2342,7 +2342,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDACreatingOsVersion(EntityType):
     u""""""
     creating_os_version = String()
@@ -2358,7 +2358,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDALastModified(EntityType):
     u""""""
 
@@ -2373,7 +2373,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAFormatLitteral(EntityType):
     u""""""
     format_litteral = String()
@@ -2389,7 +2389,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAMimeType(EntityType):
     u""""""
 
@@ -2413,7 +2413,7 @@
     constraints = [RQLConstraint('O in_scheme CS, CACLV seda_mime_type_code_list_version_from AT, CACLV seda_mime_type_code_list_version_to CS,S container AT')]
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAFormatId(EntityType):
     u""""""
 
@@ -2437,7 +2437,7 @@
     constraints = [RQLConstraint('O in_scheme CS,  AT seda_file_format_code_list_version CS, S container AT')]
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAEncoding(EntityType):
     u""""""
 
@@ -2527,7 +2527,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAMimeTypeCodeListVersion(EntityType):
     u""""""
 
@@ -2551,7 +2551,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAEncodingCodeListVersion(EntityType):
     u""""""
 
@@ -2584,7 +2584,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDACompressionAlgorithmCodeListVersion(EntityType):
     u""""""
 
@@ -2608,7 +2608,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDADataObjectVersionCodeListVersion(EntityType):
     u""""""
 
@@ -2632,7 +2632,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAStorageRuleCodeListVersion(EntityType):
     u""""""
 
@@ -2656,7 +2656,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAAppraisalRuleCodeListVersion(EntityType):
     u""""""
 
@@ -2680,7 +2680,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAAccessRuleCodeListVersion(EntityType):
     u""""""
 
@@ -2704,7 +2704,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDADisseminationRuleCodeListVersion(EntityType):
     u""""""
 
@@ -2728,7 +2728,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAReuseRuleCodeListVersion(EntityType):
     u""""""
 
@@ -2752,7 +2752,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDAClassificationRuleCodeListVersion(EntityType):
     u""""""
 
@@ -2776,7 +2776,7 @@
     constraints = []
 
 @seda_profile_element(cardinalities=['0..1', '1'], default_cardinality='0..1',
-                      annotable=False)
+                      annotable=True)
 class SEDARelationshipCodeListVersion(EntityType):
     u""""""
 
--- a/views/uicfg.py	Fri Jul 08 13:51:03 2016 +0200
+++ b/views/uicfg.py	Fri Jul 08 15:07:09 2016 +0200
@@ -1303,69 +1303,69 @@
 pvds = uicfg.primaryview_display_ctrl
 affk.set_fields_order('SEDAArchiveTransfer', ['title', 'user_annotation'])
 pvds.set_fields_order('SEDAArchiveTransfer', ['title', 'user_annotation'])
-affk.set_fields_order('SEDAComment', ['user_cardinality', 'comment'])
-pvds.set_fields_order('SEDAComment', ['user_cardinality', 'comment'])
-affk.set_fields_order('SEDAArchivalAgreement', ['user_cardinality', 'archival_agreement'])
-pvds.set_fields_order('SEDAArchivalAgreement', ['user_cardinality', 'archival_agreement'])
+affk.set_fields_order('SEDAComment', ['user_cardinality', 'comment', 'user_annotation'])
+pvds.set_fields_order('SEDAComment', ['user_cardinality', 'comment', 'user_annotation'])
+affk.set_fields_order('SEDAArchivalAgreement', ['user_cardinality', 'archival_agreement', 'user_annotation'])
+pvds.set_fields_order('SEDAArchivalAgreement', ['user_cardinality', 'archival_agreement', 'user_annotation'])
 affk.set_fields_order('SEDABinaryDataObject', ['id', 'filename', 'user_cardinality', 'user_annotation'])
 pvds.set_fields_order('SEDABinaryDataObject', ['id', 'filename', 'user_cardinality', 'user_annotation'])
 affk.set_fields_order('SEDAPhysicalDataObject', ['id', 'user_cardinality', 'user_annotation'])
 pvds.set_fields_order('SEDAPhysicalDataObject', ['id', 'user_cardinality', 'user_annotation'])
-affk.set_fields_order('SEDAServiceLevel', ['user_cardinality', 'service_level'])
-pvds.set_fields_order('SEDAServiceLevel', ['user_cardinality', 'service_level'])
-affk.set_fields_order('SEDAClassificationRule', ['user_cardinality', 'classification_owner'])
-pvds.set_fields_order('SEDAClassificationRule', ['user_cardinality', 'classification_owner'])
-affk.set_fields_order('SEDANeedAuthorization', ['user_cardinality', 'need_authorization'])
-pvds.set_fields_order('SEDANeedAuthorization', ['user_cardinality', 'need_authorization'])
-affk.set_fields_order('SEDANeedReassessingAuthorization', ['user_cardinality', 'need_reassessing_authorization'])
-pvds.set_fields_order('SEDANeedReassessingAuthorization', ['user_cardinality', 'need_reassessing_authorization'])
+affk.set_fields_order('SEDAServiceLevel', ['user_cardinality', 'service_level', 'user_annotation'])
+pvds.set_fields_order('SEDAServiceLevel', ['user_cardinality', 'service_level', 'user_annotation'])
+affk.set_fields_order('SEDAClassificationRule', ['user_cardinality', 'classification_owner', 'user_annotation'])
+pvds.set_fields_order('SEDAClassificationRule', ['user_cardinality', 'classification_owner', 'user_annotation'])
+affk.set_fields_order('SEDANeedAuthorization', ['user_cardinality', 'need_authorization', 'user_annotation'])
+pvds.set_fields_order('SEDANeedAuthorization', ['user_cardinality', 'need_authorization', 'user_annotation'])
+affk.set_fields_order('SEDANeedReassessingAuthorization', ['user_cardinality', 'need_reassessing_authorization', 'user_annotation'])
+pvds.set_fields_order('SEDANeedReassessingAuthorization', ['user_cardinality', 'need_reassessing_authorization', 'user_annotation'])
 affk.set_fields_order('SEDAArchiveUnit', ['id', 'user_cardinality', 'user_annotation'])
 pvds.set_fields_order('SEDAArchiveUnit', ['id', 'user_cardinality', 'user_annotation'])
-affk.set_fields_order('SEDArestrictionRuleIdRef', ['user_cardinality', 'restriction_rule_id_ref'])
-pvds.set_fields_order('SEDArestrictionRuleIdRef', ['user_cardinality', 'restriction_rule_id_ref'])
-affk.set_fields_order('SEDArestrictionValue', ['user_cardinality', 'restriction_value'])
-pvds.set_fields_order('SEDArestrictionValue', ['user_cardinality', 'restriction_value'])
-affk.set_fields_order('SEDATitle', ['user_cardinality', 'title'])
-pvds.set_fields_order('SEDATitle', ['user_cardinality', 'title'])
-affk.set_fields_order('SEDAFilePlanPosition', ['user_cardinality', 'file_plan_position'])
-pvds.set_fields_order('SEDAFilePlanPosition', ['user_cardinality', 'file_plan_position'])
-affk.set_fields_order('SEDAArchivalAgencyArchiveUnitIdentifier', ['user_cardinality', 'archival_agency_archive_unit_identifier'])
-pvds.set_fields_order('SEDAArchivalAgencyArchiveUnitIdentifier', ['user_cardinality', 'archival_agency_archive_unit_identifier'])
-affk.set_fields_order('SEDAOriginatingAgencyArchiveUnitIdentifier', ['user_cardinality', 'originating_agency_archive_unit_identifier'])
-pvds.set_fields_order('SEDAOriginatingAgencyArchiveUnitIdentifier', ['user_cardinality', 'originating_agency_archive_unit_identifier'])
-affk.set_fields_order('SEDATransferringAgencyArchiveUnitIdentifier', ['user_cardinality', 'transferring_agency_archive_unit_identifier'])
-pvds.set_fields_order('SEDATransferringAgencyArchiveUnitIdentifier', ['user_cardinality', 'transferring_agency_archive_unit_identifier'])
-affk.set_fields_order('SEDADescription', ['user_cardinality', 'description'])
-pvds.set_fields_order('SEDADescription', ['user_cardinality', 'description'])
-affk.set_fields_order('SEDAType', ['user_cardinality', 'type'])
-pvds.set_fields_order('SEDAType', ['user_cardinality', 'type'])
-affk.set_fields_order('SEDADocumentType', ['user_cardinality', 'document_type'])
-pvds.set_fields_order('SEDADocumentType', ['user_cardinality', 'document_type'])
-affk.set_fields_order('SEDAStatus', ['user_cardinality', 'status'])
-pvds.set_fields_order('SEDAStatus', ['user_cardinality', 'status'])
-affk.set_fields_order('SEDAVersion', ['user_cardinality', 'version'])
-pvds.set_fields_order('SEDAVersion', ['user_cardinality', 'version'])
-affk.set_fields_order('SEDATag', ['user_cardinality', 'tag'])
-pvds.set_fields_order('SEDATag', ['user_cardinality', 'tag'])
-affk.set_fields_order('SEDASource', ['user_cardinality', 'source'])
-pvds.set_fields_order('SEDASource', ['user_cardinality', 'source'])
-affk.set_fields_order('SEDASpatial', ['user_cardinality', 'spatial'])
-pvds.set_fields_order('SEDASpatial', ['user_cardinality', 'spatial'])
-affk.set_fields_order('SEDATemporal', ['user_cardinality', 'temporal'])
-pvds.set_fields_order('SEDATemporal', ['user_cardinality', 'temporal'])
-affk.set_fields_order('SEDAJuridictional', ['user_cardinality', 'juridictional'])
-pvds.set_fields_order('SEDAJuridictional', ['user_cardinality', 'juridictional'])
-affk.set_fields_order('SEDACustodialHistoryItem', ['user_cardinality', 'custodial_history_item'])
-pvds.set_fields_order('SEDACustodialHistoryItem', ['user_cardinality', 'custodial_history_item'])
-affk.set_fields_order('SEDACompressed', ['user_cardinality', 'compressed'])
-pvds.set_fields_order('SEDACompressed', ['user_cardinality', 'compressed'])
-affk.set_fields_order('SEDACreatingApplicationName', ['user_cardinality', 'creating_application_name'])
-pvds.set_fields_order('SEDACreatingApplicationName', ['user_cardinality', 'creating_application_name'])
-affk.set_fields_order('SEDACreatingApplicationVersion', ['user_cardinality', 'creating_application_version'])
-pvds.set_fields_order('SEDACreatingApplicationVersion', ['user_cardinality', 'creating_application_version'])
-affk.set_fields_order('SEDACreatingOs', ['user_cardinality', 'creating_os'])
-pvds.set_fields_order('SEDACreatingOs', ['user_cardinality', 'creating_os'])
-affk.set_fields_order('SEDACreatingOsVersion', ['user_cardinality', 'creating_os_version'])
-pvds.set_fields_order('SEDACreatingOsVersion', ['user_cardinality', 'creating_os_version'])
-affk.set_fields_order('SEDAFormatLitteral', ['user_cardinality', 'format_litteral'])
-pvds.set_fields_order('SEDAFormatLitteral', ['user_cardinality', 'format_litteral'])
+affk.set_fields_order('SEDArestrictionRuleIdRef', ['user_cardinality', 'restriction_rule_id_ref', 'user_annotation'])
+pvds.set_fields_order('SEDArestrictionRuleIdRef', ['user_cardinality', 'restriction_rule_id_ref', 'user_annotation'])
+affk.set_fields_order('SEDArestrictionValue', ['user_cardinality', 'restriction_value', 'user_annotation'])
+pvds.set_fields_order('SEDArestrictionValue', ['user_cardinality', 'restriction_value', 'user_annotation'])
+affk.set_fields_order('SEDATitle', ['user_cardinality', 'title', 'user_annotation'])
+pvds.set_fields_order('SEDATitle', ['user_cardinality', 'title', 'user_annotation'])
+affk.set_fields_order('SEDAFilePlanPosition', ['user_cardinality', 'file_plan_position', 'user_annotation'])
+pvds.set_fields_order('SEDAFilePlanPosition', ['user_cardinality', 'file_plan_position', 'user_annotation'])
+affk.set_fields_order('SEDAArchivalAgencyArchiveUnitIdentifier', ['user_cardinality', 'archival_agency_archive_unit_identifier', 'user_annotation'])
+pvds.set_fields_order('SEDAArchivalAgencyArchiveUnitIdentifier', ['user_cardinality', 'archival_agency_archive_unit_identifier', 'user_annotation'])
+affk.set_fields_order('SEDAOriginatingAgencyArchiveUnitIdentifier', ['user_cardinality', 'originating_agency_archive_unit_identifier', 'user_annotation'])
+pvds.set_fields_order('SEDAOriginatingAgencyArchiveUnitIdentifier', ['user_cardinality', 'originating_agency_archive_unit_identifier', 'user_annotation'])
+affk.set_fields_order('SEDATransferringAgencyArchiveUnitIdentifier', ['user_cardinality', 'transferring_agency_archive_unit_identifier', 'user_annotation'])
+pvds.set_fields_order('SEDATransferringAgencyArchiveUnitIdentifier', ['user_cardinality', 'transferring_agency_archive_unit_identifier', 'user_annotation'])
+affk.set_fields_order('SEDADescription', ['user_cardinality', 'description', 'user_annotation'])
+pvds.set_fields_order('SEDADescription', ['user_cardinality', 'description', 'user_annotation'])
+affk.set_fields_order('SEDAType', ['user_cardinality', 'type', 'user_annotation'])
+pvds.set_fields_order('SEDAType', ['user_cardinality', 'type', 'user_annotation'])
+affk.set_fields_order('SEDADocumentType', ['user_cardinality', 'document_type', 'user_annotation'])
+pvds.set_fields_order('SEDADocumentType', ['user_cardinality', 'document_type', 'user_annotation'])
+affk.set_fields_order('SEDAStatus', ['user_cardinality', 'status', 'user_annotation'])
+pvds.set_fields_order('SEDAStatus', ['user_cardinality', 'status', 'user_annotation'])
+affk.set_fields_order('SEDAVersion', ['user_cardinality', 'version', 'user_annotation'])
+pvds.set_fields_order('SEDAVersion', ['user_cardinality', 'version', 'user_annotation'])
+affk.set_fields_order('SEDATag', ['user_cardinality', 'tag', 'user_annotation'])
+pvds.set_fields_order('SEDATag', ['user_cardinality', 'tag', 'user_annotation'])
+affk.set_fields_order('SEDASource', ['user_cardinality', 'source', 'user_annotation'])
+pvds.set_fields_order('SEDASource', ['user_cardinality', 'source', 'user_annotation'])
+affk.set_fields_order('SEDASpatial', ['user_cardinality', 'spatial', 'user_annotation'])
+pvds.set_fields_order('SEDASpatial', ['user_cardinality', 'spatial', 'user_annotation'])
+affk.set_fields_order('SEDATemporal', ['user_cardinality', 'temporal', 'user_annotation'])
+pvds.set_fields_order('SEDATemporal', ['user_cardinality', 'temporal', 'user_annotation'])
+affk.set_fields_order('SEDAJuridictional', ['user_cardinality', 'juridictional', 'user_annotation'])
+pvds.set_fields_order('SEDAJuridictional', ['user_cardinality', 'juridictional', 'user_annotation'])
+affk.set_fields_order('SEDACustodialHistoryItem', ['user_cardinality', 'custodial_history_item', 'user_annotation'])
+pvds.set_fields_order('SEDACustodialHistoryItem', ['user_cardinality', 'custodial_history_item', 'user_annotation'])
+affk.set_fields_order('SEDACompressed', ['user_cardinality', 'compressed', 'user_annotation'])
+pvds.set_fields_order('SEDACompressed', ['user_cardinality', 'compressed', 'user_annotation'])
+affk.set_fields_order('SEDACreatingApplicationName', ['user_cardinality', 'creating_application_name', 'user_annotation'])
+pvds.set_fields_order('SEDACreatingApplicationName', ['user_cardinality', 'creating_application_name', 'user_annotation'])
+affk.set_fields_order('SEDACreatingApplicationVersion', ['user_cardinality', 'creating_application_version', 'user_annotation'])
+pvds.set_fields_order('SEDACreatingApplicationVersion', ['user_cardinality', 'creating_application_version', 'user_annotation'])
+affk.set_fields_order('SEDACreatingOs', ['user_cardinality', 'creating_os', 'user_annotation'])
+pvds.set_fields_order('SEDACreatingOs', ['user_cardinality', 'creating_os', 'user_annotation'])
+affk.set_fields_order('SEDACreatingOsVersion', ['user_cardinality', 'creating_os_version', 'user_annotation'])
+pvds.set_fields_order('SEDACreatingOsVersion', ['user_cardinality', 'creating_os_version', 'user_annotation'])
+affk.set_fields_order('SEDAFormatLitteral', ['user_cardinality', 'format_litteral', 'user_annotation'])
+pvds.set_fields_order('SEDAFormatLitteral', ['user_cardinality', 'format_litteral', 'user_annotation'])
--- a/xsd2uicfg.py	Fri Jul 08 13:51:03 2016 +0200
+++ b/xsd2uicfg.py	Fri Jul 08 15:07:09 2016 +0200
@@ -22,7 +22,7 @@
 from cubicweb import neg_role
 
 from xsd import XSDM_MAPPING
-from xsd2yams import HAS_ANNOTATIONS, CodeGenerator
+from xsd2yams import CodeGenerator
 
 
 LEVEL_ETYPES = set(('SEDABinaryDataObjectType', 'SEDAPhysicalDataObjectType',
@@ -213,7 +213,6 @@
                 attributes.append('user_cardinality')
             else:
                 attributes.insert(0, 'user_cardinality')
-        if mapping.etype in HAS_ANNOTATIONS:
             attributes.append('user_annotation')
     return attributes
 
--- a/xsd2yams.py	Fri Jul 08 13:51:03 2016 +0200
+++ b/xsd2yams.py	Fri Jul 08 15:07:09 2016 +0200
@@ -79,9 +79,6 @@
     'width',
 ])
 
-# elements which should have some annotation (textual description)
-HAS_ANNOTATIONS = set(['SEDABinaryDataObject', 'SEDAPhysicalDataObject',
-                       'SEDAArchiveUnit', 'SEDAContent'])
 RDEF_CONSTRAINTS = {
     # x-ref constraints
     'seda_data_object_reference_id': 'S container C, O container C',
@@ -425,8 +422,8 @@
 
     def code_for_e_type_mapping(self, mapping):
         if mapping.cards:
-            annotable = mapping.etype in HAS_ANNOTATIONS
             cards = mapping.cards
+            annotable = len(cards) > 1
             code = '''\
 @seda_profile_element(cardinalities={cards}, default_cardinality='{cards[0]}',
                       annotable={annotable})