saft 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a76e54f031fc17d96e1828ff1a106e97db9afb33a6726fd2ca62e8e6dacbdae2
-  data.tar.gz: 38f265b7da01df877e72c98e1f21227c05d8eadcd0d64d5e27a29feca7fbc406
+  metadata.gz: ccf2f23f9b7847e33f6bf8ae683c5358272be99de2d244a99349e66cdca67f86
+  data.tar.gz: d3e94ebf8bf376f472a30a50bfed25c69ac17c8df713f82c088c87c33b73d4c8
 SHA512:
-  metadata.gz: bc4dbd2a05b21d8f2b19adecfc2fcac11d869ad997160a4520c22673f9a68c4ae904c04f26157f7a26b5c82a55d86604145e00e0c80ac72700eba87f41625651
-  data.tar.gz: 7e0df900ce7eca5fa5124822c9a98e05b18f4394a3886672c261f68c33e5464abf63a13bcbf4e9d9f42601f7db6ed885e3d0de06348e3ecb7142cf2df01ef313
+  metadata.gz: 257c2ec4f99fd5f5ac175be4cd1dbb0648a8e2e4cb63aa2e256b95b448fe60ebc8b0098c8214d242674e009f62584a769ac239e1427bd14e18a24e5c60d8c2d2
+  data.tar.gz: e277f97a70ffe3055ca523765e5983d15ad9f5e905b248ce7f562fa89944e5f761a1ee43d0a9a69565f1c64d6b2a3600022d0801b4ff01eff38489a8e4867d94

data/.rubocop.yml

@@ -19,7 +19,7 @@ inherit_from:
   - .rubocop_strict.yml
 
 AllCops:
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.2
 
 # Sometimes we enable metrics cops
 # (which are disabled in Standard by default)

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## [Unreleased]
 
+## [0.3.0]
+- Update to version 1.30 of the xsd and changes required to support that
+
+## [0.2.1]
+
+- add invalid? to SAFT::V2::XsdValidate
+
 ## [0.1.0] - 2022-11-23
 
 - Initial release

data/lib/saft/v2/html.rb

