From 38e4612b4a72c8a8f96db4fce04e6a45ca410b71 Mon Sep 17 00:00:00 2001
From: Jelte Jansen <jelte@ionite.net>
Date: Tue, 19 Mar 2024 12:05:54 +0100
Subject: [PATCH] Make country-specific rule NL-R-008 domestic-only (PB3-CII)

See commit 6aff14e99332ecba3e38cace1f5860d557adcc98, but this time for CII.
---
 rules/sch/PEPPOL-EN16931-CII.sch |   4 +-
 rules/unit-CII-NL/NL-R-008.xml   | 173 +++++++++++++++++++++++++++++++
 2 files changed, 175 insertions(+), 2 deletions(-)

diff --git a/rules/sch/PEPPOL-EN16931-CII.sch b/rules/sch/PEPPOL-EN16931-CII.sch
index 515b276c..328ea33a 100644
--- a/rules/sch/PEPPOL-EN16931-CII.sch
+++ b/rules/sch/PEPPOL-EN16931-CII.sch
@@ -485,14 +485,14 @@ Last update: 2022 May release 3.0.13.
       <assert id="NL-R-007" test="xs:decimal(ram:DuePayableAmount) &lt;= 0.0 or (/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans)" flag="fatal">[NL-R-007] For suppliers in the Netherlands, the supplier MUST provide a means of payment (ram:SpecifiedTradeSettlementPaymentMeans) if the payment is from customer to supplier</assert>
     </rule>
 
-    <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans[$supplierCountryIsNL]">
+    <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans[$supplierCountryIsNL and $customerCountryIsNL]">
       <!-- Original rule in NLCIUS: BR-NL-12 -->
       <assert id="NL-R-008" test="normalize-space(ram:TypeCode) = '30' or
                 normalize-space(ram:TypeCode) = '48' or
                 normalize-space(ram:TypeCode) = '49' or
                 normalize-space(ram:TypeCode) = '57' or
                 normalize-space(ram:TypeCode) = '58' or
-                normalize-space(ram:TypeCode) = '59'" flag="fatal">[NL-R-008] For suppliers in the Netherlands, the payment means code (ram:SpecifiedTradeSettlementPaymentMeans/ram:TypeCode) MUST be one of 30, 48, 49, 57, 58 or 59</assert>
+                normalize-space(ram:TypeCode) = '59'" flag="fatal">[NL-R-008] For suppliers in the Netherlands, if the customer is in the Netherlands, the payment means code (ram:SpecifiedTradeSettlementPaymentMeans/ram:TypeCode) MUST be one of 30, 48, 49, 57, 58 or 59</assert>
     </rule>
 
     <rule context="rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedLineTradeAgreement/ram:BuyerOrderReferencedDocument/ram:LineID[$supplierCountryIsNL]">
diff --git a/rules/unit-CII-NL/NL-R-008.xml b/rules/unit-CII-NL/NL-R-008.xml
index 67c3aad0..b70f4949 100755
--- a/rules/unit-CII-NL/NL-R-008.xml
+++ b/rules/unit-CII-NL/NL-R-008.xml
@@ -401,4 +401,177 @@
 
     </rsm:CrossIndustryInvoice>
   </test>
