Merge remote-tracking branch 'origin/feature/p012' into 2023

# Conflicts: # guides/transactions/T004/descriptions/attachment.adoc # structure/syntax/CallForTenders.xml
OpenPEPPOL · Sep 27, 2023 · bc2b59b · bc2b59b
2 parents 42c8a68 + 8421410
commit bc2b59b
Show file tree

Hide file tree

Showing 12 changed files with 97 additions and 32 deletions.
diff --git a/guides/changelog/2023-xx-xx.adoc b/guides/changelog/2023-xx-xx.adoc
@@ -0,0 +1,25 @@
+= Changelog for March release 2023
+
+== Profiles P001 - P011
+
+*Release date 2023-xx-xx*
+
+=== P012 - New Profile - Qualification Rejection 1.0
+
+=== P012 - New Profile - Invitation to Tender 1.0
+
+
+=== Business Rules
+
+
+=== Editorial changes
+
+* Update description on the use of Additional document reference and Encryption Certificate in T004 and syntax mapping. Providing further examples.
+
+* Update context of PEPPOL Business Rule PEPPOL-T015-R022 (Schematron Rule Context was correct but assignement in Syntax mapping was not correct)
+
+* Update context of PEPPOL Business Rule PEPPOL-T015-R022 (Schematron Rule Context was correct but assignement in Syntax mapping was not correct)
+
+* Updated XML example for NUTS codes and CPV codes (Main /Additional commodity classification) in T004 and provided reference to the corresponding codelists of the publication office
+
+
diff --git a/guides/changelog/main.adoc b/guides/changelog/main.adoc
@@ -2,6 +2,8 @@
 
 :leveloffset: +1
 
+include::2023-xx-xx.adoc[]
+
 include::2023-03-01.adoc[]
 
 include::2021-11-30.adoc[]

diff --git a/guides/profiles/p002/revision/index.adoc b/guides/profiles/p002/revision/index.adoc
@@ -15,4 +15,5 @@
 | 0.9	| 16-02-2017 | Chander Khoenkhoen | PIANOo	| Transaction business and information requirements for Trdm097.
 | 1.0	| 23-04-2021 | Ansgar Mondorf | UKL	| Editorial changes related to links and references.
 | 1.1	|01-03-2023| Ansgar Mondorf | Mondorf IT | Final editorial review for March Release 2023: Update Version information, links & examples, editorial improvements, change of transaction structure
+| 1.1	|18-07-2023| Ansgar Mondorf | Mondorf IT |Editorioal correction of XML example for NUTS codes and CPV codes (Main /Additional commodity classification) in T004 and provided reference to the corresponding codelists of the publication office.
 |===
diff --git a/guides/profiles/p012/revision/index.adoc b/guides/profiles/p012/revision/index.adoc
@@ -9,5 +9,7 @@
 | 0.2 | 27-06-2023 | Gabrielle Dall | adesso SE | Inclusion of Requirements and Process Models
 | 0.3 | 28-06-2023 | Ansgar Mondorf | Mondorf IT | Creation of BIS 012 profile and choreography description
 | 0.4 | 29-06-2023 | Ansgar Mondorf | Mondorf IT | Finalizing description of T023 - Qualification Rejection
+| 0.5 | 14-07-2023 | Gabrielle Dall | adesso SE | Correction of business rules & syntax mapping description
+| 0.6 | 19-07-2023 | Ansgar Mondorf | Mondorf IT | Finalizing description of syntax mapping for T023 - Qualification Rejection
 
 |===
diff --git a/guides/transactions/T004/codes/code-list-element.adoc b/guides/transactions/T004/codes/code-list-element.adoc
@@ -62,11 +62,11 @@
 [cols="1h,4"]
 |===
 | Qualifier
-|
+| Media Types (IANA)
 | Document location
 | `cbc:MimeCode`
 | Source codelist
-| link:ftp://ftp.cen.eu/public/CWAs/BII2/CWA16558/CWA16558-Annex-G-BII-CodeLists-V2_0_4.pdf[IANA]
+| link:https://www.iana.org/assignments/media-types/media-types.xhtml[IANA Media Types]
 |===
 
 
@@ -103,3 +103,26 @@ Only codes 1-3 are allowed in a Call for tender.
 | Source codelist
 | See codelist section on {link-main-site}
 |===
