Skip to content

Commit

Permalink
Merge branch 'qa' of https://github.com/OpenPEPPOL/logistics-bis into qa
Browse files Browse the repository at this point in the history
  • Loading branch information
@JorgenErlandsson
JorgenErlandsson committed Nov 1, 2023
2 parents df422f8 + cfccc8a commit cf25976
Show file tree
Hide file tree
Showing 27 changed files with 299 additions and 270 deletions.
6 changes: 3 additions & 3 deletions rules/mapping/AdvancedDespatchAdvice.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8044,7 +8044,7 @@
<Data ss:Type="String">•  •  •  cac:Despatch</Data>
</Cell>
<Cell>
<Data ss:Type="String">Shipment despatch time</Data>
<Data ss:Type="String">Actual or expected despatch period</Data>
</Cell>
<Cell>
<Data ss:Type="String"/>
Expand Down Expand Up @@ -8096,7 +8096,7 @@
<Data ss:Type="String">•  •  •  •  cbc:ActualDespatchTime</Data>
</Cell>
<Cell>
<Data ss:Type="String">Shipment dispatch time</Data>
<Data ss:Type="String">Shipment despatch time</Data>
</Cell>
<Cell>
<Data ss:Type="String">The actual or expected date when the shipment was despatched from the despatching party. Format = "hh:mm:ss+timezone". Timezone is optional to use. If omitted, the local timezone where the despatch was made should be assumed.</Data>
Expand Down Expand Up @@ -13483,7 +13483,7 @@
<Data ss:Type="String">Item best before date</Data>
</Cell>
<Cell>
<Data ss:Type="String">The best before date of all items listed in this dispatch line.</Data>
<Data ss:Type="String">The best before date of all items listed in this despatch line.</Data>
</Cell>
<Cell>
<Data ss:Type="String">2021-12-01</Data>
Expand Down
16 changes: 8 additions & 8 deletions rules/mapping/TransportExecutionPlan.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17684,13 +17684,13 @@
</Row>
<Row>
<Cell>
<Data ss:Type="String">1..1</Data>
<Data ss:Type="String">0..n</Data>
</Cell>
<Cell>
<Data ss:Type="String">•  •  •  •  •  cac:HazardousItem</Data>
</Cell>
<Cell>
<Data ss:Type="String"/>
<Data ss:Type="String">Hazardous item information</Data>
</Cell>
<Cell>
<Data ss:Type="String">Contains information on the Hazardous item.</Data>
Expand Down Expand Up @@ -17762,16 +17762,16 @@
</Row>
<Row>
<Cell>
<Data ss:Type="String">1..1</Data>
<Data ss:Type="String">0..1</Data>
</Cell>
<Cell>
<Data ss:Type="String">•  •  •  •  •  •  cbc:UNDGCode</Data>
</Cell>
<Cell>
<Data ss:Type="String"/>
<Data ss:Type="String">Hazardous item UNDG code</Data>
</Cell>
<Cell>
<Data ss:Type="String"/>
<Data ss:Type="String">The identifier assigned to transportable hazardous goods by the United Nations, expressed as a code.</Data>
</Cell>
<Cell>
<Data ss:Type="String">ADR</Data>
Expand Down Expand Up @@ -17866,16 +17866,16 @@
</Row>
<Row>
<Cell>
<Data ss:Type="String">1..1</Data>
<Data ss:Type="String">0..1</Data>
</Cell>
<Cell>
<Data ss:Type="String">•  •  •  •  •  •  cbc:HazardClassID</Data>
</Cell>
<Cell>
<Data ss:Type="String"/>
<Data ss:Type="String">Haszardous hazard class Identifier</Data>
</Cell>
<Cell>
<Data ss:Type="String"/>
<Data ss:Type="String">dentifies a hazard class applicable to dangerous goods as defined by the relevant regulation authority, such as the IMDG Class Number of the SOLAS Convention ofIMO and the ADR/RID Class Number for the road/rail environment.</Data>
</Cell>
<Cell>
<Data ss:Type="String">Code</Data>
Expand Down
16 changes: 8 additions & 8 deletions rules/mapping/TransportExecutionPlanRequest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9312,13 +9312,13 @@
</Row>
<Row>
<Cell>
<Data ss:Type="String">1..1</Data>
<Data ss:Type="String">0..n</Data>
</Cell>
<Cell>
<Data ss:Type="String">•  •  •  •  •  cac:HazardousItem</Data>
</Cell>
<Cell>
<Data ss:Type="String"/>
<Data ss:Type="String">Hazardous item information</Data>
</Cell>
<Cell>
<Data ss:Type="String">Contains information on the Hazardous item.</Data>
Expand Down Expand Up @@ -9390,16 +9390,16 @@
</Row>
<Row>
<Cell>
<Data ss:Type="String">1..1</Data>
<Data ss:Type="String">0..1</Data>
</Cell>
<Cell>
<Data ss:Type="String">•  •  •  •  •  •  cbc:UNDGCode</Data>
</Cell>
<Cell>
<Data ss:Type="String"/>
<Data ss:Type="String">Hazardous item UNDG code</Data>
</Cell>
<Cell>
<Data ss:Type="String"/>
<Data ss:Type="String">The identifier assigned to transportable hazardous goods by the United Nations, expressed as a code.</Data>
</Cell>
<Cell>
<Data ss:Type="String">ADR</Data>
Expand Down Expand Up @@ -9494,16 +9494,16 @@
</Row>
<Row>
<Cell>
<Data ss:Type="String">1..1</Data>
<Data ss:Type="String">0..1</Data>
</Cell>
<Cell>
<Data ss:Type="String">•  •  •  •  •  •  cbc:HazardClassID</Data>
</Cell>
<Cell>
<Data ss:Type="String"/>
<Data ss:Type="String">Haszardous hazard class Identifier</Data>
</Cell>
<Cell>
<Data ss:Type="String"/>
<Data ss:Type="String">dentifies a hazard class applicable to dangerous goods as defined by the relevant regulation authority, such as the IMDG Class Number of the SOLAS Convention ofIMO and the ADR/RID Class Number for the road/rail environment.</Data>
</Cell>
<Cell>
<Data ss:Type="String">Code</Data>
Expand Down
16 changes: 8 additions & 8 deletions rules/mapping/Waybill.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4996,13 +4996,13 @@
</Row>
<Row>
<Cell>
<Data ss:Type="String">1..1</Data>
<Data ss:Type="String">0..n</Data>
</Cell>
<Cell>
<Data ss:Type="String">•  •  •  •  •  •  cac:HazardousItem</Data>
</Cell>
<Cell>
<Data ss:Type="String"/>
<Data ss:Type="String">Hazardous item information</Data>
</Cell>
<Cell>
<Data ss:Type="String">Contains information on the Hazardous item.</Data>
Expand Down Expand Up @@ -5074,16 +5074,16 @@
</Row>
<Row>
<Cell>
<Data ss:Type="String">1..1</Data>
<Data ss:Type="String">0..1</Data>
</Cell>
<Cell>
<Data ss:Type="String">•  •  •  •  •  •  •  cbc:UNDGCode</Data>
</Cell>
<Cell>
<Data ss:Type="String"/>
<Data ss:Type="String">Hazardous item UNDG code</Data>
</Cell>
<Cell>
<Data ss:Type="String"/>
<Data ss:Type="String">The identifier assigned to transportable hazardous goods by the United Nations, expressed as a code.</Data>
</Cell>
<Cell>
<Data ss:Type="String">ADR</Data>
Expand Down Expand Up @@ -5178,16 +5178,16 @@
</Row>
<Row>
<Cell>
<Data ss:Type="String">1..1</Data>
<Data ss:Type="String">0..1</Data>
</Cell>
<Cell>
<Data ss:Type="String">•  •  •  •  •  •  •  cbc:HazardClassID</Data>
</Cell>
<Cell>
<Data ss:Type="String"/>
<Data ss:Type="String">Haszardous hazard class Identifier</Data>
</Cell>
<Cell>
<Data ss:Type="String"/>
<Data ss:Type="String">dentifies a hazard class applicable to dangerous goods as defined by the relevant regulation authority, such as the IMDG Class Number of the SOLAS Convention ofIMO and the ADR/RID Class Number for the road/rail environment.</Data>
</Cell>
<Cell>
<Data ss:Type="String">Code</Data>
Expand Down
16 changes: 13 additions & 3 deletions structure/source/ubl-transport-execution-plan-request.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1710,7 +1710,9 @@
</cbc:ItemClassificationCode>
</cac:CommodityClassification>
<cac:HazardousItem>
<?Description Contains information on the Hazardous item.?>
<?Name Hazardous item information?>
<?Description Contains information on the Hazardous item. ?>
<?Cardinality 0..n?>
<cbc:ID>123
<?Name Identifier?>
<?Description An identifier for this hazardous item. ?>
Expand All @@ -1721,7 +1723,11 @@
<?Description Text providing further information about the hazardous substance. ?>
<?Cardinality 0..1?>
</cbc:AdditionalIformation>
<cbc:UNDGCode> ADR <?CodeList UNCL8273?>
<cbc:UNDGCode>ADR
<?CodeList UNCL8273?>
<?Name Hazardous item UNDG code?>
<?Description The identifier assigned to transportable hazardous goods by the United Nations, expressed as a code. ?>
<?Cardinality 0..1?>
</cbc:UNDGCode>
<cbc:TechnicalName>Corrosive liquid, n.o.s., 8, UN 1760, II (contains Octanoyl chloride)
<?Name Technical Name?>
Expand All @@ -1738,7 +1744,11 @@
<?Description A code signifying a kind of hazard for a material. ?>
<?Cardinality 0..1?>
</cbc:HazardousCategoryCode>
<cbc:HazardClassID>Code</cbc:HazardClassID>
<cbc:HazardClassID>Code
<?Name Haszardous hazard class Identifier?>
<?Description dentifies a hazard class applicable to dangerous goods as defined by the relevant regulation authority, such as the IMDG Class Number of the SOLAS Convention ofIMO and the ADR/RID Class Number for the road/rail environment. ?>
<?Cardinality 0..1?>
</cbc:HazardClassID>
<cbc:NetWeightMeasure unitCode="KGM">123
<?Name Net Weight Measure ?>
<?Description Net weight of the Hazardous item. ?>
Expand Down
Loading

0 comments on commit cf25976

Please sign in to comment.