Skip to content

Commit

Permalink
Merge pull request #161 from OpenPEPPOL/revert-153-POACC-508
Browse files Browse the repository at this point in the history 
Revert "add fatal check on  Invoices with external reference attachment URI"
  • Loading branch information
@Zumbala
Zumbala authored Oct 31, 2024
2 parents 5d35102 + 393eb62 commit 8aa35c5
Show file tree
Hide file tree
Showing 19 changed files with 25 additions and 307 deletions.
40 changes: 0 additions & 40 deletions build.bat
View file

This file was deleted.

16 changes: 4 additions & 12 deletions guide/release-notes/v3.0.18.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ Release date:: November 2024

* German country specific validation rules added.
* The rule (PEPPOL-EN16931-R002), which ensures that the Invoice Note (BT-22) appears no more than once, will not apply if both the buyer and seller are German organizations.
* Update for rule NL-R-008 (mandatory payment means), the check should not fire if the document is a credit note with a positive amount.

== EN 16931 schematrons updated

* Update for country-specific rule NL-R-008 Make rule domestic-only.
* Correction in UNECERec20-11e for code HWE
* CEN UBL and CII new version 1.3.13 of schematrons
Expand All @@ -21,17 +25,5 @@ Release date:: November 2024
** Contradicting message #379
** CII special ID elements without attributes - not handled correctly #375
** Commit did overwrite PR changes #374
* sample files and snippits have been updated to reflect the new rule PEPPOL-EN16931-R131
* Severity of Swedish country specific rules SE-R-003, SE-R-004 and SE-R-013 which verifies format of Swedish organization numbers are changed from warning to fatal.

[attributes]
====
<cac:ExternalReference>
<cbc:URI>http://www.techspec.no</cbc:URI>
</cac:ExternalReference>
====


== EN 16931 schematrons updated

* new fatal rule PEPPOL-EN16931-R131 on Document referenced by URI, only allows content starting with http(s):// or ftp(s)://
Binary file modified mapping/mapping-cii-ubl v2 fr19.xls
View file
Binary file not shown.
4 changes: 3 additions & 1 deletion rules/examples/Allowance-example.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<cbc:DocumentDescription>Technical specification</cbc:DocumentDescription>
<cac:Attachment>
<cac:ExternalReference>
<cbc:URI>http://www.techspec.no</cbc:URI>
<cbc:URI>www.techspec.no</cbc:URI>
</cac:ExternalReference>
</cac:Attachment>
</cac:AdditionalDocumentReference>
Expand Down Expand Up @@ -366,3 +366,5 @@

</cac:InvoiceLine>
</Invoice>


1 change: 0 additions & 1 deletion rules/sch/PEPPOL-EN16931-CII.sch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ Last update: 2024 May release 3.0.17.
<assert id="PEPPOL-EN16931-R003" test="ram:BuyerReference or ram:BuyerOrderReferencedDocument/ram:IssuerAssignedID" flag="fatal">A buyer reference or purchase order reference MUST be provided.</assert>
<assert id="PEPPOL-EN16931-R006" test="count(ram:AdditionalReferencedDocument[ram:TypeCode='130']) &lt;=1" flag="fatal">Only one invoiced object is allowed on document level</assert>
<assert id="PEPPOL-EN16931-R080" test="count(ram:AdditionalReferencedDocument[ram:TypeCode='50']) &lt;=1" flag="fatal">Only one project reference is allowed on document level</assert>
<assert id="PEPPOL-EN16931-R131" test="boolean(ram:AdditionalReferencedDocument/ram:URIID) and matches(normalize-space(ram:AdditionalReferencedDocument/ram:URIID/text()), '^(http|https|ftp|ftps):','i')" flag="fatal">The Uniform Resource Locater should start with http(s):// or ftp(s)://</assert>
</rule>
<rule context="ram:ApplicableHeaderTradeSettlement">
<assert id="PEPPOL-EN16931-R005" test="not(ram:TaxCurrencyCode) or normalize-space(ram:TaxCurrencyCode/text()) != normalize-space(ram:InvoiceCurrencyCode/text())" flag="fatal">VAT accounting currency code MUST be different from invoice currency code when provided.</assert>
Expand Down
7 changes: 0 additions & 7 deletions rules/sch/PEPPOL-EN16931-UBL.sch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,6 @@ Last update: 2024 November release 3.0.18.
flag="fatal">Only one project reference is allowed on document level</assert>
</rule>
</pattern>
<pattern>
<rule context="cac:ExternalReference[cbc:URI]">
<assert id="PEPPOL-EN16931-R131"
test="matches(normalize-space(cbc:URI), '^(http|https|ftp|ftps)://', 'i')"
flag="fatal">The Uniform Resource Locater should start with http(s):// or ftp(s)://</assert>
</rule>
</pattern>
<pattern>
<!-- Document level -->
<rule context="ubl-creditnote:CreditNote | ubl-invoice:Invoice">
Expand Down
4 changes: 3 additions & 1 deletion rules/snippets/Calc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<cbc:DocumentDescription>Technical specification</cbc:DocumentDescription>
<cac:Attachment>
<cac:ExternalReference>
<cbc:URI>http://www.techspec.no</cbc:URI>
<cbc:URI>www.techspec.no</cbc:URI>
</cac:ExternalReference>
</cac:Attachment>
</cac:AdditionalDocumentReference>
Expand Down Expand Up @@ -484,3 +484,5 @@
<!-- end::lineamount2[] -->
</cac:InvoiceLine>
</Invoice>


