From 97112db61500d172410f76a4b07d3d5d34254167 Mon Sep 17 00:00:00 2001
From: jstaerk <jstaerk@usegroup.de>
Date: Fri, 4 Dec 2020 19:16:05 +0100
Subject: [PATCH] added previous merge to history, reverted XR back to 1.2
 because 2.0 is AFAIK not yet accepted by the ZRE

---
 History.md                                                      | 1 +
 .../resources/schematron/XR_20/CII/XRechnung-CII-model.part     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index a940a217..0a863541 100644
--- a/History.md
+++ b/History.md
@@ -5,6 +5,7 @@
 - transaction calculator getGrandTotal now public
 - corrected sample in docs thanks to tweimer PR #204
 - don't write "null" as paymentDescription if no Bank account is specified
+- generic and unitcode/categorycode improvements (thanks to weclapp-dev) PR #207
 
 2.0.2
 =======
diff --git a/validator/src/main/resources/schematron/XR_20/CII/XRechnung-CII-model.part b/validator/src/main/resources/schematron/XR_20/CII/XRechnung-CII-model.part
index bae7c60b..0995f1d5 100644
--- a/validator/src/main/resources/schematron/XR_20/CII/XRechnung-CII-model.part
+++ b/validator/src/main/resources/schematron/XR_20/CII/XRechnung-CII-model.part
@@ -34,7 +34,7 @@
   <param name="BR-DE-20"
     value="not(ram:TypeCode = '59') or  matches(normalize-space(replace(ram:PayerPartyDebtorFinancialAccount/ram:IBANID, '([ \n\r\t\s])', '')), '^[A-Z]{2}[0-9]{2}[a-zA-Z0-9]{0,30}$') and xs:integer(string-join(for $cp in string-to-codepoints(concat(substring(normalize-space(replace(ram:PayerPartyDebtorFinancialAccount/ram:IBANID, '([ \n\r\t\s])', '')),5),upper-case(substring(normalize-space(replace(ram:PayerPartyDebtorFinancialAccount/ram:IBANID, '([ \n\r\t\s])', '')),1,2)),substring(normalize-space(replace(ram:PayerPartyDebtorFinancialAccount/ram:IBANID, '([ \n\r\t\s])', '')),3,2))) return  (if($cp > 64) then $cp - 55 else  $cp - 48),'')) mod 97 = 1" />
   <param name="BR-DE-21"
-    value="ram:GuidelineSpecifiedDocumentContextParameter/ram:ID = 'urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.0'" />
+    value="ram:GuidelineSpecifiedDocumentContextParameter/ram:ID = 'urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_1.2'" />
 
   <param name="INVOICE" value="//rsm:CrossIndustryInvoice" />
   <param name="BG-2_PROCESS_CONTROL"