Skip to content

Commit c79953e

Browse files
JorgenErlandssonJorgenErlandsson
committed
Changes after review period
1 parent 43188b9 commit c79953e

File tree

5 files changed

+273
-61
lines changed

5 files changed

+273
-61
lines changed

‎guides/release-notes/v1.1.1.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ This is a separate release of the Peppol Logistics standard to introduce a new p
3535
* Rule PEPPOL-T127-R002 changed to allow ProfileID = 'urn:fdc:peppol.eu:logistics:bis:advanced_transport_execution_plan:1'). Korresponding unit-test also updated.
3636

3737
== New Rules
38-
* Rule PEPPOL-T124-R040 added to ensure that the groups Consignment/PlannedPickupTransportEvent, Consignment/PlannedDeliveryTransportEvent and
38+
* Rule PEPPOL-T124-R040 to R042 added to ensure that the groups Consignment/PlannedPickupTransportEvent, Consignment/PlannedDeliveryTransportEvent and
3939
Consignment/MainCarriageShipmentStage stays mandatory for MainTransportationService/TransportServiceCode "4", "22", "23" and "24".
4040

4141
== Request For Change (RFC) that are included/solved in Release 1.1.1

‎rules/sch/parts/PEPPOL-M-T124.sch‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,14 @@
6060
<rule context="ubl:TransportExecutionPlan">
6161
<assert id="PEPPOL-T124-R035" test="not(cac:BillToParty) or cac:BillToParty/cac:PartyName or cac:BillToParty/cac:PartyIdentification" flag="fatal"> [PEPPOL-T124-R035] Party must include either a party name or a party identification.</assert>
6262
<assert id="PEPPOL-T124-R040" test="not(cac:MainTransportationService/cbc:TransportServiceCode = ('4', '22', '23', '24'))
63-
or (cac:Consignment/cac:PlannedPickupTransportEvent and cac:Consignment/PlannedDeliveryTransportEvent and cac:Consignment/cac:MainCarriageShipmentStage)"
64-
flag="fatal">[PEPPOL-T124-R040] cac:Consignment/cac:PlannedPickupTransportEvent, cac:Consignment/cac:PlannedDeliveryTransportEvent
65-
and cac:Consignment/cac:MainCarriageShipmentStage must be present when cac:MainTransportationService = "4", "22", "23" or "24".</assert>
63+
or (cac:Consignment/cac:PlannedPickupTransportEvent)"
64+
flag="fatal">[PEPPOL-T124-R040] cac:Consignment/cac:PlannedPickupTransportEvent must be present when cac:MainTransportationService = "4", "22", "23" or "24".</assert>
65+
<assert id="PEPPOL-T124-R041" test="not(cac:MainTransportationService/cbc:TransportServiceCode = ('4', '22', '23', '24'))
66+
or (cac:Consignment/PlannedDeliveryTransportEvent)"
67+
flag="fatal">[PEPPOL-T124-R041] cac:Consignment/cac:PlannedDeliveryTransportEvent must be present when cac:MainTransportationService = "4", "22", "23" or "24".</assert>
68+
<assert id="PEPPOL-T124-R042" test="not(cac:MainTransportationService/cbc:TransportServiceCode = ('4', '22', '23', '24'))
69+
or (cac:Consignment/cac:MainCarriageShipmentStage)"
70+
flag="fatal">[PEPPOL-T124-R042] cac:Consignment/cac:MainCarriageShipmentStage must be present when cac:MainTransportationService = "4", "22", "23" or "24".</assert>
6671
</rule>
6772
<rule context="ubl:TransportExecutionPlan/cac:Consignment/cac:ConsigneeParty">
6873
<assert id="PEPPOL-T124-R036" test="cac:PartyName or cac:PartyIdentification" flag="fatal"> [PEPPOL-T124-R036] Party must include either a party name or a party identification.</assert>

‎rules/unit-transport-execution-plan/PEPPOL-T124-R040.xml‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -109,48 +109,6 @@
109109
</test>
110110