+
+== Common Procurement Vocabulary (CPV)
+[cols="1h,4"]
+|===
+| Qualifier
+| CPV (listID)
+| Document location
+| `cac:MainCommodityClassification/cbc:ItemClassificationCode`
+`cac:AdditionalCommodityClassification/cbc:ItemClassificationCode`
+| Source codelist
+| link:https://op.europa.eu/en/web/eu-vocabularies/dataset/-/resource?uri=http://publications.europa.eu/resource/dataset/cpv[CPV codes]
+|===
+
+== Nomenclature of Territorial Units for Statistics (NUTS)
+[cols="1h,4"]
+|===
+| Qualifier
+| NUTS (listID)
+| Document location
+| `cac:RealizedLocation/cbc:ID`
+| Source codelist
+| link:https://op.europa.eu/en/web/eu-vocabularies/dataset/-/resource?uri=http://publications.europa.eu/resource/dataset/nuts[NUTS codes]
+|===
diff --git a/guides/transactions/T004/descriptions/attachment.adoc b/guides/transactions/T004/descriptions/attachment.adoc
@@ -8,6 +8,7 @@ Find below an example on how to define a document reference that provides a docu
 
 * The code `Provided` or `Pro` is used to indicate that a document is provided as part of an Invitation to Tender or tender. It must include a physical attachment. The value `No Return (NR)` of the codelist `documentStatusCode` indicates that the document must not be returned during the bid or tender (e.g. the encryption certificate to encrypt a tender)
 
+
 [source,xml,indent=0]
 .Additional document reference
 

diff --git a/guides/transactions/T004/descriptions/procurement-project.adoc b/guides/transactions/T004/descriptions/procurement-project.adoc
@@ -9,8 +9,8 @@ A Call for tenders without lots has a single `cac:ProcurementProject` class. The
 In this case, the document instance must not contain any `cac:ProcurementProjectLot` class.
 
 
-The example below demonstrates the use of the `cac:ProcurementProject` class for a tendering process without lots. The structured information does not convey economic information. It is used to describe the project, to provide classification codes using the Common Procurement Vocabulary and the location where the project will be executed using the NUTS code.
-The procurement project in does not describe the tender deliverables.
+The example below demonstrates the use of the `cac:ProcurementProject` class for a tendering process without lots. The structured information does not convey economic information. It is used to describe the project, to provide classification codes for main commodity and additional commodity using the Common Procurement Vocabulary link:https://op.europa.eu/en/web/eu-vocabularies/dataset/-/resource?uri=http://publications.europa.eu/resource/dataset/cpv[(CPV codes)] and the location where the project will be executed using the codelist for Nomenclature of Territorial Units for Statistics link:https://op.europa.eu/en/web/eu-vocabularies/dataset/-/resource?uri=http://publications.europa.eu/resource/dataset/nuts[(NUTS codes)].
+The procurement project does not describe the tender deliverables.
 
 
 [source,xml,indent=0]

diff --git a/guides/transactions/T004/files/call-for-tenders-instance-doc.xml b/guides/transactions/T004/files/call-for-tenders-instance-doc.xml
@@ -109,28 +109,31 @@
 	<!-- end::TenderingProcess[] -->
 	<!-- tag::ProcurementProject[] -->
 	<cac:ProcurementProject>
-		<cbc:Name>Laptops</cbc:Name>
-		<cbc:Description>Laptops</cbc:Description>
+		<cbc:Name>Office Machinery</cbc:Name>
+		<cbc:Description>Purchase of notebooks and associated equipment</cbc:Description>
 		<cbc:ProcurementTypeCode listID="PROJECT_TYPE">2</cbc:ProcurementTypeCode>
 		<cac:MainCommodityClassification>
-			<cbc:ItemClassificationCode listID="CPV">98300000-6</cbc:ItemClassificationCode>
+			<cbc:ItemClassificationCode listID="CPV">30100000</cbc:ItemClassificationCode>
 		</cac:MainCommodityClassification>
+		<cac:AdditionalCommodityClassification>
+			<cbc:ItemClassificationCode listID="CPV">30120000</cbc:ItemClassificationCode>
+		</cac:AdditionalCommodityClassification>
 		<cac:RealizedLocation>
-			<cbc:ID schemeID="NUTS">DE01</cbc:ID>
+			<cbc:ID schemeID="NUTS">DE148</cbc:ID>
 		</cac:RealizedLocation>
 	</cac:ProcurementProject>
 	<!-- end::ProcurementProject[] -->
 	<!-- tag::ProcurementProjectLot[] -->
 	<cac:ProcurementProjectLot>
 		<cbc:ID>1</cbc:ID>
 		<cac:ProcurementProject>
-			<cbc:Name>First part of the works project</cbc:Name>
+			<cbc:Name>Provision of Notebooks</cbc:Name>
 		</cac:ProcurementProject>
 	</cac:ProcurementProjectLot>
 	<cac:ProcurementProjectLot>
 		<cbc:ID>2</cbc:ID>
 		<cac:ProcurementProject>
