Revert "add fatal check on Invoices with external reference attachmen…

…t URI"
OpenPEPPOL · Oct 29, 2024 · 3fbe7ad · Zumbala · Oct 29, 2024 · 3fbe7ad
1 parent c63ff10
commit 3fbe7ad
Show file tree

Hide file tree

Showing 19 changed files with 22 additions and 301 deletions.
diff --git a/build.bat b/build.bat
diff --git a/guide/release-notes/v3.0.18.adoc b/guide/release-notes/v3.0.18.adoc
@@ -11,11 +11,5 @@ 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.
-* sample files and snippits have been updated to reflect the new rule PEPPOL-EN16931-R131
-            <cac:ExternalReference>
-                <cbc:URI>http://www.techspec.no</cbc:URI>
-            </cac:ExternalReference>
 
 ==  EN 16931 schematrons updated
-
-* new fatal rule PEPPOL-EN16931-R131 on Document refenced by URI, only allows content starting with http(s):// or ftp(s)://
diff --git a/mapping/mapping-cii-ubl v2 fr19.xls b/mapping/mapping-cii-ubl v2 fr19.xls
diff --git a/rules/examples/Allowance-example.xml b/rules/examples/Allowance-example.xml
@@ -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>
@@ -366,3 +366,5 @@
 
     </cac:InvoiceLine>    
 </Invoice>
+
+
diff --git a/rules/sch/PEPPOL-EN16931-CII.sch b/rules/sch/PEPPOL-EN16931-CII.sch
@@ -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>

diff --git a/rules/sch/PEPPOL-EN16931-UBL.sch b/rules/sch/PEPPOL-EN16931-UBL.sch
@@ -2,7 +2,7 @@
 <!--
 This schematron uses business terms defined the CEN/EN16931-1 and is reproduced with permission from CEN. CEN bears no liability from the use of the content and implementation of this schematron and gives no warranties expressed or implied for any purpose.
 
-Last update: 2024 Novemeber release 3.0.18.
+Last update: 2024 May release 3.0.17.
  -->
 <schema xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:u="utils" schemaVersion="iso" queryBinding="xslt2">
   <title>Rules for Peppol BIS 3.0 Billing</title>
@@ -252,12 +252,6 @@ Last update: 2024 Novemeber release 3.0.18.
       <assert id="PEPPOL-EN16931-R080" test="(count(cac:AdditionalDocumentReference[cbc:DocumentTypeCode='50']) &lt;= 1)" 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">

diff --git a/rules/snippets/Calc.xml b/rules/snippets/Calc.xml
@@ -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>
@@ -484,3 +484,5 @@
         <!-- end::lineamount2[] -->
     </cac:InvoiceLine>    
 </Invoice>
+
+
diff --git a/rules/snippets/Snippet-cn.xml b/rules/snippets/Snippet-cn.xml
@@ -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>

diff --git a/rules/snippets/Snippet-full.xml b/rules/snippets/Snippet-full.xml
@@ -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>

diff --git a/rules/snippets/Snippet-refs.xml b/rules/snippets/Snippet-refs.xml
@@ -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>

diff --git a/rules/snippets/direct-debit.xml b/rules/snippets/direct-debit.xml
@@ -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>

diff --git a/rules/snippets/giro.xml b/rules/snippets/giro.xml
@@ -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>

diff --git a/rules/snippets/item.xml b/rules/snippets/item.xml
@@ -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>
@@ -386,3 +386,5 @@
 
     </cac:InvoiceLine>    
 </Invoice>
+
+
diff --git a/rules/snippets/payment-credit.xml b/rules/snippets/payment-credit.xml
@@ -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>

diff --git a/rules/snippets/payment1.xml b/rules/snippets/payment1.xml
@@ -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>

diff --git a/rules/snippets/price.xml b/rules/snippets/price.xml
@@ -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>
@@ -464,3 +464,5 @@
         </cac:Price>
     </cac:InvoiceLine>    
 </Invoice>
+
+
diff --git a/rules/unit-CII-PEPPOL/PEPPOL-EN16931-R131.xml b/rules/unit-CII-PEPPOL/PEPPOL-EN16931-R131.xml
diff --git a/rules/unit-UBL-PEPPOL/PEPPOL-EN16931-R080.xml b/rules/unit-UBL-PEPPOL/PEPPOL-EN16931-R080.xml
@@ -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>
@@ -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>