111111
<test id="6">
112-
<assert>
113-
<error>PEPPOL-T124-R040</error>
114-
</assert>
115-
<ubl:TransportExecutionPlan xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:TransportExecutionPlan-2"
116-
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
117-
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
118-
<cac:MainTransportationService>
119-
<cbc:TransportServiceCode>4</cbc:TransportServiceCode>
120-
</cac:MainTransportationService>
121-
<cac:Consignment>
122-
<cac:PlannedPickupTransportEvent>
123-
<cbc:IdentificationID>21412312412</cbc:IdentificationID>
124-
</cac:PlannedPickupTransportEvent>
125-
<cac:PlannedDeliveryTransportEvent>
126-
<cbc:IdentificationID>625435485674654132</cbc:IdentificationID>
127-
</cac:PlannedDeliveryTransportEvent>
128-
</cac:Consignment>
129-
</ubl:TransportExecutionPlan>
130-
</test>
131-
132-
<test id="7">
133-
<assert>
134-
<error>PEPPOL-T124-R040</error>
135-
</assert>
136-
<ubl:TransportExecutionPlan xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:TransportExecutionPlan-2"
137-
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
138-
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
139-
<cac:MainTransportationService>
140-
<cbc:TransportServiceCode>4</cbc:TransportServiceCode>
141-
</cac:MainTransportationService>
142-
<cac:Consignment>
143-
<cac:PlannedPickupTransportEvent>
144-
<cbc:IdentificationID>21412312412</cbc:IdentificationID>
145-
</cac:PlannedPickupTransportEvent>
146-
<cac:MainCarriageShipmentStage>
147-
<cbc:TransportModeCode>3</cbc:TransportModeCode>
148-
</cac:MainCarriageShipmentStage>
149-
</cac:Consignment>
150-
</ubl:TransportExecutionPlan>
151-
</test>
152-
153-
<test id="8">
154112
<assert>
155113
<error>PEPPOL-T124-R040</error>
156114
</assert>
@@ -171,19 +129,4 @@
171129
</ubl:TransportExecutionPlan>
172130
</test>
173131

174-
<test id="9">
175-
<assert>
176-
<error>PEPPOL-T124-R040</error>
177-
</assert>
178-
<ubl:TransportExecutionPlan xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:TransportExecutionPlan-2"
179-
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
180-
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
181-
<cac:MainTransportationService>
182-
<cbc:TransportServiceCode>4</cbc:TransportServiceCode>
183-
</cac:MainTransportationService>
184-
<cac:Consignment>
185-
</cac:Consignment>
186-
</ubl:TransportExecutionPlan>
187-
</test>
188-
189132
</testSet>