-			<cbc:Name>Second part of the works project</cbc:Name>
+			<cbc:Name>Provision of photocopying and offset printing equipment</cbc:Name>
 		</cac:ProcurementProject>
 	</cac:ProcurementProjectLot>
 	<!-- end::ProcurementProjectLot[] -->

diff --git a/guides/transactions/T004/files/call-for-tenders-instance.xml b/guides/transactions/T004/files/call-for-tenders-instance.xml
@@ -68,14 +68,17 @@
         </cac:TenderSubmissionDeadlinePeriod>
     </cac:TenderingProcess>
     <cac:ProcurementProject>
-        <cbc:Name>Laptops</cbc:Name>
-        <cbc:Description>Laptops</cbc:Description>
+        <cbc:Name>Office Machinery</cbc:Name>
+        <cbc:Description>Purchase of notebooks and associated equipment</cbc:Description>
         <cbc:ProcurementTypeCode listID="PROJECT_TYPE">2</cbc:ProcurementTypeCode>
         <cac:MainCommodityClassification>
-            <cbc:ItemClassificationCode listID="CPV">98300000-6</cbc:ItemClassificationCode>
+            <cbc:ItemClassificationCode listID="CPV">30100000</cbc:ItemClassificationCode>
         </cac:MainCommodityClassification>
+        <cac:AdditionalCommodityClassification>
+            <cbc:ItemClassificationCode listID="CPV">30120000</cbc:ItemClassificationCode>
+        </cac:AdditionalCommodityClassification>
         <cac:RealizedLocation>
-            <cbc:ID schemeID="NUTS">DE01</cbc:ID>
+            <cbc:ID schemeID="NUTS">DE148</cbc:ID>
         </cac:RealizedLocation>
     </cac:ProcurementProject>
 </CallForTenders>
diff --git a/guides/transactions/T023/files/QualificationRejection.png b/guides/transactions/T023/files/QualificationRejection.png
diff --git a/structure/syntax/CallForTenders.xml b/structure/syntax/CallForTenders.xml
@@ -737,6 +737,8 @@
             <Element>
                 <Term>cac:MainCommodityClassification</Term>
                 <Name>Main commodity classification</Name>
+                <Description>The main commodity is the one representing the highest value fraction of the procurement.
+                </Description>
 
                 <Element>
                     <Term>cbc:ItemClassificationCode</Term>
@@ -765,6 +767,7 @@
                     <Attribute>
                         <Term>listID</Term>
                         <Name>List identifier</Name>
+                        <!--Schould be CPV Supplement-->
                         <Value type="FIXED">CPV</Value>
                     </Attribute>
 					<DataType>Code</DataType>
@@ -774,6 +777,7 @@
             <Element cardinality="1..n">
                 <Term>cac:RealizedLocation</Term>
                 <Name>Realized location</Name>
+                <Description>Description of the procurement project location</Description>
 
                 <Element>
                     <Term>cbc:ID</Term>

diff --git a/structure/syntax/QualificationRejection.xml b/structure/syntax/QualificationRejection.xml
@@ -106,7 +106,7 @@
 			</Element>
 			<Element>
 				<Term>cac:PartyIdentification</Term>
-				<Name>Party identification</Name>
+				<Name>Contracting body identification</Name>
 				<Element>
 					<Term>cbc:ID</Term>
 					<Name>Contracting body identifier</Name>
@@ -126,6 +126,7 @@
 			</Element>
 			<Element cardinality="0..1">
 				<Term>cac:PartyName</Term>
+				<Name>Contracting body name</Name>
 				<Reference type="RULE">PEPPOL-T023-R032</Reference>
 				<Reference type="RULE">PEPPOL-T023-R033</Reference>
 				<Reference type="RULE">PEPPOL-T023-R034</Reference>
@@ -162,7 +163,7 @@
 			</Element>
 			<Element>
 				<Term>cac:PartyIdentification</Term>
-				<Name>Party identification</Name>
+				<Name>Economic operator identification</Name>
 				<Element>
 					<Term>cbc:ID</Term>
 					<Name>Economic operator identifier</Name>
@@ -182,7 +183,7 @@
 			</Element>
 			<Element cardinality="0..1">
 				<Term>cac:PartyName</Term>
-				<Name>Party name</Name>
+				<Name>Economic operator name</Name>
 				<Reference type="RULE">PEPPOL-T023-R032</Reference>
 				<Reference type="RULE">PEPPOL-T023-R033</Reference>
 				<Reference type="RULE">PEPPOL-T023-R034</Reference>
@@ -198,11 +199,11 @@
 		</Element>
 		<Element>
 			<Term>cac:ResolutionDocumentReference</Term>
