Merge branch 'qa' of https://github.com/OpenPEPPOL/logistics-bis into qa

OpenPEPPOL · Oct 24, 2023 · 3edc947 · 3edc947
2 parents 01acc47 + f545cbc
commit 3edc947
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/rules/mapping/AdvancedDespatchAdvice.xml b/rules/mapping/AdvancedDespatchAdvice.xml
@@ -6201,7 +6201,7 @@
                <Data ss:Type="String">Attribute identifier</Data>
             </Cell>
             <Cell>
-               <Data ss:Type="String">To define the type of measurement. EnergyContent = T6428, ConversionFactor = T6429, FuelConsumption = T6374, DrivingDistance = T6380, DrivingTime = T6381, FuelMeasurementMethod = T6728, EngineType = T6379, RenewableFuel = T6382.</Data>
+               <Data ss:Type="String">To define the type of measurement. EnergyContent, ConversionFactor, FuelConsumption, DrivingDistance, DrivingTime, FuelMeasurementMethod, EngineType, RenewableFuel.</Data>
             </Cell>
             <Cell>
                <Data ss:Type="String">FuelConsumption</Data>
@@ -6279,7 +6279,7 @@
                <Data ss:Type="String">Attribute value</Data>
             </Cell>
             <Cell>
-               <Data ss:Type="String">Description of the attribute when there is no value to measure. Used for FuelMeasurementMethod and EngineType. Possible values are for FuelMeasurementMethod: "AutomaticMeasurement", "StandardEstimate", "ManualMeasurement" and for EngineType: "Euro2", "Euro3", "Euro4", "Euro5", "Euro6", "EuroStep2", "EuroStep3A", "EuroStep3B", "EuroStep4".</Data>
+               <Data ss:Type="String">Description of the attribute when there is no value to measure. Used for FuelMeasurementMethod and EngineType. Possible values are for FuelMeasurementMethod: "AutomaticMeasurement", "StandardEstimate", "ManualMeasurement" and for EngineType: "Euro2", "Euro3", "Euro4", "Euro5", "Euro6", "EuroStep2", "EuroStep3A", "EuroStep3B", "EuroStep4", "EV", "Hybrid", "FuelCell".</Data>
             </Cell>
             <Cell>
                <Data ss:Type="String">StandardEstimate</Data>

diff --git a/structure/syntax/ubl-advanced-despatch-advice.xml b/structure/syntax/ubl-advanced-despatch-advice.xml
@@ -1541,7 +1541,7 @@
                      <Element cardinality="1..1">
                         <Term>cbc:AttributeID</Term>
                         <Name>Attribute identifier</Name>
-                        <Description>To define the type of measurement. EnergyContent = T6428, ConversionFactor = T6429, FuelConsumption = T6374, DrivingDistance = T6380, DrivingTime = T6381, FuelMeasurementMethod = T6728, EngineType = T6379, RenewableFuel = T6382.</Description>
+                        <Description>To define the type of measurement. EnergyContent, ConversionFactor, FuelConsumption, DrivingDistance, DrivingTime, FuelMeasurementMethod, EngineType, RenewableFuel.</Description>
                         <Value type="EXAMPLE">FuelConsumption</Value>
                      </Element>
                      <Element cardinality="0..1">
@@ -1560,7 +1560,7 @@
                      <Element cardinality="0..1">
                         <Term>cbc:Description</Term>
                         <Name>Attribute value</Name>
-                        <Description>Description of the attribute when there is no value to measure. Used for FuelMeasurementMethod and EngineType. Possible values are for FuelMeasurementMethod: "AutomaticMeasurement", "StandardEstimate", "ManualMeasurement" and for EngineType: "Euro2", "Euro3", "Euro4", "Euro5", "Euro6", "EuroStep2", "EuroStep3A", "EuroStep3B", "EuroStep4".</Description>
+                        <Description>Description of the attribute when there is no value to measure. Used for FuelMeasurementMethod and EngineType. Possible values are for FuelMeasurementMethod: "AutomaticMeasurement", "StandardEstimate", "ManualMeasurement" and for EngineType: "Euro2", "Euro3", "Euro4", "Euro5", "Euro6", "EuroStep2", "EuroStep3A", "EuroStep3B", "EuroStep4", "EV", "Hybrid", "FuelCell".</Description>
                         <Value type="EXAMPLE">StandardEstimate</Value>
                      </Element>
                   </Element>