‎rules/unit-transport-execution-plan/PEPPOL-T124-R041.xml‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-T124-base-1.0">
3+
<assert>
4+
<description>Verify that the Planned Pickup Transport Event, Planned Delivery Transport Event and Main Carriage Shipment Stage are being
5+
specified for the Consignment when the Transport Service Code is "4", "22", "23" or "24". </description>
6+
<scope>PEPPOL-T124-R041</scope>
7+
</assert>
8+
<test id="1">
9+
<assert>
10+
<success>PEPPOL-T124-R041</success>
11+
</assert>
12+
<ubl:TransportExecutionPlan xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:TransportExecutionPlan-2"
13+
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
14+
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
15+
<cac:MainTransportationService>
16+
<cbc:TransportServiceCode>4</cbc:TransportServiceCode>
17+
</cac:MainTransportationService>
18+
<cac:Consignment>
19+
<cac:PlannedPickupTransportEvent>
20+
<cbc:IdentificationID>21412312412</cbc:IdentificationID>
21+
</cac:PlannedPickupTransportEvent>
22+
<cac:PlannedDeliveryTransportEvent>
23+
<cbc:IdentificationID>625435485674654132</cbc:IdentificationID>
24+
</cac:PlannedDeliveryTransportEvent>
25+
<cac:MainCarriageShipmentStage>
26+
<cbc:TransportModeCode>3</cbc:TransportModeCode>
27+
</cac:MainCarriageShipmentStage>
28+
</cac:Consignment>
29+
</ubl:TransportExecutionPlan>
30+
</test>
31+
32+
<test id="2">
33+
<assert>
34+
<success>PEPPOL-T124-R041</success>
35+
</assert>
36+
<ubl:TransportExecutionPlan xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:TransportExecutionPlan-2"
37+
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
38+
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
39+
<cac:MainTransportationService>
40+
<cbc:TransportServiceCode>1</cbc:TransportServiceCode>
41+
</cac:MainTransportationService>
42+
<cac:Consignment>
43+
<cac:PlannedPickupTransportEvent>
44+
<cbc:IdentificationID>21412312412</cbc:IdentificationID>
45+
</cac:PlannedPickupTransportEvent>
46+
<cac:PlannedDeliveryTransportEvent>
47+
<cbc:IdentificationID>625435485674654132</cbc:IdentificationID>
48+
</cac:PlannedDeliveryTransportEvent>
49+
</cac:Consignment>
50+
</ubl:TransportExecutionPlan>
51+
</test>
52+
53+
<test id="3">
54+
<assert>
55+
<success>PEPPOL-T124-R041</success>
56+
</assert>
57+
<ubl:TransportExecutionPlan xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:TransportExecutionPlan-2"
58+
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
59+
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
60+
<cac:MainTransportationService>
61+
<cbc:TransportServiceCode>1</cbc:TransportServiceCode>
62+
</cac:MainTransportationService>
63+
<cac:Consignment>
64+
<cac:PlannedPickupTransportEvent>
65+
<cbc:IdentificationID>21412312412</cbc:IdentificationID>
66+
</cac:PlannedPickupTransportEvent>
67+
<cac:MainCarriageShipmentStage>
68+
<cbc:TransportModeCode>3</cbc:TransportModeCode>
69+
</cac:MainCarriageShipmentStage>
70+
</cac:Consignment>
71+
</ubl:TransportExecutionPlan>
72+
</test>
73+
74+
<test id="4">
75+
<assert>
76+
<success>PEPPOL-T124-R041</success>
77+
</assert>
78+
<ubl:TransportExecutionPlan xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:TransportExecutionPlan-2"
79+
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
80+
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
81+
<cac:MainTransportationService>
82+
<cbc:TransportServiceCode>1</cbc:TransportServiceCode>
83+
</cac:MainTransportationService>
84+
<cac:Consignment>
85+
<cac:PlannedDeliveryTransportEvent>
86+
<cbc:IdentificationID>625435485674654132</cbc:IdentificationID>
87+
</cac:PlannedDeliveryTransportEvent>
88+
<cac:MainCarriageShipmentStage>
89+
<cbc:TransportModeCode>3</cbc:TransportModeCode>
90+
</cac:MainCarriageShipmentStage>
91+
</cac:Consignment>
92+
</ubl:TransportExecutionPlan>
93+
</test>
94+
95+
<test id="5">
96+
<assert>
97+
<success>PEPPOL-T124-R041</success>
98+
</assert>
99+
<ubl:TransportExecutionPlan xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:TransportExecutionPlan-2"
100+
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
101+
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
102+
<cac:MainTransportationService>
103+
<cbc:TransportServiceCode>1</cbc:TransportServiceCode>
104+
</cac:MainTransportationService>
105+
<cac:Consignment>
106+
107+
</cac:Consignment>
108+
</ubl:TransportExecutionPlan>
109+
</test>
110+
111+
<test id="6">
112+
<assert>
113+
<error>PEPPOL-T124-R041</error>
114+
</assert>
115+
<ubl:TransportExecutionPlan xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:TransportExecutionPlan-2"
116+
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
117+
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
118+
<cac:MainTransportationService>
119+
<cbc:TransportServiceCode>4</cbc:TransportServiceCode>
120+
</cac:MainTransportationService>
121+
<cac:Consignment>
122+
<cac:PlannedPickupTransportEvent>
123+
<cbc:IdentificationID>21412312412</cbc:IdentificationID>
124+
</cac:PlannedPickupTransportEvent>
125+
<cac:MainCarriageShipmentStage>
126+
<cbc:TransportModeCode>3</cbc:TransportModeCode>
127+
</cac:MainCarriageShipmentStage>
128+
</cac:Consignment>
129+
</ubl:TransportExecutionPlan>
130+
</test>
131+
132+
</testSet>

