Merge remote-tracking branch 'origin/feature/4.2.0-rc.1' into develop

# Conflicts: # implementation/eAccess/shacl_shapes/eAccess_shapes.rdf # implementation/eAccess/shacl_shapes/eAccess_shapes.ttl # implementation/eCatalogue/shacl_shapes/eCatalogue_shapes.rdf # implementation/eCatalogue/shacl_shapes/eCatalogue_shapes.ttl # implementation/eContract/shacl_shapes/eContract_shapes.rdf # implementation/eContract/shacl_shapes/eContract_shapes.ttl # implementation/eFulfilment/shacl_shapes/eFulfilment_shapes.rdf # implementation/eFulfilment/shacl_shapes/eFulfilment_shapes.ttl # implementation/eNotice/shacl_shapes/eNotice_shapes.rdf # implementation/eNotice/shacl_shapes/eNotice_shapes.ttl # implementation/eOrdering/shacl_shapes/eOrdering_shapes.rdf # implementation/eOrdering/shacl_shapes/eOrdering_shapes.ttl # implementation/ePO_core/shacl_shapes/ePO_core_shapes.rdf # implementation/ePO_core/shacl_shapes/ePO_core_shapes.ttl # implementation/eSubmission/shacl_shapes/eSubmission_shapes.rdf # implementation/eSubmission/shacl_shapes/eSubmission_shapes.ttl
OP-TED · Jul 30, 2024 · d9df53a · d9df53a
2 parents f788e33 + f716720
commit d9df53a
Show file tree

Hide file tree

Showing 114 changed files with 49,291 additions and 20,045 deletions.
diff --git a/.github/workflows/transform_epo.yml b/.github/workflows/transform_epo.yml
@@ -14,6 +14,7 @@ on:
       - "implementation/eContract/xmi_conceptual_model/eContract.xml"
       - "implementation/eContract/xmi_conceptual_model/eAccess.xml"
       - "implementation/eContract/xmi_conceptual_model/eSubmission.xml"
+      - "implementation/eContract/xmi_conceptual_model/eInvoicing.xml"
 jobs:
   report_and_glossary:
     runs-on: ubuntu-latest
@@ -35,7 +36,7 @@ jobs:
 
       - name: generate convention report and glossary
         run: |
-          AVAILABLE_IMPLEMENTATIONS=(eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
+          AVAILABLE_IMPLEMENTATIONS=(eInvoicing eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
           for implementation in "${AVAILABLE_IMPLEMENTATIONS[@]}"
           do
             echo "-------------------${implementation}---------------------------------"
@@ -68,7 +69,7 @@ jobs:
 
       - name: merge implementations xmi files into one
         run: |
-          AVAILABLE_IMPLEMENTATIONS=(eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
+          AVAILABLE_IMPLEMENTATIONS=(eInvoicing eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
           cd model2owl
           mkdir -p merge-xmis
           for implementation in "${AVAILABLE_IMPLEMENTATIONS[@]}"
@@ -148,7 +149,7 @@ jobs:
 
       - name: transform step
         run: |
-          AVAILABLE_IMPLEMENTATIONS=(eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
+          AVAILABLE_IMPLEMENTATIONS=(eInvoicing eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
           for implementation in "${AVAILABLE_IMPLEMENTATIONS[@]}"
           do
             echo "-------------------${implementation} transform---------------------------------"

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
@@ -287,17 +287,25 @@ <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:Brand<br>epo-cat:ItemModel<br>epo-cat:Item<br></td>
+                     <td>epo-cat:Brand<br>epo-cat:ItemProperty<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.
+                          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>
+                     <td>rdf:PlainLiteral [1..1]<br>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [1..1]<br>rdf:PlainLiteral [1..1]<br></td>
+                  </tr>
+                  <tr>
+                     <td>epo-cat:Line</td>
+                     <td>epo:hasAdditionalInformation</td>
+                     <td>Supplementary data about the instance of the concept. 
+
+                        WG Approval 15/10/2019</td>
+                     <td>rdf:PlainLiteral [0..1]</td>
                   </tr>
                   <tr>
                      <td>epo-cat:ItemProperty</td>
@@ -311,7 +319,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Attributes (datatype
 
 
                         WG approval 28/07/2022</td>
-                     <td>rdf:PlainLiteral [1..1]</td>
+                     <td>rdf:PlainLiteral [0..1]</td>
                   </tr>
                   <tr>
                      <td>epo-cat:Batch</td>
@@ -333,7 +341,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Attributes (datatype
 
                         WG approval 28/07/2022
                         </td>
-                     <td>rdf:PlainLiteral [1..1]</td>
+                     <td>rdf:PlainLiteral [0..1]</td>
                   </tr>
                   <tr>
                      <td>epo-cat:Item</td>
@@ -819,8 +827,8 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                   </tr>
                   <tr>
                      <td>epo-cat:hasPrice</td>
-                     <td> </td>
-                     <td>epo-ord:OrderLine (external) -&gt; epo-cat:Price [0..1]<br>epo-cat:CatalogueLine -&gt; epo-cat:Price [1..*]<br></td>
+                     <td>  </td>
+                     <td>epo-inv:InvoiceLine (external) -&gt; epo-cat:Price [1..*]<br>epo-ord:OrderLine (external) -&gt; epo-cat:Price [0..*]<br>epo-cat:CatalogueLine -&gt; epo-cat:Price [1..*]<br></td>
                   </tr>
                   <tr>
                      <td>epo-cat:hasPriceType</td>
@@ -926,8 +934,8 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                   </tr>
                   <tr>
                      <td>epo-cat:specifiesChargeInformation</td>
-                     <td></td>
-                     <td>epo-ord:Order (external) -&gt; epo-cat:ChargeInformation [0..*]</td>
+                     <td> </td>
+                     <td>epo-inv:Invoice (external) -&gt; epo-cat:ChargeInformation [0..*]<br>epo-ord:Order (external) -&gt; epo-cat:ChargeInformation [0..*]<br></td>
                   </tr>
                   <tr>
                      <td>epo-cat:specifiesItem</td>
@@ -939,11 +947,33 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                      <td></td>
                      <td>epo-ful:Consignment (external) -&gt; epo-cat:ChargeInformation [0..*]</td>
                   </tr>
+                  <tr>
+                     <td>epo-ful:hasFreightCharge</td>
+                     <td>The total cost for moving the goods.
+
+                        WG approval 18/06/2024</td>
+                     <td>epo-ful:Consignment (external) -&gt; epo-cat:ChargeInformation [0..*]</td>
+                  </tr>
+                  <tr>
+                     <td>epo-inv:hasItemClassificationIdentifier</td>
+                     <td></td>
+                     <td>epo-cat:Item -&gt; adms:Identifier (external) [0..*]</td>
+                  </tr>
+                  <tr>
+                     <td>epo-inv:isSpecificToInvoiceLine</td>
+                     <td></td>
+                     <td>epo-cat:ChargeInformation -&gt; epo-inv:InvoiceLine (external) [0..*]</td>
+                  </tr>
                   <tr>
                      <td>epo-ord:hasAcceptanceStatus</td>
                      <td></td>
                      <td>epo-cat:CatalogueResponseInformation -&gt; at-voc-new:ResponseStatus (external) [1]</td>
                   </tr>
+                  <tr>
+                     <td>epo-ord:hasGrossMonetaryValue</td>
+                     <td></td>
+                     <td>epo-cat:Price -&gt; epo:MonetaryValue (external) [0..1]</td>
+                  </tr>
                   <tr>
                      <td>epo-ord:hasPriceDiscountInformation</td>
                      <td></td>