@@ -200,7 +200,8 @@ module SAFT::V2
               t.tr {
                 t.th("Id")
                 t.th("Description")
-                t.th("Std account")
+                t.th("GroupingCategory")
+                t.th("GroupingCode")
                 t.th("Opening balance")
                 t.th("Closing balance")
                 t.th("Rest")
@@ -208,20 +209,26 @@ module SAFT::V2
             }
             t.tbody {
               @accounts.each do |account|
-                std_account = SAFT::V2::Norway.std_account(account.standard_account_id)
-                std_account_title = "Not found"
-                if std_account
-                  std_account_title = <<~TEXT
-                    Account no #{std_account.number}
-                    #{std_account.description_en}
-                    #{std_account.description_no}
+                category = SAFT::V2::Norway.grouping_category(account.grouping_code)
+                code_title = category_title = "Not found"
+                if category
+                  code_title = <<~TEXT
+                    Grouping code #{category.grouping_code}
+                    #{category.code_description_en}
+                    #{category.code_description_no}
+                  TEXT
+                  category_title = <<~TEXT
+                    Grouping category #{category.grouping_category}
+                    #{category.category_description_en}
+                    #{category.category_description_no}
                   TEXT
                 end
 
                 t.tr {
                   t.td(account.account_id)
                   t.td(account.account_description)
-                  t.td(account.standard_account_id, title: std_account_title)
+                  t.td(account.grouping_category, title: category_title)
+                  t.td(account.grouping_code, title: code_title)
                   t.td {
                     t.div(class: "flex justify-between") {
                       if account.opening_debit_balance
@@ -257,7 +264,8 @@ module SAFT::V2
                             .except(
                               :account_id,
                               :account_description,
-                              :standard_account_id,
+                              :grouping_category,
+                              :grouping_code,
                               :opening_debit_balance,
                               :opening_credit_balance,
                               :closing_debit_balance,
@@ -542,7 +550,7 @@ module SAFT::V2
       def title
         <<~TEXT
           #{account.account_id} #{account.account_description}
-          Std account #{account.standard_account_id}
+          Grouping category and code #{account.grouping_category} / #{account.grouping_code}
           opening balance #{HTML.format_big_decimal(account.opening_debit_balance || -account.opening_credit_balance)}
           closing balance #{HTML.format_big_decimal(account.closing_debit_balance || -account.closing_credit_balance)}
         TEXT

data/lib/saft/v2/norway.rb

@@ -36,13 +36,16 @@ module SAFT::V2::Norway
 
   VatTaxCodes = Types::Array.of(VatTaxCode)
 
-  class Account < Dry::Struct
-    attribute :number, Types::String
-    attribute :description_no, Types::String
-    attribute :description_en, Types::String
+  class GroupingCategory < Dry::Struct
+    attribute :grouping_category, Types::String
+    attribute :category_description_no, Types::String
+    attribute :category_description_en, Types::String
+    attribute :grouping_code, Types::String
+    attribute :code_description_no, Types::String
+    attribute :code_description_en, Types::String
   end
 
-  Accounts = Types::Array.of(Account)
+  GroupingCategories = Types::Array.of(GroupingCategory)
 
   def self.vat_codes
     return @vat_codes if defined?(@vat_codes)
@@ -65,24 +68,22 @@ module SAFT::V2::Norway
     @vat_codes = VatTaxCodes[vat_codes].freeze
   end
 
-  def self.std_account_map
-    return @std_account_map if defined?(@std_account_map)
+  def self.grouping_categories
+    return @grouping_categories if defined?(@grouping_categories)
 
-    @std_account_map = {}
-    general_ledger_accounts_2_digits
-      .each { @std_account_map[_1.number] = _1 }
-    general_ledger_accounts_4_digits
-      .each { @std_account_map[_1.number] = _1 }
+    @grouping_categories = {}
+    general_ledger_grouping_categories
+      .each { @grouping_categories[_1.grouping_code] = _1 }
 
-    @std_account_map
+    @grouping_categories
   end
 
-  def self.std_account(number)
-    std_account_map[number]
+  def self.grouping_category(grouping_code)
+    grouping_categories[grouping_code]
   end
 
-  def self.std_account!(number)
-    std_account_map.fetch(number)
+  def self.grouping_category!(grouping_code)
+    grouping_categories.fetch(grouping_code)
   end
 
   def self.vat_code_map
@@ -101,33 +102,28 @@ module SAFT::V2::Norway
     vat_code_map.fetch(code)
   end
 
-  def self.general_ledger_accounts_2_digits
-    return @general_ledger_accounts_2_digits if defined?(@general_ledger_accounts_2_digits)
-
-    @general_ledger_accounts_2_digits = parse_general_ledger_accounts(
-      SAFT::V2::Norway::PATH + "general_ledger_standard_accounts_2_character.csv",
-    )
-  end
-
-  def self.general_ledger_accounts_4_digits
-    return @general_ledger_accounts_4_digits if defined?(@general_ledger_accounts_4_digits)
+  def self.general_ledger_grouping_categories
+    return @general_ledger_grouping_categories if defined?(@general_ledger_grouping_categories)
 
-    @general_ledger_accounts_4_digits = parse_general_ledger_accounts(
-      SAFT::V2::Norway::PATH + "general_ledger_standard_accounts_4_character.csv",
+    @general_ledger_grouping_categories = parse_general_ledger_grouping_catergories(
+      SAFT::V2::Norway::PATH + "general_ledger_account_grouping_category_codes_income_statement_naeringsspesifikasjon.csv",
     )
   end
 
-  def self.parse_general_ledger_accounts(path)
-    accounts = []
-
+  def self.parse_general_ledger_grouping_catergories(path)
+    groupings = []
     CSV.foreach(path, headers: true, col_sep: ";") do |row|
-      accounts.push({
-        number: row["AccountID"],
-        description_no: row["DescriptionNOB"],
-        description_en: row["DescriptionENG"],
+
+      groupings.push({
+        grouping_category: row["GroupingCategory"],
+        category_description_no: row["CategoryDescriptionNOB"],
+        category_description_en: row["CategoryDescriptionENG"],
+        grouping_code: row["GroupingCode"],
+        code_description_no: row["CodeDescriptionNOB"],
+        code_description_en: row["CodeDescriptionENG"],
       })
     end
 
-    Accounts[accounts].freeze
+    GroupingCategories[groupings].freeze
   end
 end

data/lib/saft/v2/parse.rb

@@ -130,7 +130,8 @@ module SAFT::V2
           {
             analysis_type: xml.at_xpath("AnalysisType")&.content,
             analysis_id: xml.at_xpath("AnalysisID")&.content,
-            analysis_amount: parse(Types::AmountStructure, xml.at_xpath("AnalysisAmount")),
+            debit_analysis_amount: parse(Types::AmountStructure, xml.at_xpath("DebitAnalysisAmount")),
+            credit_analysis_amount: parse(Types::AmountStructure, xml.at_xpath("CreditAnalysisAmount")),
           }.compact
 
         when Types::AnalysisPartyInfoStructure.name
@@ -147,7 +148,8 @@ module SAFT::V2
             country: xml.at_xpath("Country")&.content,
             tax_base: xml.at_xpath("TaxBase")&.content,
             tax_base_description: xml.at_xpath("TaxBaseDescription")&.content,
-            tax_amount: parse(Types::AmountStructure, xml.at_xpath("TaxAmount")),
+            debit_tax_amount: parse(Types::AmountStructure, xml.at_xpath("DebitTaxAmount")),
+            credit_tax_amount: parse(Types::AmountStructure, xml.at_xpath("CreditTaxAmount")),
             tax_exemption_reason: xml.at_xpath("TaxExemptionReason")&.content,
             tax_declaration_period: xml.at_xpath("TaxDeclarationPeriod")&.content,
           }.compact
@@ -216,11 +218,7 @@ module SAFT::V2
             **parse(Types::CompanyStructure, xml),
             customer_id: xml.at_xpath("CustomerID")&.content,
             self_billing_indicator: xml.at_xpath("SelfBillingIndicator")&.content,
-            account_id: xml.at_xpath("AccountID")&.content,
-            opening_debit_balance: xml.at_xpath("OpeningDebitBalance")&.content,
-            opening_credit_balance: xml.at_xpath("OpeningCreditBalance")&.content,
-            closing_debit_balance: xml.at_xpath("ClosingDebitBalance")&.content,
-            closing_credit_balance: xml.at_xpath("ClosingCreditBalance")&.content,
+            balance_accounts: xml.xpath("BalanceAccount").map { |node| parse(Types::BalanceAccount, node) }.then { _1.empty? ? nil : _1 },
             party_info: parse(Types::PartyInfoStructure, xml.at_xpath("PartyInfo")),
           }.compact
 
@@ -229,12 +227,17 @@ module SAFT::V2
             **parse(Types::CompanyStructure, xml),
             supplier_id: xml.at_xpath("SupplierID")&.content,
             self_billing_indicator: xml.at_xpath("SelfBillingIndicator")&.content,
+            balance_accounts: xml.xpath("BalanceAccount").map { |node| parse(Types::BalanceAccount, node) }.then { _1.empty? ? nil : _1 },
+            party_info: parse(Types::PartyInfoStructure, xml.at_xpath("PartyInfo")),
+          }.compact
+
+        when Types::BalanceAccount.name
+          {
             account_id: xml.at_xpath("AccountID")&.content,
             opening_debit_balance: xml.at_xpath("OpeningDebitBalance")&.content,
             opening_credit_balance: xml.at_xpath("OpeningCreditBalance")&.content,
             closing_debit_balance: xml.at_xpath("ClosingDebitBalance")&.content,
             closing_credit_balance: xml.at_xpath("ClosingCreditBalance")&.content,
-            party_info: parse(Types::PartyInfoStructure, xml.at_xpath("PartyInfo")),
           }.compact
 
         when Types::TaxCodeDetails.name
@@ -320,11 +323,14 @@ module SAFT::V2
             period_year: xml.at_xpath("PeriodYear")&.content,
             transaction_date: xml.at_xpath("TransactionDate")&.content,
             source_id: xml.at_xpath("SourceID")&.content,
+            voucher_type: xml.at_xpath("VoucherType")&.content,
+            voucher_description: xml.at_xpath("VoucherDescription")&.content,
             transaction_type: xml.at_xpath("TransactionType")&.content,
             description: xml.at_xpath("Description")&.content,
             batch_id: xml.at_xpath("BatchID")&.content,
             system_entry_date: xml.at_xpath("SystemEntryDate")&.content,
             gl_posting_date: xml.at_xpath("GLPostingDate")&.content,
+            modification_date: xml.at_xpath("ModificationDate")&.content,
             system_id: xml.at_xpath("SystemID")&.content,
             lines: xml.xpath("Line").map { |node| parse(Types::Line, node) }.then { _1.empty? ? nil : _1 },
           }.compact

data/lib/saft/v2/scribe.rb

@@ -62,7 +62,7 @@ module SAFT::V2
         xml.SoftwareVersion(struct.software_version)
         xml.Company { build(struct.company) }
         xml.DefaultCurrencyCode(struct.default_currency_code)
-        xml.SelectionCriteria { build(struct.selection_criteria) } if struct.selection_criteria
+        xml.SelectionCriteria { build(struct.selection_criteria) }
         xml.HeaderComment(struct.header_comment) if struct.header_comment
         xml.TaxAccountingBasis(struct.tax_accounting_basis)
         xml.TaxEntity(struct.tax_entity) if struct.tax_entity
@@ -73,22 +73,30 @@ module SAFT::V2
         build_company_structure(struct)
         xml.CustomerID(struct.customer_id)
         xml.SelfBillingIndicator(struct.self_billing_indicator) if struct.self_billing_indicator
-        xml.AccountID(struct.account_id) if struct.account_id
-        xml.OpeningDebitBalance(struct.opening_debit_balance.to_s("F")) if struct.opening_debit_balance
-        xml.OpeningCreditBalance(struct.opening_credit_balance.to_s("F")) if struct.opening_credit_balance
-        xml.ClosingDebitBalance(struct.closing_debit_balance.to_s("F")) if struct.closing_debit_balance
-        xml.ClosingCreditBalance(struct.closing_credit_balance.to_s("F")) if struct.closing_credit_balance
+        struct.balance_accounts.each do |balance|
+          xml.BalanceAccount {
+            xml.AccountID(balance.account_id) if balance.account_id
+            xml.OpeningDebitBalance(balance.opening_debit_balance.to_s("F")) if balance.opening_debit_balance
+            xml.OpeningCreditBalance(balance.opening_credit_balance.to_s("F")) if balance.opening_credit_balance
+            xml.ClosingDebitBalance(balance.closing_debit_balance.to_s("F")) if balance.closing_debit_balance
+            xml.ClosingCreditBalance(balance.closing_credit_balance.to_s("F")) if balance.closing_credit_balance
+          }
+        end
         xml.PartyInfo { build(struct.party_info) } if struct.party_info
 
       when Types::Supplier.name.split("::").last
         build_company_structure(struct)
         xml.SupplierID(struct.supplier_id)
         xml.SelfBillingIndicator(struct.self_billing_indicator) if struct.self_billing_indicator
-        xml.AccountID(struct.account_id) if struct.account_id
-        xml.OpeningDebitBalance(struct.opening_debit_balance.to_s("F")) if struct.opening_debit_balance
-        xml.OpeningCreditBalance(struct.opening_credit_balance.to_s("F")) if struct.opening_credit_balance
-        xml.ClosingDebitBalance(struct.closing_debit_balance.to_s("F")) if struct.closing_debit_balance
-        xml.ClosingCreditBalance(struct.closing_credit_balance.to_s("F")) if struct.closing_credit_balance
+        struct.balance_accounts.each do |balance|
+          xml.BalanceAccount {
+            xml.AccountID(balance.account_id) if balance.account_id
+            xml.OpeningDebitBalance(balance.opening_debit_balance.to_s("F")) if balance.opening_debit_balance
+            xml.OpeningCreditBalance(balance.opening_credit_balance.to_s("F")) if balance.opening_credit_balance
+            xml.ClosingDebitBalance(balance.closing_debit_balance.to_s("F")) if balance.closing_debit_balance
+            xml.ClosingCreditBalance(balance.closing_credit_balance.to_s("F")) if balance.closing_credit_balance
+          }
+        end
         xml.PartyInfo { build(struct.party_info) } if struct.party_info
 
       when Types::Owner.name.split("::").last
@@ -166,7 +174,8 @@ module SAFT::V2
       when Types::AnalysisStructure.name.split("::").last
         xml.AnalysisType(struct.analysis_type) if struct.analysis_type
         xml.AnalysisID(struct.analysis_id) if struct.analysis_id
-        xml.AnalysisAmount { build(struct.analysis_amount) } if struct.analysis_amount
+        xml.DebitAnalysisAmount { build(struct.debit_analysis_amount) } if struct.debit_analysis_amount
+        xml.CreditAnalysisAmount { build(struct.credit_analysis_amount) } if struct.credit_analysis_amount
 
       when Types::AnalysisPartyInfoStructure.name.split("::").last
         xml.AnalysisType(struct.analysis_type)
@@ -179,7 +188,8 @@ module SAFT::V2
         xml.Country(struct.country) if struct.country
         xml.TaxBase(struct.tax_base.to_s("F")) if struct.tax_base
         xml.TaxBaseDescription(struct.tax_base_description) if struct.tax_base_description
-        xml.TaxAmount { build(struct.tax_amount) }
+        xml.DebitTaxAmount { build(struct.debit_tax_amount) } if struct.debit_tax_amount
+        xml.CreditTaxAmount { build(struct.credit_tax_amount) } if struct.credit_tax_amount
         xml.TaxExemptionReason(struct.tax_exemption_reason) if struct.tax_exemption_reason
         xml.TaxDeclarationPeriod(struct.tax_declaration_period) if struct.tax_declaration_period
 
@@ -216,15 +226,14 @@ module SAFT::V2
         xml.SoftwareVersion(struct.software_version)
         xml.Company { build(struct.company) }
         xml.DefaultCurrencyCode(struct.default_currency_code)
-        xml.SelectionCriteria { build(struct.selection_criteria) } if struct.selection_criteria
+        xml.SelectionCriteria { build(struct.selection_criteria) }
         xml.HeaderComment(struct.header_comment) if struct.header_comment
 
       when Types::Account.name.split("::").last
         xml.AccountID(struct.account_id)
         xml.AccountDescription(struct.account_description)
-        xml.StandardAccountID(struct.standard_account_id) if struct.standard_account_id
-        xml.GroupingCategory(struct.grouping_category) if struct.grouping_category
-        xml.GroupingCode(struct.grouping_code) if struct.grouping_code
+        xml.GroupingCategory(struct.grouping_category)
+        xml.GroupingCode(struct.grouping_code)
         xml.AccountType(struct.account_type)
         xml.AccountCreationDate(struct.account_creation_date) if struct.account_creation_date
         xml.OpeningDebitBalance(struct.opening_debit_balance.to_s("F")) if struct.opening_debit_balance
@@ -333,11 +342,14 @@ module SAFT::V2
         xml.PeriodYear(struct.period_year) if struct.period_year
         xml.TransactionDate(struct.transaction_date) if struct.transaction_date
         xml.SourceID(struct.source_id) if struct.source_id
+        xml.VoucherType(struct.voucher_type) if struct.voucher_type
+        xml.VoucherDescription(struct.voucher_description) if struct.voucher_description
         xml.TransactionType(struct.transaction_type) if struct.transaction_type
         xml.Description(struct.description) if struct.description
         xml.BatchID(struct.batch_id) if struct.batch_id
         xml.SystemEntryDate(struct.system_entry_date) if struct.system_entry_date
         xml.GLPostingDate(struct.gl_posting_date) if struct.gl_posting_date
+        xml.ModificationDate(struct.modification_date) if struct.modification_date
         xml.SystemID(struct.system_id) if struct.system_id
         struct.lines&.each do |line|
           xml.Line { build(line) }

data/lib/saft/v2/types.rb

@@ -55,7 +55,8 @@ module SAFT::V2::Types
         klass = Class.new(Dry::Struct) do
           attribute(:analysis_type, base::SAFcodeType)
           attribute(:analysis_id, base::SAFlongtextType)
-          attribute(:analysis_amount, base::AmountStructure.optional.meta(omittable: true))
+          attribute(:debit_analysis_amount, base::AmountStructure.optional.meta(omittable: true))
+          attribute(:credit_analysis_amount, base::AmountStructure.optional.meta(omittable: true))
         end
 
         base.const_set(:AnalysisStructure, klass)
@@ -69,12 +70,13 @@ module SAFT::V2::Types
 
         klass = Class.new(Dry::Struct) do
           attribute(:tax_type, base::SAFcodeType.optional.meta(omittable: true))
-          attribute(:tax_code, base::SAFmiddle1textType.optional.meta(omittable: true))
+          attribute(:tax_code, base::SAFmiddle2textType.optional.meta(omittable: true))
           attribute(:tax_percentage, Types::Decimal.optional.meta(omittable: true))
           attribute(:country, base::ISOCountryCode.optional.meta(omittable: true))
           attribute(:tax_base, Types::Decimal.optional.meta(omittable: true))
           attribute(:tax_base_description, base::SAFmiddle2textType.optional.meta(omittable: true))
-          attribute(:tax_amount, base::AmountStructure)
+          attribute(:debit_tax_amount, base::AmountStructure.optional.meta(omittable: true))
+          attribute(:credit_tax_amount, base::AmountStructure.optional.meta(omittable: true))
           attribute(:tax_exemption_reason, base::SAFmiddle2textType.optional.meta(omittable: true))
           attribute(:tax_declaration_period, base::SAFmiddle1textType.optional.meta(omittable: true))
         end
@@ -143,13 +145,13 @@ module SAFT::V2::Types
         base.const_set(:PartyInfoStructure, klass)
 
         klass = Class.new(Dry::Struct) do
-          attribute(:street_name, base::SAFmiddle2textType.optional.meta(omittable: true))
-          attribute(:number, base::SAFshorttextType.optional.meta(omittable: true))
-          attribute(:additional_address_detail, base::SAFmiddle2textType.optional.meta(omittable: true))
+          attribute(:street_name, base::SAFlongtextType.optional.meta(omittable: true))
+          attribute(:number, base::SAFmiddle2textType.optional.meta(omittable: true))
+          attribute(:additional_address_detail, base::SAFlongtextType.optional.meta(omittable: true))
           attribute(:building, base::SAFmiddle1textType.optional.meta(omittable: true))
-          attribute(:city, base::SAFmiddle1textType.optional.meta(omittable: true))
-          attribute(:postal_code, base::SAFshorttextType.optional.meta(omittable: true))
-          attribute(:region, base::SAFmiddle1textType.optional.meta(omittable: true))
+          attribute(:city, base::SAFlongtextType.optional.meta(omittable: true))
+          attribute(:postal_code, base::SAFmiddle2textType.optional.meta(omittable: true))
+          attribute(:region, base::SAFlongtextType.optional.meta(omittable: true))
           attribute(:country, base::ISOCountryCode.optional.meta(omittable: true))
           attribute(:address_type, base::AddressType.optional.meta(omittable: true))
         end
@@ -192,7 +194,7 @@ module SAFT::V2::Types
 
         klass = Class.new(Dry::Struct) do
           attribute(:registration_number, base::SAFmiddle1textType.optional.meta(omittable: true))
-          attribute(:name, base::SAFmiddle2textType)
+          attribute(:name, base::SAFlongtextType)
           attribute(:addresses, Types::Array.of(base::AddressStructure))
           attribute(:contacts, Types::Array.of(base::ContactInformationStructure).optional.meta(omittable: true))
           attribute(:tax_registrations, Types::Array.of(base::TaxIDStructure).optional.meta(omittable: true))
@@ -203,7 +205,7 @@ module SAFT::V2::Types
 
         klass = Class.new(base::CompanyStructure) do
           attribute(:registration_number, base::SAFmiddle1textType)
-          attribute(:name, base::SAFmiddle2textType)
+          attribute(:name, base::SAFlongtextType)
           attribute(:addresses, Types::Array.of(base::AddressStructure))
           attribute(:contacts, Types::Array.of(base::ContactInformationStructure))
           attribute(:tax_registrations, Types::Array.of(base::TaxIDStructure).optional.meta(omittable: true))
@@ -223,7 +225,7 @@ module SAFT::V2::Types
           attribute(:software_version, base::SAFshorttextType)
           attribute(:company, base::CompanyHeaderStructure)
           attribute(:default_currency_code, base::ISOCurrencyCode)
-          attribute(:selection_criteria, base::SelectionCriteriaStructure.optional.meta(omittable: true))
+          attribute(:selection_criteria, base::SelectionCriteriaStructure)
           attribute(:header_comment, base::SAFlongtextType.optional.meta(omittable: true))
         end
 
@@ -232,7 +234,7 @@ module SAFT::V2::Types
         klass = Class.new(base::HeaderStructure) do
           attribute(:tax_accounting_basis, base::SAFshorttextType)
           attribute(:tax_entity, base::SAFmiddle2textType.optional.meta(omittable: true))
-          attribute(:user_id, base::SAFmiddle1textType.optional.meta(omittable: true))
+          attribute(:user_id, base::SAFlongtextType.optional.meta(omittable: true))
           attribute(:audit_file_sender, base::CompanyStructure.optional.meta(omittable: true))
         end
 
@@ -241,9 +243,8 @@ module SAFT::V2::Types
         klass = Class.new(Dry::Struct) do
           attribute(:account_id, base::SAFmiddle2textType)
           attribute(:account_description, base::SAFlongtextType)
-          attribute(:standard_account_id, base::SAFmiddle1textType.optional.meta(omittable: true))
-          attribute(:grouping_category, base::SAFmiddle1textType.optional.meta(omittable: true))
-          attribute(:grouping_code, base::SAFmiddle1textType.optional.meta(omittable: true))
+          attribute(:grouping_category, base::SAFlongtextType)
+          attribute(:grouping_code, base::SAFmiddle1textType)
           attribute(:account_type, base::SAFshorttextType)
           attribute(:account_creation_date, Types::Date.optional.meta(omittable: true))
           attribute(:opening_debit_balance, base::SAFmonetaryType.optional.meta(omittable: true))
@@ -254,14 +255,20 @@ module SAFT::V2::Types
 
         base.const_set(:Account, klass)
 
-        klass = Class.new(base::CompanyStructure) do
-          attribute(:customer_id, base::SAFmiddle1textType)
-          attribute(:self_billing_indicator, base::SAFcodeType.optional.meta(omittable: true))
+        klass = Class.new(Dry::Struct) do
           attribute(:account_id, base::SAFmiddle2textType.optional.meta(omittable: true))
           attribute(:opening_debit_balance, base::SAFmonetaryType.optional.meta(omittable: true))
           attribute(:opening_credit_balance, base::SAFmonetaryType.optional.meta(omittable: true))
           attribute(:closing_debit_balance, base::SAFmonetaryType.optional.meta(omittable: true))
           attribute(:closing_credit_balance, base::SAFmonetaryType.optional.meta(omittable: true))
+        end
+
+        base.const_set(:BalanceAccount, klass)
+
+        klass = Class.new(base::CompanyStructure) do
+          attribute(:customer_id, base::SAFmiddle1textType)
+          attribute(:self_billing_indicator, base::SAFcodeType.optional.meta(omittable: true))
+          attribute(:balance_accounts, Types::Array.of(base::BalanceAccount))
           attribute(:party_info, base::PartyInfoStructure.optional.meta(omittable: true))
         end
 
@@ -270,18 +277,14 @@ module SAFT::V2::Types
         klass = Class.new(base::CompanyStructure) do
           attribute(:supplier_id, base::SAFmiddle1textType)
           attribute(:self_billing_indicator, base::SAFcodeType.optional.meta(omittable: true))
-          attribute(:account_id, base::SAFmiddle2textType.optional.meta(omittable: true))
-          attribute(:opening_debit_balance, base::SAFmonetaryType.optional.meta(omittable: true))
-          attribute(:opening_credit_balance, base::SAFmonetaryType.optional.meta(omittable: true))
-          attribute(:closing_debit_balance, base::SAFmonetaryType.optional.meta(omittable: true))
-          attribute(:closing_credit_balance, base::SAFmonetaryType.optional.meta(omittable: true))
+          attribute(:balance_accounts, Types::Array.of(base::BalanceAccount))
           attribute(:party_info, base::PartyInfoStructure.optional.meta(omittable: true))
         end
 
         base.const_set(:Supplier, klass)
 
         klass = Class.new(Dry::Struct) do
-          attribute(:tax_code, base::SAFmiddle1textType)
+          attribute(:tax_code, base::SAFmiddle2textType)
           attribute(:effective_date, Types::Date.optional.meta(omittable: true))
           attribute(:expiration_date, Types::Date.optional.meta(omittable: true))
           attribute(:description, base::SAFlongtextType.optional.meta(omittable: true))
@@ -378,11 +381,14 @@ module SAFT::V2::Types
           attribute(:period_year, Types::Integer)
           attribute(:transaction_date, Types::Date)
           attribute(:source_id, base::SAFmiddle1textType.optional.meta(omittable: true))
+          attribute(:voucher_type, base::SAFmiddle2textType.optional.meta(omittable: true))
+          attribute(:voucher_description, base::SAFmiddle2textType.optional.meta(omittable: true))
           attribute(:transaction_type, base::SAFshorttextType.optional.meta(omittable: true))
           attribute(:description, base::SAFlongtextType)
           attribute(:batch_id, base::SAFmiddle1textType.optional.meta(omittable: true))
           attribute(:system_entry_date, Types::Date)
           attribute(:gl_posting_date, Types::Date)
+          attribute(:modification_date, Types::Date.optional.meta(omittable: true))
           # ignored since xsd said "Not in use."
           # attribute :CustomerID, base::SAFmiddle1textType.optional.meta(omittable: true)
           # ignored since xsd said "Not in use."

data/lib/saft/v2/xsd_validate.rb

@@ -3,7 +3,7 @@
 require "nokogiri"
 require "pathname"
 
-XSD_PATH = Pathname.new(__dir__) + ".." + ".." + ".." + "vendor" + "SAF-T_Financial_Schema_NO_1.10.xsd"
+XSD_PATH = Pathname.new(__dir__) + ".." + ".." + ".." + "vendor" + "Norwegian_SAF-T_Financial_Schema_v_1.30.xsd"
 
 module SAFT::V2
   class XsdValidate
@@ -17,12 +17,9 @@ module SAFT::V2
       # https://nokogiri.org/rdoc/Nokogiri/XML/SyntaxError.html
     end
 
-    def valid?
-      @xml_errors.none?
-    end
+    def valid? = @xml_errors.none?
+    def invalid? = !valid?
 
-    def errors
-      @xml_errors
-    end
+    def errors = @xml_errors
   end
 end

data/lib/saft/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SAFT
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end