‎rules/unit-transport-execution-plan/PEPPOL-T124-R042.xml‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-T124-base-1.0">
3+
<assert>
4+
<description>Verify that the Planned Pickup Transport Event, Planned Delivery Transport Event and Main Carriage Shipment Stage are being
5+
specified for the Consignment when the Transport Service Code is "4", "22", "23" or "24". </description>
6+
<scope>PEPPOL-T124-R042</scope>
7+
</assert>
8+
<test id="1">
9+
<assert>
10+
<success>PEPPOL-T124-R042</success>
11+
</assert>
12+
<ubl:TransportExecutionPlan xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:TransportExecutionPlan-2"
13+
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
14+
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
15+
<cac:MainTransportationService>
16+
<cbc:TransportServiceCode>4</cbc:TransportServiceCode>
17+
</cac:MainTransportationService>
18+
<cac:Consignment>
19+
<cac:PlannedPickupTransportEvent>
20+
<cbc:IdentificationID>21412312412</cbc:IdentificationID>
21+
</cac:PlannedPickupTransportEvent>
22+
<cac:PlannedDeliveryTransportEvent>
23+
<cbc:IdentificationID>625435485674654132</cbc:IdentificationID>
24+
</cac:PlannedDeliveryTransportEvent>
25+
<cac:MainCarriageShipmentStage>
26+
<cbc:TransportModeCode>3</cbc:TransportModeCode>
27+
</cac:MainCarriageShipmentStage>
28+
</cac:Consignment>
29+
</ubl:TransportExecutionPlan>
30+
</test>
31+
32+
<test id="2">
33+
<assert>
34+
<success>PEPPOL-T124-R042</success>
35+
</assert>
36+
<ubl:TransportExecutionPlan xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:TransportExecutionPlan-2"
37+
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
38+
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
39+
<cac:MainTransportationService>
40+
<cbc:TransportServiceCode>1</cbc:TransportServiceCode>
41+
</cac:MainTransportationService>
42+
<cac:Consignment>
43+
<cac:PlannedPickupTransportEvent>
44+
<cbc:IdentificationID>21412312412</cbc:IdentificationID>
45+
</cac:PlannedPickupTransportEvent>
46+
<cac:PlannedDeliveryTransportEvent>
47+
<cbc:IdentificationID>625435485674654132</cbc:IdentificationID>
48+
</cac:PlannedDeliveryTransportEvent>
49+
</cac:Consignment>
50+
</ubl:TransportExecutionPlan>
51+
</test>
52+
53+
<test id="3">
54+
<assert>
55+
<success>PEPPOL-T124-R042</success>
56+
</assert>
57+
<ubl:TransportExecutionPlan xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:TransportExecutionPlan-2"
58+
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
59+
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
60+
<cac:MainTransportationService>
61+
<cbc:TransportServiceCode>1</cbc:TransportServiceCode>
62+
</cac:MainTransportationService>
63+
<cac:Consignment>
64+
<cac:PlannedPickupTransportEvent>
65+
<cbc:IdentificationID>21412312412</cbc:IdentificationID>
66+
</cac:PlannedPickupTransportEvent>
67+
<cac:MainCarriageShipmentStage>
68+
<cbc:TransportModeCode>3</cbc:TransportModeCode>
69+
</cac:MainCarriageShipmentStage>
70+
</cac:Consignment>
71+
</ubl:TransportExecutionPlan>
72+
</test>
73+
74+
<test id="4">
75+
<assert>
76+
<success>PEPPOL-T124-R042</success>
77+
</assert>
78+
<ubl:TransportExecutionPlan xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:TransportExecutionPlan-2"
79+
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
80+
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
81+
<cac:MainTransportationService>
82+
<cbc:TransportServiceCode>1</cbc:TransportServiceCode>
83+
</cac:MainTransportationService>
84+
<cac:Consignment>
85+
<cac:PlannedDeliveryTransportEvent>
86+
<cbc:IdentificationID>625435485674654132</cbc:IdentificationID>
87+
</cac:PlannedDeliveryTransportEvent>
88+
<cac:MainCarriageShipmentStage>
89+
<cbc:TransportModeCode>3</cbc:TransportModeCode>
90+
</cac:MainCarriageShipmentStage>
91+
</cac:Consignment>
92+
</ubl:TransportExecutionPlan>
93+
</test>
94+
95+
<test id="5">
96+
<assert>
97+
<success>PEPPOL-T124-R042</success>
98+
</assert>
99+
<ubl:TransportExecutionPlan xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:TransportExecutionPlan-2"
100+
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
101+
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
102+
<cac:MainTransportationService>
103+
<cbc:TransportServiceCode>1</cbc:TransportServiceCode>
104+
</cac:MainTransportationService>
105+
<cac:Consignment>
106+
107+
</cac:Consignment>
108+
</ubl:TransportExecutionPlan>
109+
</test>
110+
111+
<test id="6">
112+
<assert>
113+
<error>PEPPOL-T124-R042</error>
114+
</assert>
115+
<ubl:TransportExecutionPlan xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:TransportExecutionPlan-2"
116+
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
117+
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
118+
<cac:MainTransportationService>
119+
<cbc:TransportServiceCode>4</cbc:TransportServiceCode>
120+
</cac:MainTransportationService>
121+
<cac:Consignment>
122+
<cac:PlannedPickupTransportEvent>
123+
<cbc:IdentificationID>21412312412</cbc:IdentificationID>
124+
</cac:PlannedPickupTransportEvent>
125+
<cac:PlannedDeliveryTransportEvent>
126+
<cbc:IdentificationID>625435485674654132</cbc:IdentificationID>
127+
</cac:PlannedDeliveryTransportEvent>
128+
</cac:Consignment>
129+
</ubl:TransportExecutionPlan>
130+
</test>
131+
132+
</testSet>

0 commit comments

Comments
 (0)