2 changes: 1 addition & 1 deletion rules/snippets/Snippet-cn.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<cbc:DocumentDescription>Technical specification</cbc:DocumentDescription>
<cac:Attachment>
<cac:ExternalReference>
<cbc:URI>http://www.techspec.no</cbc:URI>
<cbc:URI>www.techspec.no</cbc:URI>
</cac:ExternalReference>
</cac:Attachment>
</cac:AdditionalDocumentReference>
Expand Down
2 changes: 1 addition & 1 deletion rules/snippets/Snippet-full.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<cbc:DocumentDescription>Technical specification</cbc:DocumentDescription>
<cac:Attachment>
<cac:ExternalReference>
<cbc:URI>http://www.techspec.no</cbc:URI>
<cbc:URI>www.techspec.no</cbc:URI>
</cac:ExternalReference>
</cac:Attachment>
</cac:AdditionalDocumentReference>
Expand Down
2 changes: 1 addition & 1 deletion rules/snippets/Snippet-refs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<cbc:DocumentDescription>Technical specification</cbc:DocumentDescription>
<cac:Attachment>
<cac:ExternalReference>
<cbc:URI>http://www.techspec.no</cbc:URI>
<cbc:URI>www.techspec.no</cbc:URI>
</cac:ExternalReference>
</cac:Attachment>
</cac:AdditionalDocumentReference>
Expand Down
2 changes: 1 addition & 1 deletion rules/snippets/direct-debit.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<cbc:DocumentDescription>Technical specification</cbc:DocumentDescription>
<cac:Attachment>
<cac:ExternalReference>
<cbc:URI>http://www.techspec.no</cbc:URI>
<cbc:URI>www.techspec.no</cbc:URI>
</cac:ExternalReference>
</cac:Attachment>
</cac:AdditionalDocumentReference>
Expand Down
2 changes: 1 addition & 1 deletion rules/snippets/giro.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<cbc:DocumentDescription>Technical specification</cbc:DocumentDescription>
<cac:Attachment>
<cac:ExternalReference>
<cbc:URI>http://www.techspec.no</cbc:URI>
<cbc:URI>www.techspec.no</cbc:URI>
</cac:ExternalReference>
</cac:Attachment>
</cac:AdditionalDocumentReference>
Expand Down
4 changes: 3 additions & 1 deletion rules/snippets/item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<cbc:DocumentDescription>Technical specification</cbc:DocumentDescription>
<cac:Attachment>
<cac:ExternalReference>
<cbc:URI>http://www.techspec.no</cbc:URI>
<cbc:URI>www.techspec.no</cbc:URI>
</cac:ExternalReference>
</cac:Attachment>
</cac:AdditionalDocumentReference>
Expand Down Expand Up @@ -386,3 +386,5 @@

</cac:InvoiceLine>
</Invoice>


2 changes: 1 addition & 1 deletion rules/snippets/payment-credit.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<cbc:DocumentDescription>Technical specification</cbc:DocumentDescription>
<cac:Attachment>
<cac:ExternalReference>
<cbc:URI>http://www.techspec.no</cbc:URI>
<cbc:URI>www.techspec.no</cbc:URI>
</cac:ExternalReference>
</cac:Attachment>
</cac:AdditionalDocumentReference>
Expand Down
2 changes: 1 addition & 1 deletion rules/snippets/payment1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<cbc:DocumentDescription>Technical specification</cbc:DocumentDescription>
<cac:Attachment>
<cac:ExternalReference>
<cbc:URI>http://www.techspec.no</cbc:URI>
<cbc:URI>www.techspec.no</cbc:URI>
</cac:ExternalReference>
</cac:Attachment>
</cac:AdditionalDocumentReference>
Expand Down
4 changes: 3 additions & 1 deletion rules/snippets/price.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<cbc:DocumentDescription>Technical specification</cbc:DocumentDescription>
<cac:Attachment>
<cac:ExternalReference>
<cbc:URI>http://www.techspec.no</cbc:URI>
<cbc:URI>www.techspec.no</cbc:URI>
</cac:ExternalReference>
</cac:Attachment>
</cac:AdditionalDocumentReference>
Expand Down Expand Up @@ -464,3 +464,5 @@
</cac:Price>
</cac:InvoiceLine>
</Invoice>


124 changes: 0 additions & 124 deletions rules/unit-CII-PEPPOL/PEPPOL-EN16931-R131.xml
View file

This file was deleted.

4 changes: 2 additions & 2 deletions rules/unit-UBL-PEPPOL/PEPPOL-EN16931-R080.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<cbc:DocumentDescription>Technical specification</cbc:DocumentDescription>
<cac:Attachment>
<cac:ExternalReference>
<cbc:URI>http://www.techspec.no</cbc:URI>
<cbc:URI>www.techspec.no</cbc:URI>
</cac:ExternalReference>
</cac:Attachment>
</cac:AdditionalDocumentReference>
Expand All @@ -41,7 +41,7 @@
<cbc:DocumentDescription>Technical specification</cbc:DocumentDescription>
<cac:Attachment>
<cac:ExternalReference>
<cbc:URI>http://www.techspec.no</cbc:URI>
<cbc:URI>www.techspec.no</cbc:URI>
</cac:ExternalReference>
</cac:Attachment>
</cac:AdditionalDocumentReference>
Expand Down
Loading

0 comments on commit 8aa35c5

Please sign in to comment.