+  <test>
+      <!-- Rule should only trigger for domestic use -->
+      <assert>
+          <success>NL-R-008</success>
+      </assert>
+    <?xml version="1.0" encoding="utf-8"?>
+    <!-- XML instance generated STPE (STPE.nl), based on an example by Andreas Pelekies -->
+    <!-- Based on 'Example 8: Electricity for EN16931' published by CEN on https://github.com/ConnectingEurope -->
+    <rsm:CrossIndustryInvoice xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100">
+      <rsm:ExchangedDocumentContext>
+        <ram:BusinessProcessSpecifiedDocumentContextParameter>
+          <ram:ID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</ram:ID>
+        </ram:BusinessProcessSpecifiedDocumentContextParameter>
+        <ram:GuidelineSpecifiedDocumentContextParameter>
+          <ram:ID>urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</ram:ID>
+        </ram:GuidelineSpecifiedDocumentContextParameter>
+      </rsm:ExchangedDocumentContext>
+      <rsm:ExchangedDocument>
+        <ram:ID>1100512149</ram:ID>
+        <ram:TypeCode>380</ram:TypeCode>
+        <ram:IssueDateTime>
+          <udt:DateTimeString format="102">20141110</udt:DateTimeString>
+        </ram:IssueDateTime>
+        <ram:IncludedNote>
+          <ram:Content>
+            Periodieke afrekening
+            U vindt een toelichting op uw factuur via www.energieleverancier.nl/factuur_grootzakelijk
+            Op alle diensten en overeenkomsten zijn de algemene voorwaarden aansluiting en
+            transport grootverbruik elektriciteit, respectievelijk gas van toepassing
+            www.energieleverancier.nl
+          </ram:Content>
+        </ram:IncludedNote>
+      </rsm:ExchangedDocument>
+      <rsm:SupplyChainTradeTransaction>
+        <ram:IncludedSupplyChainTradeLineItem>
+          <ram:AssociatedDocumentLineDocument>
+            <ram:LineID>1</ram:LineID>
+          </ram:AssociatedDocumentLineDocument>
+          <ram:SpecifiedTradeProduct>
+            <ram:Name>Getransporteerde kWh’s</ram:Name>
+          </ram:SpecifiedTradeProduct>
+          <ram:SpecifiedLineTradeAgreement>
+            <ram:BuyerOrderReferencedDocument>
+              <ram:LineID>1</ram:LineID>
+            </ram:BuyerOrderReferencedDocument>
+            <ram:NetPriceProductTradePrice>
+              <ram:ChargeAmount>100.00</ram:ChargeAmount>
+              <ram:BasisQuantity unitCode="KWH">1.00</ram:BasisQuantity>
+            </ram:NetPriceProductTradePrice>
+          </ram:SpecifiedLineTradeAgreement>
+          <ram:SpecifiedLineTradeDelivery>
+            <ram:BilledQuantity unitCode="KWH">1</ram:BilledQuantity>
+          </ram:SpecifiedLineTradeDelivery>
+          <ram:SpecifiedLineTradeSettlement>
+            <ram:ApplicableTradeTax>
+              <ram:TypeCode>VAT</ram:TypeCode>
+              <ram:CategoryCode>S</ram:CategoryCode>
+              <ram:RateApplicablePercent>21</ram:RateApplicablePercent>
+            </ram:ApplicableTradeTax>
+            <ram:SpecifiedTradeSettlementLineMonetarySummation>
+              <ram:LineTotalAmount>100.00</ram:LineTotalAmount>
+            </ram:SpecifiedTradeSettlementLineMonetarySummation>
+          </ram:SpecifiedLineTradeSettlement>
+        </ram:IncludedSupplyChainTradeLineItem>
+        <ram:ApplicableHeaderTradeAgreement>
+          <ram:SellerTradeParty>
+            <ram:Name>Energieleverancier B.V.</ram:Name>
+            <ram:SpecifiedLegalOrganization>
+              <ram:ID schemeID="0106">17131139</ram:ID>
+              <ram:TradingBusinessName>Energieleverancier</ram:TradingBusinessName>
+            </ram:SpecifiedLegalOrganization>
+            <ram:DefinedTradeContact>
+              <ram:EmailURIUniversalCommunication>
+                <ram:URIID>klantenservice.zakelijk@energieleverancier.nl</ram:URIID>
+              </ram:EmailURIUniversalCommunication>
+            </ram:DefinedTradeContact>
+            <ram:PostalTradeAddress>
+              <ram:PostcodeCode>5223MB</ram:PostcodeCode>
+              <ram:LineOne>Magistratenlaan 116</ram:LineOne>
+              <ram:CityName>'S-HERTOGENBOSCH</ram:CityName>
+              <ram:CountryID>NL</ram:CountryID>
+            </ram:PostalTradeAddress>
+            <ram:URIUniversalCommunication>
+              <ram:URIID schemeID="0106">12345678</ram:URIID>
+            </ram:URIUniversalCommunication>
+            <ram:SpecifiedTaxRegistration>
+              <ram:ID schemeID="VA">NL809561074B01</ram:ID>
+            </ram:SpecifiedTaxRegistration>
+          </ram:SellerTradeParty>
+          <ram:BuyerTradeParty>
+            <ram:ID>1081119</ram:ID>
+            <ram:Name>Klant</ram:Name>
+            <ram:SpecifiedLegalOrganization>
+              <ram:ID schemeID="0106">13524678</ram:ID>
+            </ram:SpecifiedLegalOrganization>
+            <ram:PostalTradeAddress>
+              <ram:PostcodeCode>9999 XX</ram:PostcodeCode>
+              <ram:LineOne>Bedrijfslaan 4</ram:LineOne>
+              <ram:CityName>ONDERNEMERSTØD</ram:CityName>
+              <ram:CountryID>SE</ram:CountryID>
+            </ram:PostalTradeAddress>
+            <ram:URIUniversalCommunication>
+              <ram:URIID schemeID="0106">12345678</ram:URIID>
+            </ram:URIUniversalCommunication>
+          </ram:BuyerTradeParty>
+          <ram:BuyerOrderReferencedDocument>
+            <ram:IssuerAssignedID>PO4711</ram:IssuerAssignedID>
+          </ram:BuyerOrderReferencedDocument>
+          <ram:AdditionalReferencedDocument>
+            <ram:IssuerAssignedID>871694831000290806</ram:IssuerAssignedID>
+            <ram:TypeCode>130</ram:TypeCode>
+          </ram:AdditionalReferencedDocument>
+        </ram:ApplicableHeaderTradeAgreement>
+        <ram:ApplicableHeaderTradeDelivery>
+          <ram:ShipToTradeParty>
+            <ram:PostalTradeAddress>
+              <ram:PostcodeCode>9999 XX</ram:PostcodeCode>
+              <ram:LineOne>Bedrijfslaan 4,</ram:LineOne>
+              <ram:CityName>ONDERNEMERSTAD</ram:CityName>
+              <ram:CountryID>NL</ram:CountryID>
+            </ram:PostalTradeAddress>
+          </ram:ShipToTradeParty>
+        </ram:ApplicableHeaderTradeDelivery>
+        <ram:ApplicableHeaderTradeSettlement>
+          <ram:PaymentReference>1100512149</ram:PaymentReference>
+          <ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>
+          <ram:SpecifiedTradeSettlementPaymentMeans>
+            <ram:TypeCode>54</ram:TypeCode>
+            <ram:PayeePartyCreditorFinancialAccount>
+              <ram:IBANID>NL28RBOS0420242228</ram:IBANID>
+            </ram:PayeePartyCreditorFinancialAccount>
+          </ram:SpecifiedTradeSettlementPaymentMeans>
+          <ram:SpecifiedTradeSettlementPaymentMeans>
+            <ram:TypeCode>30</ram:TypeCode>
+            <ram:PayeePartyCreditorFinancialAccount>
+              <ram:IBANID>NL28RBOS0420242228</ram:IBANID>
+            </ram:PayeePartyCreditorFinancialAccount>
+          </ram:SpecifiedTradeSettlementPaymentMeans>
+          <ram:ApplicableTradeTax>
+            <ram:CalculatedAmount>21.00</ram:CalculatedAmount>
+            <ram:TypeCode>VAT</ram:TypeCode>
+            <ram:BasisAmount>100.00</ram:BasisAmount>
+            <ram:CategoryCode>S</ram:CategoryCode>
+            <ram:RateApplicablePercent>21</ram:RateApplicablePercent>
+          </ram:ApplicableTradeTax>
+          <ram:BillingSpecifiedPeriod>
+            <ram:StartDateTime>
+              <udt:DateTimeString format="102">20140801</udt:DateTimeString>
+            </ram:StartDateTime>
+            <ram:EndDateTime>
+              <udt:DateTimeString format="102">20140831</udt:DateTimeString>
+            </ram:EndDateTime>
+          </ram:BillingSpecifiedPeriod>
+          <ram:SpecifiedTradePaymentTerms>
+            <ram:Description>
+              Energieleverancier brengt wettelijke rente in rekening over te laat betaalde
+              facturen. Kijk voor informatie op www.energieleverancier.nl/rentenota
+            </ram:Description>
+            <ram:DueDateDateTime>
+              <udt:DateTimeString format="102">20141124</udt:DateTimeString>
+            </ram:DueDateDateTime>
+          </ram:SpecifiedTradePaymentTerms>
+          <ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+            <ram:LineTotalAmount>100.00</ram:LineTotalAmount>
+            <ram:TaxBasisTotalAmount>100.00</ram:TaxBasisTotalAmount>
+            <ram:TaxTotalAmount currencyID="EUR">21.00</ram:TaxTotalAmount>
+            <ram:GrandTotalAmount>121.00</ram:GrandTotalAmount>
+            <ram:DuePayableAmount>121.00</ram:DuePayableAmount>
+          </ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+        </ram:ApplicableHeaderTradeSettlement>
+      </rsm:SupplyChainTradeTransaction>
+    </rsm:CrossIndustryInvoice>
+  </test>
 </testSet>