Merge branch 'master' into develop

# Conflicts: # analysis_and_design/conceptual_model/ePO_CM.eap # implementation/eCatalogue/conventions_report/eCatalogue_convention_report.html # implementation/eContract/conventions_report/eContract_convention_report.html # implementation/eFulfilment/conventions_report/eFulfilment_convention_report.html # implementation/eNotice/conventions_report/eNotice_convention_report.html # implementation/eOrdering/conventions_report/eOrdering_convention_report.html # implementation/ePO_core/conventions_report/ePO_core_convention_report.html
OP-TED · Feb 16, 2024 · 4df0a1c · 4df0a1c
2 parents e496b91 + 65b01ac
commit 4df0a1c
Show file tree

Hide file tree

Showing 62 changed files with 53,037 additions and 74,564 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,8 @@ Ontology namespace: `http://data.europa.eu/a4g/ontology#`
 Preferred prefix: `epo`
 
 
-Note: If you discover any issues or have questions please put them on [GitHub issues](https://github.com/OP-TED/ePO/issues) and we will address them. Also, we have reorganised the GitHub repository and if you experience problems or need assistance feel free to [contact us by email](mailto:OP-EPROCUREMENT-ONTOLOGY@publications.europa.eu).
+Note: If you have any questions, or you would like to make a suggestion or share an idea, please use [Discussions](https://github.com/OP-TED/ePO/discussions). If you discover any bugs please put them on [GitHub issues](https://github.com/OP-TED/ePO/issues) and we will address them.
+Also, we have reorganised the GitHub repository and if you experience problems or need assistance feel free to [contact us by email](mailto:OP-EPROCUREMENT-ONTOLOGY@publications.europa.eu).
 
 ### References
 
@@ -85,6 +86,7 @@ The issues are classified based on for classification dimensions:
     * eFulfillment
     * eAccess
     * eContract
+    * eSubmission
   * generic - no module in particular because the issue is of technical or documentation nature
 * type label
   * bug - something implemented incorrectly in a release 

diff --git a/analysis_and_design/conceptual_model/ePO_CM.eap b/analysis_and_design/conceptual_model/ePO_CM.eap
diff --git a/glossary/eCatalogue_glossary.html b/glossary/eCatalogue_glossary.html
@@ -257,7 +257,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Attributes (datatype
                </thead>
                <tbody>
                   <tr>
-                     <td>epo-cat:Item<br>epo-cat:Line<br></td>
+                     <td>epo-cat:Line<br>epo-cat:Item<br></td>
                      <td>dct:description</td>
                      <td>An account of the resource.
 
@@ -275,15 +275,15 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Attributes (datatype
                      <td>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [0..1]<br></td>
                   </tr>
                   <tr>
-                     <td>epo-cat:ItemModel<br>epo-cat:Brand<br>epo-cat:Item<br></td>
+                     <td>epo-cat:Brand<br>epo-cat:ItemModel<br>epo-cat:Item<br></td>
                      <td>dct:title</td>
                      <td>A name given to the resource.
 
-                        WG approval 30/05/2023 A name given to the resource.
-
                         WG approval 30/05/2023
                          A name given to the resource.
 
+                        WG approval 30/05/2023 A name given to the resource.
+
                         WG approval 30/05/2023</td>
                      <td>rdf:PlainLiteral [1..1]<br>rdf:PlainLiteral [1..1]<br>rdf:PlainLiteral [1..1]<br></td>
                   </tr>

diff --git a/glossary/eFulfilment_glossary.html b/glossary/eFulfilment_glossary.html
@@ -463,7 +463,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                   <tr>
                      <td>epo-ful:hasHandlingInstructionCode</td>
                      <td> </td>
-                     <td>epo-ful:TransportHandlingUnit -&gt; at-voc-new:handling-instruction [0..1]<br>epo-ful:Consignment -&gt; at-voc-new:handling-instruction [0..1]<br></td>
+                     <td>epo-ful:Consignment -&gt; at-voc-new:handling-instruction [0..1]<br>epo-ful:TransportHandlingUnit -&gt; at-voc-new:handling-instruction [0..1]<br></td>
                   </tr>
                   <tr>
                      <td>epo-ful:hasHeight</td>

diff --git a/glossary/eNotice_glossary.html b/glossary/eNotice_glossary.html
diff --git a/glossary/eOrdering_glossary.html b/glossary/eOrdering_glossary.html
@@ -198,33 +198,33 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Attributes (datatype
                </thead>
                <tbody>
                   <tr>
-                     <td>epo-ord:TaxInformation<br>epo-ord:DeliveryAgreement<br></td>
+                     <td>epo-ord:DeliveryAgreement<br>epo-ord:TaxInformation<br></td>
                      <td>dct:description</td>
                      <td>An account of the resource.
 
                         Additional Information:
                         Description may include but is not limited to: an abstract, a table of contents, a
                         graphical representation, or a free-text account of the resource.
 
-                        WG Approval 30/05/2023
-                         An account of the resource.
+                        WG Approval 30/05/2023 An account of the resource.
 
                         Additional Information:
                         Description may include but is not limited to: an abstract, a table of contents, a
                         graphical representation, or a free-text account of the resource.
 
-                        WG Approval 30/05/2023</td>
-                     <td>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [0..*]<br></td>
+                        WG Approval 30/05/2023
+                        </td>
+                     <td>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..1]<br></td>
                   </tr>
                   <tr>
-                     <td>epo-ord:TaxInformation<br>epo-ord:AllowanceChargeInformation<br></td>
+                     <td>epo-ord:AllowanceChargeInformation<br>epo-ord:TaxInformation<br></td>
                      <td>epo-cat:hasPercentage</td>
                      <td>The factor relative to the price charged in addition.
 
-                        WG approval 26/07/2022
-                         The factor relative to the price charged in addition.
+                        WG approval 26/07/2022 The factor relative to the price charged in addition.
 
-                        WG approval 26/07/2022</td>
+                        WG approval 26/07/2022
+                        </td>
                      <td>xsd:decimal [0..1]<br>xsd:decimal [0..1]<br></td>
                   </tr>
                   <tr>
@@ -293,11 +293,11 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                   <tr>
                      <td>epo:isCalculatedOn</td>
                      <td>The monetary amount to which the multiplier factor is applied in calculating the amount
-                        of this allowance or charge. The monetary amount to which the multiplier factor is applied in calculating the amount
                         of this allowance or charge.
 
-                        </td>
-                     <td>epo-ord:TaxInformation -&gt; epo:MonetaryValue (external) [0..1]<br>epo-ord:AllowanceChargeInformation -&gt; epo:MonetaryValue (external) [0..1]<br></td>
+                         The monetary amount to which the multiplier factor is applied in calculating the amount
+                        of this allowance or charge.</td>
+                     <td>epo-ord:AllowanceChargeInformation -&gt; epo:MonetaryValue (external) [0..1]<br>epo-ord:TaxInformation -&gt; epo:MonetaryValue (external) [0..1]<br></td>
                   </tr>
                   <tr>
                      <td>epo:refersToProject</td>
@@ -317,18 +317,18 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                   <tr>
                      <td>epo:specifiesSeller</td>
                      <td> </td>
-                     <td>epo-cat:Catalogue (external) -&gt; epo-ord:Seller [0..*]<br>epo-ord:Order -&gt; epo-ord:Seller [1]<br></td>
+                     <td>epo-ord:Order -&gt; epo-ord:Seller [1]<br>epo-cat:Catalogue (external) -&gt; epo-ord:Seller [0..*]<br></td>
                   </tr>
                   <tr>
                      <td>epo-cat:hasAmount</td>
                      <td>The predetermined monetary value charged in addition to the price.
 
-                        WG approval 26/07/2022
+                        WG approval 26/07/2022 The predetermined monetary value charged in addition to the price.
 
-                         The predetermined monetary value charged in addition to the price.
+                        WG approval 26/07/2022
 
-                        WG approval 26/07/2022</td>
-                     <td>epo-ord:TaxInformation -&gt; epo:MonetaryValue (external) [0..1]<br>epo-ord:AllowanceChargeInformation -&gt; epo:MonetaryValue (external) [1]<br></td>
+                        </td>
+                     <td>epo-ord:AllowanceChargeInformation -&gt; epo:MonetaryValue (external) [1]<br>epo-ord:TaxInformation -&gt; epo:MonetaryValue (external) [0..1]<br></td>
                   </tr>
                   <tr>
                      <td>epo-cat:hasPrice</td>
@@ -498,7 +498,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                          Information that is particular to one or multiple Order Lines. Information that is particular to one or multiple Order Lines. Information that is particular to one or multiple Order Lines.
                          Information that is particular to one or multiple Order Lines.
                         </td>
-                     <td>epo-ord:OriginatorInformation -&gt; epo-ord:OrderLine [0..*]<br>epo-ord:ContractInformation -&gt; epo-ord:OrderLine [0..*]<br>epo-ord:DeliveryInformation -&gt; epo-ord:OrderLine [0..*]<br>epo-ord:AllowanceInformation -&gt; epo-ord:OrderLine [0..*]<br>epo-cat:ChargeInformation (external) -&gt; epo-ord:OrderLine [0..*]<br></td>
+                     <td>epo-ord:AllowanceInformation -&gt; epo-ord:OrderLine [0..*]<br>epo-ord:ContractInformation -&gt; epo-ord:OrderLine [0..*]<br>epo-ord:DeliveryInformation -&gt; epo-ord:OrderLine [0..*]<br>epo-cat:ChargeInformation (external) -&gt; epo-ord:OrderLine [0..*]<br>epo-ord:OriginatorInformation -&gt; epo-ord:OrderLine [0..*]<br></td>
                   </tr>
                   <tr>
                      <td>epo-ord:isSpecificToOrderResponseLine</td>