commit 43bc274b331a98d62291020a23e32a4ef8c5d7d0
parent f8898b0af2aef0b015bed8d2aaf5db7d34c4bb70
Author: Sebastian <sebasjm@gmail.com>
Date: Thu, 2 Jan 2025 08:54:30 -0300
order and labels
Diffstat:
3 files changed, 166 insertions(+), 50 deletions(-)
diff --git a/gnu-taler-aml-attributes/json.template b/gnu-taler-aml-attributes/json.template
@@ -1,6 +1,8 @@
"{{Identifier}}": {
"required": {{Required = "true" ? 'true' : 'false'}},
"type": "{{Type}}",
- "enumeration": {{ #Enumeration < 2 ? '[]' : #Enumeration = 2 ? '["'&Enumeration[0]&'","'&Enumeration[1]&'"]' : #Enumeration = 3 ? '["'&Enumeration[0]&'","'&Enumeration[1]&'","'&Enumeration[2]&'"]' : #Enumeration = 4 ? '["'&Enumeration[0]&'","'&Enumeration[1]&'","'&Enumeration[2]&'","'&Enumeration[3]&'"]' : #Enumeration = 5 ? '["'&Enumeration[0]&'","'&Enumeration[1]&'","'&Enumeration[2]&'","'&Enumeration[3]&'","'&Enumeration[4]&'"]' : #Enumeration = 6 ? '["'&Enumeration[0]&'","'&Enumeration[1]&'","'&Enumeration[2]&'","'&Enumeration[3]&'","'&Enumeration[4]&'","'&Enumeration[5]&'"]' : #Enumeration = 7 ? '["'&Enumeration[0]&'","'&Enumeration[1]&'","'&Enumeration[2]&'","'&Enumeration[3]&'","'&Enumeration[4]&'","'&Enumeration[5]&'","'&Enumeration[6]&'"]' : '["'&Enumeration[0]&'","'&Enumeration[1]&'","'&Enumeration[2]&'","'&Enumeration[3]&'","'&Enumeration[4]&'","'&Enumeration[5]&'","'&Enumeration[6]&'","'&Enumeration[7]&'"]' }},
+ "label": "{{Label}}",
+{{ #Order = 1 ? ' "order": '&Order&',
+' : ''}} "enumeration": {{ #Enumeration < 2 ? '[]' : #Enumeration = 2 ? '["'&Enumeration[0]&'","'&Enumeration[1]&'"]' : #Enumeration = 3 ? '["'&Enumeration[0]&'","'&Enumeration[1]&'","'&Enumeration[2]&'"]' : #Enumeration = 4 ? '["'&Enumeration[0]&'","'&Enumeration[1]&'","'&Enumeration[2]&'","'&Enumeration[3]&'"]' : #Enumeration = 5 ? '["'&Enumeration[0]&'","'&Enumeration[1]&'","'&Enumeration[2]&'","'&Enumeration[3]&'","'&Enumeration[4]&'"]' : #Enumeration = 6 ? '["'&Enumeration[0]&'","'&Enumeration[1]&'","'&Enumeration[2]&'","'&Enumeration[3]&'","'&Enumeration[4]&'","'&Enumeration[5]&'"]' : #Enumeration = 7 ? '["'&Enumeration[0]&'","'&Enumeration[1]&'","'&Enumeration[2]&'","'&Enumeration[3]&'","'&Enumeration[4]&'","'&Enumeration[5]&'","'&Enumeration[6]&'"]' : '["'&Enumeration[0]&'","'&Enumeration[1]&'","'&Enumeration[2]&'","'&Enumeration[3]&'","'&Enumeration[4]&'","'&Enumeration[5]&'","'&Enumeration[6]&'","'&Enumeration[7]&'"]' }},
"section": "{{Section}}"
},
diff --git a/gnu-taler-aml-attributes/registry.rec b/gnu-taler-aml-attributes/registry.rec
@@ -27,7 +27,10 @@
%allowed: Enumeration
# Identification to visually group correlated fields
%allowed: Section
-%sort: Identifier Type Form Required Label Help Enumeration Section
+# Order of the field
+%allowed: Order
+%type: Order int
+%sort: Identifier Type Form Required Label Help Enumeration Order Section
##########################
## All VQF forms
@@ -48,11 +51,13 @@ Form: VQF_902_12
Form: VQF_902_13
Form: VQF_902_14
Required: true
+Label: Full name
+Order: 1
Identifier: FORM_FILLING_DATE
Help: When the form was completed.
Section: header
-Type: AbsoluteTime
+Type: AbsoluteDateTime
Form: VQF_902_1
Form: VQF_902_4
Form: VQF_902_5
@@ -62,6 +67,8 @@ Form: VQF_902_12
Form: VQF_902_13
Form: VQF_902_14
Required: true
+Label: Date
+Order: 2
Identifier: CUSTOMER_ID
Section: header
@@ -76,16 +83,18 @@ Form: VQF_902_12
Form: VQF_902_13
Form: VQF_902_14
Help: Customer system ID required to correlate different AML forms.
+Order: 3
Identifier: SIGN_DATE
Help: Contracing partner signature,
Section: footer
-Type: AbsoluteTime
+Type: AbsoluteDateTime
Form: VQF_902_9
Form: VQF_902_11
Form: VQF_902_12
Form: VQF_902_13
Required: true
+Order: 1
Identifier: SIGNATURE
Section: footer
@@ -95,6 +104,7 @@ Form: VQF_902_12
Form: VQF_902_13
Type: String
Required: true
+Order: 2
##########################
## Form VQF 902.1e
@@ -108,7 +118,8 @@ Required: true
Type: String
Form: VQF_902_1
Section: 1
-Help: If the customer is a natural person.
+Label: Full name
+Order: 1
Identifier: CUSTOMER_NATURAL_RESIDENTIAL
Required: true
@@ -116,25 +127,33 @@ Type: ResidentialAddress
Form: VQF_902_1
Section: 1
Help: If the customer is a natural person.
+Order: 2
+Label: Residential address
Identifier: CUSTOMER_NATURAL_PHONE
-Type: String
+Type: Phone
Form: VQF_902_1
Section: 1
Help: If the customer is a natural person.
+Order: 3
+Label: Telephone
Identifier: CUSTOMER_NATURAL_EMAIL
-Type: String
+Type: Email
Form: VQF_902_1
Section: 1
Help: If the customer is a natural person.
+Order: 4
+Label: E-mail
Identifier: CUSTOMER_NATURAL_BIRTHDATE
Required: true
-Type: AbsoluteTime
+Type: AbsoluteDate
Form: VQF_902_1
Section: 1
Help: If the customer is a natural person.
+Order: 5
+Label: Date of birth
Identifier: CUSTOMER_NATURAL_NATIONALITY
Required: true
@@ -142,6 +161,8 @@ Type: CountryCode
Form: VQF_902_1
Section: 1
Help: If the customer is a natural person.
+Order: 6
+Label: Nationality
Identifier: CUSTOMER_NATURAL_NATIONAL_ID
Required: true
@@ -149,6 +170,8 @@ Type: String
Form: VQF_902_1
Section: 1
Help: If the customer is a natural person.
+Order: 7
+Label: Identification document
Identifier: CUSTOMER_NATURAL_NATIONAL_ID_COPY
Required: true
@@ -156,30 +179,40 @@ Type: File
Form: VQF_902_1
Section: 1
Help: If the customer is a natural person.
+Order: 8
+Label: Picture of identification document
Identifier: CUSTOMER_NATURAL_COMPANY_NAME
Type: String
Form: VQF_902_1
Section: 1
Help: If the customer is a natural person.
+Order: 9
+Label: Company name
Identifier: CUSTOMER_NATURAL_REGISTERED_OFFICE
Type: String
Form: VQF_902_1
Section: 1
Help: If the customer is a natural person.
+Order: 10
+Label: Registered office
Identifier: CUSTOMER_NATURAL_COMPANY_ID
Type: String
Form: VQF_902_1
Section: 1
Help: If the customer is a natural person.
+Order: 11
+Label: Company identification document
Identifier: CUSTOMER_NATURAL_COMPANY_ID_COPY
Type: File
Form: VQF_902_1
Section: 1
Help: If the customer is a natural person.
+Order: 12
+Label: Picture of company identification document
Identifier: CUSTOMER_ENTITY_COMPANY_NAME
Required: true
@@ -187,6 +220,8 @@ Type: String
Form: VQF_902_1
Section: 1
Help: If the customer is a legal entity.
+Order: 13
+Label: Company name
Identifier: CUSTOMER_ENTITY_ADDRESS
Required: true
@@ -194,38 +229,49 @@ Type: BusinessAddress
Form: VQF_902_1
Section: 1
Help: If the customer is a legal entity.
+Order: 14
+Label: Domicile
Identifier: CUSTOMER_ENTITY_CONTACT_PERSON_NAME
Type: String
Form: VQF_902_1
Section: 1
Help: If the customer is a legal entity.
+Order: 15
+Label: Contact person
Identifier: CUSTOMER_ENTITY_PHONE
-Type: String
+Type: Phone
Form: VQF_902_1
Section: 1
Help: If the customer is a legal entity.
+Order: 17
+Label: Telephone
Identifier: CUSTOMER_ENTITY_EMAIL
-Type: String
+Type: Email
Form: VQF_902_1
Section: 1
Help: If the customer is a legal entity.
+Order: 18
+Label: E-mail
Identifier: CUSTOMER_ENTITY_ID
Required: true
Type: String
Form: VQF_902_1
Section: 1
-Help: If the customer is a legal entity. Not older than 12 month
+Help: Not older than 12 month
+Order: 19
+Label: Identification document
Identifier: CUSTOMER_ENTITY_ID_COPY
Required: true
Type: File
Form: VQF_902_1
Section: 1
-Help: If the customer is a legal entity. Not older than 12 month
+Order: 20
+Label: Picutre of identification document
# 2
# Information of the founders
@@ -237,26 +283,36 @@ Form: VQF_902_1
Section: 2
Help: List of founder with the fields below.
Required: true
+Order: 1
+Label: Founders
Identifier: FOUNDER_FULL_NAME
Type: String
Form: VQF_902_1_founder
Required: true
+Order: 1
+Label: Full name
Identifier: FOUNDER_RESIDENTIAL_ADDRESS
Type: ResidentialAddress
Form: VQF_902_1_founder
Required: true
+Order: 1
+Label: Residential address
Identifier: FOUNDER_BIRTHDATE
-Type: AbsoluteTime
+Type: AbsoluteDate
Form: VQF_902_1_founder
Required: true
+Order: 2
+Label: Date of birth
Identifier: FOUNDER_NATIONALITY
Type: CountryCode
Form: VQF_902_1_founder
Required: true
+Order: 3
+Label: Nationality
Identifier: FOUNDER_AUTHORIZATION_TYPE
Section: 2
@@ -264,11 +320,22 @@ Help: Signatory of representation
Type: String
Form: VQF_902_1_founder
Required: true
+Order: 4
+Label: Type of authorization
Identifier: FOUNDER_NATIONAL_ID
Type: String
Form: VQF_902_1_founder
Required: true
+Order: 5
+Label: Identification document
+
+Identifier: FOUNDER_NATIONAL__COPY
+Type: File
+Form: VQF_902_1_founder
+Required: true
+Order: 6
+Label: Picutre of identification document
Identifier: FOUNDER_POWER_OF_ATTORNEY
Enumeration: CR
@@ -277,10 +344,14 @@ Enumeration: OTHER
Type: String
Form: VQF_902_1_founder
Required: true
+Order: 7
+Label: Power of attorney arrangements
Identifier: FOUNDER_POWER_OF_ATTORNEY_OTHER
-Type: String
+Type: Paragraph
Form: VQF_902_1_founder
+Order: 8
+Label: Specify
# 3
# Acceptance of business relationship
@@ -288,30 +359,51 @@ Form: VQF_902_1_founder
Identifier: ACCEPTANCE_DATE
Section: 3
Help: Conclusion of the conract
-Type: AbsoluteTime
+Type: AbsoluteDate
Form: VQF_902_1
+Order: 1
Identifier: ACCEPTANCE_METHOD
Section: 3
-Help: Accepted by face to face or correspondence
+Enumeration: FACE_TO_FACE
+Enumeration: AUTHENTICATED_COPY
+Enumeration: RESIDENTIAL_ADDRESS_VALIDATED
Type: String
Form: VQF_902_1
+Order: 2
+Label: Accepted by
Identifier: ACCEPTANCE_CORRESPONDENCE_SERVICE_TYPE
Section: 3
-Help: To the customer, hold at bank, to the member or to a third party
+Enumeration: TO_THE_CUSTOMER
+Enumeration: HOLD_AT_BANK
+Enumeration: TO_THE_MEMBER
+Enumeration: TO_A_THIRD_PARTY
Type: String
Form: VQF_902_1
+Order: 3
+
+Identifier: ACCEPTANCE_CORRESPONDENCE_SERVICE_OTHER
+Section: 3
+Type: Paragraph
+Form: VQF_902_1
+Order: 3
+Help: Full name and address
+Label: Third party
Identifier: ACCEPTANCE_LANGUAGE
Section: 3
-Type: String
+Type: LangCode
Form: VQF_902_1
+Order: 4
+Label: Language
-Identifier: ACCEPTANCE_ADDITIONAL_INFO
+Identifier: ACCEPTANCE_FURTHER_INFO
Section: 3
Type: String
Form: VQF_902_1
+Order: 5
+Label: Further information
# 4
# Information on the beneficial owner of the assets and/or controlling person
@@ -319,19 +411,29 @@ Form: VQF_902_1
Identifier: CUSTOMER_TYPE
Section: 4
-Help: Value could be natural person and sole beneficial, legal entity, a foundation, a trust, a life insurance or all other cases.
+Enumeration: NATURAL
+Enumeration: LEGAL_ENTITY
+Enumeration: FOUNDATION
+Enumeration: TRUST
+Enumeration: LIFE_INSURANCE
+Enumeration: OTHER
Type: String
Form: VQF_902_1
Required: true
+Order: 1
+Label: Customer type
+Help: Establishment of the beneficial owner of the assets and/or contrilling person
# 5
# Embargo procedures/terrorism list
Identifier: EMBARGO_TERRORISM_INFO
Section: 5
-Help: Verification whether the customer or any involved persons are listed on an embargo-/terrorism list
-Type: String
+Type: Paragraph
Form: VQF_902_1
+Order: 2
+Label: Embargo information
+Help: Verification whether the customer, beneficial owners of the assets, controlling persons, authorised representatives or other involved persons are listed on an embargo-/terrorism list (date of verification/result)
# 6
# Type and purpose of business relationship
@@ -345,16 +447,23 @@ Enumeration: MONEY_ASSET_TRANSFER
Enumeration: OTHER
Type: String
Form: VQF_902_1
+Order: 1
+Label: Type of business relationship
Identifier: RELATIONSHIP_TYPE_OTHER
Section: 6
Type: String
Form: VQF_902_1
+Order: 2
+Label: Specify
Identifier: RELATIONSHIP_PURPOSE
Section: 6
-Type: String
+Type: Paragraph
Form: VQF_902_1
+Order: 3
+Label: Purpose of the business relationship
+Help: Purpose of service requested
##########################
## Form VQF 902.4e
@@ -389,7 +498,7 @@ Required: true
Identifier: PEP_ACCEPTANCE_DATE
Section: 1
Help: The decision of the Senior executive body on the acceptance of a business relationsip was obtained on ___
-Type: AbsoluteTime
+Type: AbsoluteDateTime
Form: VQF_902_4
# 2. High risk or non-cooperative country
@@ -404,7 +513,7 @@ Required: true
Identifier: HIGH_RISK__ACCEPTANCE_DATE
Section: 2
Help: The decision of the Senior executive body on the acceptance of a business relationsip was obtained on ___
-Type: String
+Type: AbsoluteDateTime
Form: VQF_902_4
# 3. Business relationship risk
@@ -508,7 +617,7 @@ Form: VQF_902_4
Identifier: RISK_CLASIFICATION_ACCEPTANCE_DATE
Section: 3
Help: The decision of the Senior executive body on the acceptance of a business relationsip was obtained on ___
-Type: String
+Type: AbsoluteDateTime
Form: VQF_902_4
# 4. Transaction monitoring
@@ -563,7 +672,7 @@ Form: VQF_902_5
Identifier: BIZREL_ORIGIN_DETAIL
Section: 3
Help: Define the category if 'other'.
-Type: String
+Type: Paragraph
Form: VQF_902_5
# 4. Nature and purpose
@@ -643,7 +752,7 @@ Form: VQF_902_5
Identifier: IDENTITY_CONTRACTING_PARTNER
Section: 1
-Type: String
+Type: Paragraph
Form: VQF_902_9
Required: true
@@ -659,7 +768,7 @@ Form: VQF_902_9_identity
Required: true
Identifier: IDENTITY_BIRTHDATE
-Type: AbsoluteTime
+Type: AbsoluteDate
Form: VQF_902_9_identity
Required: true
@@ -681,7 +790,7 @@ Required: true
Identifier: CONTROLLING_ENTITY_CONTRACTING_PARTNER
Section: 1
-Type: String
+Type: Paragraph
Form: VQF_902_11
Required: true
@@ -721,7 +830,7 @@ Required: true
Identifier: FOUNDATION_CONTRACTING_PARTNER
Section: 0
-Type: String
+Type: Paragraph
Form: VQF_902_12
Required: true
@@ -770,7 +879,7 @@ Form: VQF_902_12_founder
Required: true
Identifier: FOUNDATION_FOUNDER_BIRTHDATE
-Type: AbsoluteTime
+Type: AbsoluteDate
Form: VQF_902_12_founder
Required: true
@@ -780,7 +889,7 @@ Form: VQF_902_12_founder
Required: true
Identifier: FOUNDATION_FOUNDER_DEATHDATE
-Type: AbsoluteTime
+Type: AbsoluteDate
Form: VQF_902_12_founder
Required: true
@@ -813,7 +922,7 @@ Form: VQF_902_12_pre
Required: true
Identifier: FOUNDATION_PRE_BIRTHDATE
-Type: AbsoluteTime
+Type: AbsoluteDate
Form: VQF_902_12_pre
Required: true
@@ -823,7 +932,7 @@ Form: VQF_902_12_pre
Required: true
Identifier: FOUNDATION_PRE_DEATHDATE
-Type: AbsoluteTime
+Type: AbsoluteDate
Form: VQF_902_12_pre
Required: true
@@ -848,7 +957,7 @@ Type: CountryCode
Form: VQF_902_12_beneficiary
Identifier: FOUNDATION_BENEFICIARY_BIRTHDATE
-Type: AbsoluteTime
+Type: AbsoluteDate
Form: VQF_902_12_beneficiary
Identifier: FOUNDATION_BENEFICIARY_NATIONALITY
@@ -860,7 +969,7 @@ Type: Boolean
Form: VQF_902_12_beneficiary
Identifier: FOUNDATION_BENEFICIARY_ADDITION
-Type: String
+Type: Paragraph
Form: VQF_902_12_beneficiary
# 5. Further person with right to nominate representatives
@@ -887,7 +996,7 @@ Form: VQF_902_12_representative
Required: true
Identifier: FOUNDATION_REPRESENTATIVE_BIRTHDATE
-Type: AbsoluteTime
+Type: AbsoluteDate
Form: VQF_902_12_representative
Required: true
@@ -909,7 +1018,7 @@ Required: true
Identifier: TRUST_CONTRACTING_PARTNER
Section: 0
-Type: String
+Type: Paragraph
Form: VQF_902_13
Required: true
@@ -958,7 +1067,7 @@ Form: VQF_902_13_settlor
Required: true
Identifier: TRUST_SETTLOR_BIRTHDATE
-Type: AbsoluteTime
+Type: AbsoluteDate
Form: VQF_902_13_settlor
Required: true
@@ -968,7 +1077,7 @@ Form: VQF_902_13_settlor
Required: true
Identifier: TRUST_SETTLOR_DEATHDATE
-Type: AbsoluteTime
+Type: AbsoluteDate
Form: VQF_902_13_settlor
Required: true
@@ -998,7 +1107,7 @@ Type: CountryCode
Form: VQF_902_13_pre
Identifier: TRUST_PRE_BIRTHDATE
-Type: AbsoluteTime
+Type: AbsoluteDate
Form: VQF_902_13_pre
Identifier: TRUST_PRE_NATIONALITY
@@ -1006,7 +1115,7 @@ Type: CountryCode
Form: VQF_902_13_pre
Identifier: TRUST_PRE_DEATHDATE
-Type: AbsoluteTime
+Type: AbsoluteDate
Form: VQF_902_13_pre
# 4. Beneficiaries information
@@ -1030,7 +1139,7 @@ Type: CountryCode
Form: VQF_902_13_beneficiary
Identifier: TRUST_BENEFICIARY_BIRTHDATE
-Type: AbsoluteTime
+Type: AbsoluteDate
Form: VQF_902_13_beneficiary
Identifier: TRUST_BENEFICIARY_NATIONALITY
@@ -1042,7 +1151,7 @@ Type: Boolean
Form: VQF_902_13_beneficiary
Identifier: TRUST_BENEFICIARY_ADDITION
-Type: String
+Type: Paragraph
Form: VQF_902_13_beneficiary
@@ -1067,7 +1176,7 @@ Type: CountryCode
Form: VQF_902_13_protector
Identifier: TRUST_PROTECTOR_BIRTHDATE
-Type: AbsoluteTime
+Type: AbsoluteDate
Form: VQF_902_13_protector
Identifier: TRUST_PROTECTOR_NATIONALITY
@@ -1097,7 +1206,7 @@ Type: CountryCode
Form: VQF_902_13_further
Identifier: TRUST_FURTHER_BIRTHDATE
-Type: AbsoluteTime
+Type: AbsoluteDate
Form: VQF_902_13_further
Identifier: TRUST_FURTHER_NATIONALITY
@@ -1145,7 +1254,7 @@ Form: VQF_902_14
Identifier: INCRISK_SUMMARY
Section: 3
-Type: String
+Type: Paragraph
Form: VQF_902_14
Required: true
diff --git a/gnu-taler-aml-attributes/ts.header b/gnu-taler-aml-attributes/ts.header
@@ -21,11 +21,16 @@
but it does apply to this file.
*/
-type AbsoluteTime = string;
+type AbsoluteDateTime = string;
+type AbsoluteDate = string;
type CountryCode = string;
type Amount = string;
type ResidentialAddress = string;
type BusinessAddress = string;
-type Form<T> = T
+type Paragraph = string;
+type LangCode = string;
+type Email = string;
+type Phone = string;
+type Form<T> = T;
export namespace TalerAmlAttributes {