-			<Name>Rejection Document Reference</Name>
+			<Name>Reference to rejected document</Name>
 			<Element>
 				<Term>cbc:ID</Term>
-				<Name>ResolutionDocumentID</Name>
-				<Description>A reference to the Document that has been sent by the Economic operator to apply to the given Qualification Request and to which this qualification rejection resolution refers to.</Description>
+				<Name>Identifer of rejected document</Name>
+				<Description>A reference to the document that has been submitted by the Economic operator to apply for the given Qualification Request and to which this qualification rejection resolution refers to.</Description>
 				<Reference type="RULE">PEPPOL-T023-R035</Reference>
 				<Reference type="RULE">PEPPOL-T023-R036</Reference>
 				<Reference type="RULE">PEPPOL-T023-R037</Reference>
@@ -216,40 +217,40 @@
 		</Element>
 		<Element cardinality="1..n">
 			<Term>cac:QualificationResolution</Term>
-			<Name>Qualification Rejection Resolution</Name>
-			<Description>The Qualification Rejection Resolution is expected to contain all information the economic operator needs to understand how and why the qualification application has been rejected. These information include a short description of the qualification resolution as well as the decision date. In case a qualification application had been heen handed in to apply for more than one Lot, a dedicated qualification resolution rejection should be given for each lot with reference to the appropriate lot identifier. </Description>
+			<Name>Qualification rejection resolution</Name>
+			<Description>The qualification rejection resolution shall contain all information necessary for the economic operator to understand how and why its qualification application has been rejected. The information includes a short description of the reason for rejection and the decision date. If a qualification application has been submitted for more than one lot, a separate qualification resolution rejection should be issued for each lot, indicating the relevant lot identifier. </Description>
 			<Reference type="RULE">PEPPOL-T023-R039</Reference>
 			<Reference type="RULE">PEPPOL-T023-R040</Reference>
 			<Element>
 				<Term>cbc:AdmissionCode</Term>
-				<Name>Admission Code</Name>
-				<Description>The Admission Code describes the qualification result. In case of a qualification rejection resolution the only valid entry here will be "false". </Description>
+				<Name>Admission code</Name>
+				<Description>The admission code describes the qualification result. Because this document only contains information about rejected qualifications, the fixed value "false" must be entered here. </Description>
 				<Reference type="RULE">PEPPOL-T023-R041</Reference>
 				<Value type="FIXED">false</Value>
 			</Element>
 			<Element>
 				<Term>cbc:Resolution</Term>
-				<Name>Reason For Rejection</Name>
-				<Description>A literal description of the reason why the qualification has been rejected. In case a qualification rejection resolution is related to more than one lot, a reason for rejection should be given per lot.</Description>
+				<Name>Reason ror rejection</Name>
+				<Description>A literal description of the reason why the qualification has been rejected. In case a qualification rejection resolution is related to more than one lot, a reason for rejection should be given for each lot.</Description>
 				<Reference type="RULE">PEPPOL-T023-R042</Reference>
 			</Element>
 			<Element>
 				<Term>cbc:ResolutionDate</Term>
-				<Name>Resolution Date</Name>
+				<Name>Resolution date</Name>
 				<Description>The date at which the qualification rejection resolution had been made.</Description>
 			</Element>
 			<Element cardinality="0..1">
 				<Term>cbc:ResolutionTime</Term>
-				<Name>Resolution Time</Name>
-				<Description>If necessary, the time at which the qualification rejection resolution has been made, could also be added. </Description>
+				<Name>Resolution time</Name>
+				<Description>If necessary, the time at which the qualification rejection resolution has been made. </Description>
 			</Element>
 			<Element cardinality="0..1">
 				<Term>cac:ProcurementProjectLot</Term>
-				<Name>Procurement Project Lot</Name>
+				<Name>Procurement project lot concerned</Name>
 				<Element cardinality="0..1">
 					<Term>cbc:ID</Term>
-					<Name>ID</Name>
-					<Description>An identifier for the lot. Naming the lot is expected if the qualification rejection resolution is explicitly given for a specific lot.</Description>
+					<Name>Lot identifier</Name>
+					<Description>An identifier for the lot that is concerned by the rejection.</Description>
 					<Reference type="RULE">PEPPOL-T023-R044</Reference>
 					<DataType>Identifier</DataType>
 				</Element>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,6 +8,7 @@ Find below an example on how to define a document reference that provides a docu

		* The code `Provided` or `Pro` is used to indicate that a document is provided as part of an Invitation to Tender or tender. It must include a physical attachment. The value `No Return (NR)` of the codelist `documentStatusCode` indicates that the document must not be returned during the bid or tender (e.g. the encryption certificate to encrypt a tender)


		[source,xml,indent=0]
		.Additional document reference

Expand Down