Skip to content

Commit

Permalink
Merge branch '2023' of https://github.com/OpenPEPPOL/pracc into featu…
Browse files Browse the repository at this point in the history
…re/p013
  • Loading branch information
gabrieledall committed Nov 7, 2023
2 parents de0816d + c879b94 commit 688dbf8
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
4 changes: 3 additions & 1 deletion guides/changelog/2023-xx-xx.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
=== P012 - New Profile - Invitation to Tender 1.0


=== Business Rules
=== Business Rules and Syntax Mapping

* T14: Change the cardinality of cac:TenderDocumentReference in T014 from 1..1 to 1..n. TenderDocumentReference SHOULD NOT be used "more than once" was changed to "more than twice". Corresponding description were added as defined by the transaction to use code 13 for REM evidence and 310 for Tender reference. Fixed value 23 (typo - should be 13) was removed to allow for both values.


=== Editorial changes
Expand Down
3 changes: 1 addition & 2 deletions rules/peppol-tender-withdrawal/PEPPOL-T014.sch
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,7 @@
</rule>

<rule context="ubl:TenderReceipt/cac:TenderDocumentReference/cbc:DocumentTypeCode">
<assert id="PEPPOL-T014-R017" flag="fatal" test="(normalize-space(.)='13') or (normalize-space(.)='310')">[PEPPOL-T014-R014] The document
type code for the document reference (the tender withdrawal) MUST be '310' or '13' if you refer to a REM evidence.
<assert id="PEPPOL-T014-R017" flag="fatal" test="(normalize-space(.)='13') or (normalize-space(.)='310')">[PEPPOL-T014-R014] The document type code for the document reference (the received tender) MUST be '310' or '13' if you refer to a REM evidence.
</assert>
<assert id="PEPPOL-T014-R023" flag="fatal" test="normalize-space(./@listID)='UNCL1001'">[PEPPOL-T014-R023]
listID for Document Type Code MUST be 'UNCL1001'.
Expand Down
4 changes: 2 additions & 2 deletions rules/peppol-tender/PEPPOL-T006.sch
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<report id="PEPPOL-T006-S308" flag="warning" test="(cbc:UUID)"><value-of select="$syntaxError"/>[PEPPOL-T006-S308] UUID SHOULD NOT be used.</report>
<report id="PEPPOL-T006-S310" flag="warning" test="count (cbc:ConctractName) &gt; 1"><value-of select="$syntaxError"/>[PEPPOL-T006-S310] ContractName SHOULD NOT be used more than once.</report>
<report id="PEPPOL-T006-S312" flag="warning" test="(cbc:Note)"><value-of select="$syntaxError"/>[PEPPOL-T006-S312] Note SHOULD NOT be used.</report>
<report id="PEPPOL-T006-S313" flag="warning" test="count (cac:TenderDocumentReference) &gt; 2"><value-of select="$syntaxError"/>[PEPPOL-T006-S313] TenderDocumentReference SHOULD NOT be used more than once.</report>
<report id="PEPPOL-T006-S313" flag="warning" test="count (cac:TenderDocumentReference) &gt; 3"><value-of select="$syntaxError"/>[PEPPOL-T006-S313] TenderDocumentReference SHOULD NOT be used more than twice.</report>
<report id="PEPPOL-T006-S322" flag="warning" test="(cac:Signature)"><value-of select="$syntaxError"/>[PEPPOL-T006-S322] Signature SHOULD NOT be used.</report>
</rule>

Expand Down Expand Up @@ -75,7 +75,7 @@
</rule>

<rule context="ubl:TenderReceipt/cac:TenderDocumentReference/cbc:DocumentTypeCode">
<assert id="PEPPOL-T006-R014" flag="fatal" test="matches(normalize-space(.),'^310|13')">[PEPPOL-T006-R014] The document type code for the document reference (the received tender) MUST be '310' or '13'.</assert>
<assert id="PEPPOL-T006-R014" flag="fatal" test="matches(normalize-space(.),'^310|13')">[PEPPOL-T006-R014] The document type code for the document reference (the received tender) MUST be '310' or '13' if you refer to a REM evidence.</assert>
<assert flag="fatal" id="CL-T45-R001" test="( ( not(contains(normalize-space(.),' ')) and contains( ' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 481 482 483 484 485 486 487 488 489 490 491 493 494 495 496 497 498 499 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 550 575 580 610 621 622 623 624 630 631 632 633 635 640 650 655 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 720 722 723 724 730 740 741 743 744 745 746 750 760 761 763 764 765 766 770 775 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 810 811 812 820 821 822 823 824 825 830 833 840 841 850 851 852 853 855 856 860 861 862 863 864 865 870 890 895 896 901 910 911 913 914 915 916 917 925 926 927 929 930 931 932 933 934 935 936 937 938 940 941 950 951 952 953 954 955 960 961 962 963 964 965 966 970 971 972 974 975 976 977 978 979 990 991 995 996 998 ',concat(' ',normalize-space(.),' ') ) ) )">DocumentTypeCode must be from the code list UNCL1001</assert>
</rule>

Expand Down
3 changes: 2 additions & 1 deletion structure/syntax/TenderReceipt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<Element>
<Term>cbc:DocumentTypeCode</Term>
<Name>Document type code</Name>
<Description>A code specifying the type of the document.</Description>
<Description>Document Type Code is coded according to code list 1001 issued by UN/CEFACT. Must be 13 to reference the REM evidence and 310 to reference the Tender.</Description>
<Reference type="RULE">PEPPOL-T006-R014</Reference>
<Attribute>
<Term>listID</Term>
Expand All @@ -105,6 +105,7 @@
<Value type="FIXED">UNCL1001</Value>
</Attribute>
<DataType>Code</DataType>
<Value type="FIXED">13 or 310</Value>
</Element>
<Element cardinality="0..1">
<Term>cac:Attachment</Term>
Expand Down
6 changes: 3 additions & 3 deletions structure/syntax/TenderWithdrawalResponse.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<Reference type="RULE">PEPPOL-T014-R012</Reference>
<DataType>Time</DataType>
</Element>
<Element>
<Element cardinality="1..n">
<Term>cac:TenderDocumentReference</Term>
<Name>Received document reference</Name>
<Description>The tender reception notification contains the reference to the tender document sent by the
Expand All @@ -136,7 +136,7 @@
<Element>
<Term>cbc:DocumentTypeCode</Term>
<Name>Document type code</Name>
<Description>Document Type Code is coded according to code list 1001 issued by UN/CEFACT.</Description>
<Description>Document Type Code is coded according to code list 1001 issued by UN/CEFACT. Must be 13 to reference the REM evidence and 310 to reference the Tender.</Description>
<Reference type="RULE">PEPPOL-T014-R017</Reference>
<Attribute>
<Term>listID</Term>
Expand All @@ -146,7 +146,7 @@
<Value type="FIXED">UNCL1001</Value>
</Attribute>
<DataType>Code</DataType>
<Value type="FIXED">23</Value>
<Value type="FIXED">13 or 310</Value>
</Element>
<Element>
<Term>cac:Attachment</Term>
Expand Down

0 comments on commit 688dbf8

Please sign in to comment.