From 2738b49dd6f673b0d6da074c24401e6757968955 Mon Sep 17 00:00:00 2001 From: Jelte Jansen Date: Tue, 1 Nov 2022 23:09:33 +0100 Subject: [PATCH] Add the fixes from upstream PR 333 See https://github.com/ConnectingEurope/eInvoicing-EN16931/pull/333 --- .../CenPC434/CII/EN16931-CII-model.sch | 38 ++++++++-------- .../EN16931-CII-validation-preprocessed.sch | 43 ++++++++----------- .../CenPC434/UBL/EN16931-UBL-model.sch | 30 ++++++------- 3 files changed, 53 insertions(+), 58 deletions(-) diff --git a/schematron/nlcius-cii/CenPC434/CII/EN16931-CII-model.sch b/schematron/nlcius-cii/CenPC434/CII/EN16931-CII-model.sch index 600df2f..6e6e65d 100644 --- a/schematron/nlcius-cii/CenPC434/CII/EN16931-CII-model.sch +++ b/schematron/nlcius-cii/CenPC434/CII/EN16931-CII-model.sch @@ -6,17 +6,17 @@ - - - - - - - + + + + + + + - + - + @@ -26,11 +26,11 @@ - + - + @@ -53,17 +53,17 @@ - + - - - + + + - - - - + + + + diff --git a/schematron/nlcius-cii/CenPC434/preprocessed/EN16931-CII-validation-preprocessed.sch b/schematron/nlcius-cii/CenPC434/preprocessed/EN16931-CII-validation-preprocessed.sch index 2118816..b90bea7 100644 --- a/schematron/nlcius-cii/CenPC434/preprocessed/EN16931-CII-validation-preprocessed.sch +++ b/schematron/nlcius-cii/CenPC434/preprocessed/EN16931-CII-validation-preprocessed.sch @@ -1,9 +1,4 @@ - @@ -22,7 +17,7 @@ - [BR-52]-Each Additional supporting document (BG-24) shall contain a Supporting document reference (BT-122). + [BR-52]-Each Additional supporting document (BG-24) shall contain a Supporting document reference (BT-122). [BR-51]-In accordance with card payments security standards an invoice should never include a full card primary account number (BT-97). At the moment PCI Security Standards Council has defined that the first 6 digits and last 4 digits are the maximum number of digits to be shown. @@ -32,7 +27,7 @@ [BR-61]-If the Payment means type code (BT-81) means SEPA credit transfer, Local credit transfer or Non-SEPA international credit transfer, the Payment account identifier (BT-84) shall be present. - [BR-57]-Each Deliver to address (BG-15) shall contain a Deliver to country code (BT-80). + [BR-57]-Each Deliver to address (BG-15) shall contain a Deliver to country code (BT-80). [BR-31]-Each Document level allowance (BG-20) shall have a Document level allowance amount (BT-92). @@ -75,20 +70,20 @@ [BR-DEC-18]-The allowed maximum number of decimals for the Amount due for payment (BT-115) is 2. - [BR-01]-An Invoice shall have a Specification identifier (BT-24). - [BR-02]-An Invoice shall have an Invoice number (BT-1). - [BR-03]-An Invoice shall have an Invoice issue date (BT-2). - [BR-04]-An Invoice shall have an Invoice type code (BT-3). - [BR-05]-An Invoice shall have an Invoice currency code (BT-5). - [BR-06]-An Invoice shall contain the Seller name (BT-27). - [BR-07]-An Invoice shall contain the Buyer name (BT-44). + [BR-01]-An Invoice shall have a Specification identifier (BT-24). + [BR-02]-An Invoice shall have an Invoice number (BT-1). + [BR-03]-An Invoice shall have an Invoice issue date (BT-2). + [BR-04]-An Invoice shall have an Invoice type code (BT-3). + [BR-05]-An Invoice shall have an Invoice currency code (BT-5). + [BR-06]-An Invoice shall contain the Seller name (BT-27). + [BR-07]-An Invoice shall contain the Buyer name (BT-44). [BR-08]-An Invoice shall contain the Seller postal address (BG-5). - [BR-09]-The Seller postal address (BG-5) shall contain a Seller country code (BT-40). + [BR-09]-The Seller postal address (BG-5) shall contain a Seller country code (BT-40). [BR-10]-An Invoice shall contain the Buyer postal address (BG-8). - [BR-11]-The Buyer postal address shall contain a Buyer country code (BT-55). + [BR-11]-The Buyer postal address shall contain a Buyer country code (BT-55). [BR-16]-An Invoice shall have at least one Invoice line (BG-25). - [BR-62]-The Seller electronic address (BT-34) shall have a Scheme identifier. - [BR-63]-The Buyer electronic address (BT-49) shall have a Scheme identifier. + [BR-62]-The Seller electronic address (BT-34) shall have a Scheme identifier. + [BR-63]-The Buyer electronic address (BT-49) shall have a Scheme identifier. [BR-CO-15]-Invoice total amount with VAT (BT-112) = Invoice total amount without VAT (BT-109) + Invoice total VAT amount (BT-110). [BR-CO-25]-In case the Amount due for payment (BT-115) is positive, either the Payment due date (BT-9) or the Payment terms (BT-20) shall be present. [BR-S-01]-An Invoice that contains an Invoice line (BG-25), a Document level allowance (BG-20) or a Document level charge (BG-21) where the VAT category code (BT-151, BT-95 or BT-102) is "Standard rated" shall contain in the VAT breakdown (BG-23) at least one VAT category code (BT-118) equal with "Standard rated". @@ -104,16 +99,16 @@ [BR-B-02]-An Invoice that contains an Invoice line (BG-25), a Document level allowance (BG-20) or a Document level charge (BG-21) where the VAT category code (BT-151, BT-95 or BT-102) is “Split payment" shall not contain an invoice line (BG-25), a Document level allowance (BG-20) or a Document level charge (BG-21) where the VAT category code (BT-151, BT-95 or BT-102) is “Standard rated”. - [BR-21]-Each Invoice line (BG-25) shall have an Invoice line identifier (BT-126). + [BR-21]-Each Invoice line (BG-25) shall have an Invoice line identifier (BT-126). [BR-22]-Each Invoice line (BG-25) shall have an Invoiced quantity (BT-129). [BR-23]-An Invoice line (BG-25) shall have an Invoiced quantity unit of measure code (BT-130). [BR-24]-Each Invoice line (BG-25) shall have an Invoice line net amount (BT-131). - [BR-25]-Each Invoice line (BG-25) shall contain the Item name (BT-153). + [BR-25]-Each Invoice line (BG-25) shall contain the Item name (BT-153). [BR-26]-Each Invoice line (BG-25) shall contain the Item net price (BT-146). [BR-27]-The Item net price (BT-146) shall NOT be negative. [BR-28]-The Item gross price (BT-148) shall NOT be negative. - [BR-64]-The Item standard identifier (BT-157) shall have a Scheme identifier. - [BR-65]-The Item classification identifier (BT-158) shall have a Scheme identifier. + [BR-64]-The Item standard identifier (BT-157) shall have a Scheme identifier. + [BR-65]-The Item classification identifier (BT-158) shall have a Scheme identifier. [BR-CO-04]-Each Invoice line (BG-25) shall be categorized with an Invoiced item VAT category code (BT-151). [BR-CO-18]-An Invoice shall at least have one VAT breakdown group (BG-23). [BR-DEC-23]-The allowed maximum number of decimals for the Invoice line net amount (BT-131) is 2. @@ -153,7 +148,7 @@ [BR-CO-27]- Either the IBAN or a Proprietary ID (BT-84) shall be used. - [BR-55]-Each Preceding Invoice reference (BG-3) shall contain a Preceding Invoice reference (BT-25). + [BR-55]-Each Preceding Invoice reference (BG-3) shall contain a Preceding Invoice reference (BT-25). [BR-CO-26]-In order for the buyer to automatically identify a supplier, the Seller identifier (BT-29), the Seller legal registration identifier (BT-30) and/or the Seller VAT identifier (BT-31) shall be present. @@ -162,7 +157,7 @@ [BR-18]-The Seller tax representative name (BT-62) shall be provided in the Invoice, if the Seller (BG-4) has a Seller tax representative party (BG-11). [BR-19]-The Seller tax representative postal address (BG-12) shall be provided in the Invoice, if the Seller (BG-4) has a Seller tax representative party (BG-11). [BR-20]-The Seller tax representative postal address (BG-12) shall contain a Tax representative country code (BT-69), if the Seller (BG-4) has a Seller tax representative party (BG-11). - [BR-56]-Each Seller tax representative party (BG-11) shall have a Seller tax representative VAT identifier (BT-63). + [BR-56]-Each Seller tax representative party (BG-11) shall have a Seller tax representative VAT identifier (BT-63). [BR-CO-14]-Invoice total VAT amount (BT-110) = Σ VAT category tax amount (BT-117). diff --git a/schematron/si-ubl-2.0/CenPC434/UBL/EN16931-UBL-model.sch b/schematron/si-ubl-2.0/CenPC434/UBL/EN16931-UBL-model.sch index e339faf..07590b2 100644 --- a/schematron/si-ubl-2.0/CenPC434/UBL/EN16931-UBL-model.sch +++ b/schematron/si-ubl-2.0/CenPC434/UBL/EN16931-UBL-model.sch @@ -5,31 +5,31 @@ --> - - - - - - - + + + + + + + - + - + - + - - + + - + @@ -50,9 +50,9 @@ - + - +