updating master to ePO v4.0.0

OP-TED · Dec 14, 2023 · ce01f73 · ce01f73
2 parents b68b900 + dbc03b8
commit ce01f73
Show file tree

Hide file tree

Showing 68 changed files with 53,737 additions and 73,247 deletions.
diff --git a/.github/workflows/transform_epo.yml b/.github/workflows/transform_epo.yml
@@ -4,6 +4,7 @@ on:
     branches:
       - "**"
       - "!demo"
+      - "!master"
     paths:
       - "implementation/ePO_core/xmi_conceptual_model/ePO_core.xml"
       - "implementation/eCatalogue/xmi_conceptual_model/eCatalogue.xml"
@@ -23,7 +24,7 @@ jobs:
 
       - name: get model2owl
         run: |
-          git clone --branch 2.1.6 https://github.com/OP-TED/model2owl.git
+          git clone --branch 2.2.0 https://github.com/OP-TED/model2owl.git
           pwd
 
       - name: get-saxon
@@ -134,7 +135,7 @@ jobs:
 
       - name: get model2owl
         run: |
-          git clone --branch 2.1.6 https://github.com/OP-TED/model2owl.git
+          git clone --branch 2.2.0 https://github.com/OP-TED/model2owl.git
           pwd
 
       - name: get-saxon

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>