xrechnung 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb95657d503486400ca7f7ff6664ae22a0cbbeb4e6e6588ed9edab03ebd31ee9
-  data.tar.gz: '0926fa0b0dfb0ffd51cc271cfca28897936bbe9b5a93a38c577a17da415925fe'
+  metadata.gz: bb9e44c799aaa06982ea5b1fde9dda518822ad63b88c0519f43a85f4bd29ab7d
+  data.tar.gz: e4e84a5c0bd1c7e049b2944c513c3ab8b682d750dbaadbf37f5169e75b716315
 SHA512:
-  metadata.gz: 84a2cc18d6ace05c0355154f0ae0addd91d23516d5654f50f11d9ea6c01d94e12ac8ea7d615d5feaf18d2e90fb20bc7fe9b9f700f93351c0ae6aa43272f057ae
-  data.tar.gz: edb7fb59d4435c67acd2e54bce2222a534d0752cb17572873005de1e99f44fabc06cecd8d4b328ccd05be70b0ac62ae75b68e3183bd9dff957429c587f3905b2
+  metadata.gz: 676b9a6e8140f39b2b12b64abf869c97cd6a5353e369e2d8d26e86d0e4242ad7c31141b084a351492b20b085901b3f891732fd4cc12ac497c4ac0e53b277ed66
+  data.tar.gz: 50e8c1b14ae64fae08567276627446a67ea3a70a4fda48e80a8ce96024c78b24331d9487677d1f18c5fb1fbb5f71c98b64769fbccb042d50271ee2b791037157

data/.github/workflows/rspec.yml

@@ -8,7 +8,7 @@ jobs:
     name: Ruby ${{ matrix.ruby }}
     strategy:
       matrix:
-        ruby:  ['2.7', '3.0', '3.2']
+        ruby:  ['3.0', '3.2', '3.3']
 
     steps:
     - uses: actions/checkout@v4

data/.gitignore

@@ -14,6 +14,7 @@
 .ruby-version
 .ruby-gemset
 .gems/
+*.gem
 
 # validator working directory
 validator/

data/.rubocop.yml

@@ -12,7 +12,7 @@ AllCops:
   - Gemfile
   DisplayCopNames: true
   StyleGuideCopsOnly: false
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
 
 ## Layout Cops - https://docs.rubocop.org/rubocop/cops_layout.html
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xrechnung (0.3.0)
+    xrechnung (0.5.0)
       builder (~> 3.2)
 
 GEM
@@ -15,45 +15,42 @@ GEM
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    json (2.7.2)
+    json (2.9.0)
     language_server-protocol (3.17.0.3)
     mini_mime (1.1.5)
     multi_xml (0.6.0)
-    parallel (1.25.1)
-    parser (3.3.3.0)
+    parallel (1.26.3)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
-    racc (1.8.0)
+    racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
-    regexp_parser (2.9.2)
-    rexml (3.3.1)
-      strscan
+    regexp_parser (2.9.3)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.64.1)
+    rspec-support (3.13.2)
+    rubocop (1.69.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.36.2)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
@@ -68,8 +65,9 @@ GEM
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     rubyzip (2.3.2)
-    strscan (3.1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.1.2)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -4,19 +4,19 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec
 
 namespace :validator do
   VALIDATOR_SOURCES = {
-    tool: {
-      filename:    "validator/validationtool-1.4.1-standalone.jar",
-      release_url: "https://github.com/itplr-kosit/validator/releases/download/v1.4.1/validationtool-1.4.1.zip",
+    tool:      {
+      filename:    "validator/validationtool-1.5.0-standalone.jar",
+      release_url: "https://github.com/itplr-kosit/validator/releases/download/v1.5.0/validator-1.5.0-distribution.zip",
     },
     scenarios: {
       filename:    "validator/scenarios.xml",
-      release_url: "https://github.com/itplr-kosit/validator-configuration-xrechnung/releases/download/release-2023-05-12/validator-configuration-xrechnung_2.3.1_2023-05-12.zip",
-    }
-  }
+      release_url: "https://github.com/itplr-kosit/validator-configuration-xrechnung/releases/download/release-2024-10-31/validator-configuration-xrechnung_3.0.2_2024-10-31.zip",
+    },
+  }.freeze
 
   VALIDATOR_SOURCES.each do |_, v|
     base    = Pathname.new(__dir__).join("validator")
@@ -50,6 +50,6 @@ namespace :validator do
     tool      = VALIDATOR_SOURCES[:tool][:filename]
     scenarios = VALIDATOR_SOURCES[:scenarios][:filename]
 
-    sh "java -jar #{tool} -s #{scenarios} --output-directory #{output} --html --disable-gui #{fixtures}"
+    sh "java -jar #{tool} -r validator -s #{scenarios} --output-directory #{output} --html #{fixtures}"
   end
 end

data/lib/xrechnung/allowance_charge.rb

@@ -6,17 +6,39 @@ module Xrechnung
     #   @return [TrueClass, FalseClass]
     member :charge_indicator, type: [TrueClass, FalseClass]
 
+    # @!attribute allowance_charge_reason_code
+    #   @return [String]
+    member :allowance_charge_reason_code, type: Integer
+
+    # @!attribute allowance_charge_reason
+    #   @return [String]
+    member :allowance_charge_reason, type: String
+
+    # @!attribute multiplier_factor_numeric
+    #   @return [BigDecimal]
+    member :multiplier_factor_numeric, type: BigDecimal, transform_value: ->(v) { BigDecimal(v, 0) }
+
     # @!attribute amount
     #   @return [Xrechnung::Currency]
     member :amount, type: Xrechnung::Currency
 
     # @!attribute base_amount
     #   @return [Xrechnung::Currency]
-    member :base_amount, type: Xrechnung::Currency
+    member :base_amount, type: Xrechnung::Currency, optional: true
+
+    # @!attribute tax_category
+    #   @return [Xrechnung::TaxCategory]
+    member :tax_category, type: Xrechnung::TaxCategory
 
     def initialize(**kwargs)
-      kwargs[:amount]      = Currency::EUR(kwargs[:amount])
-      kwargs[:base_amount] = Currency::EUR(kwargs[:base_amount])
+      unless kwargs[:amount].is_a?(Currency)
+        kwargs[:amount] = Currency::EUR(kwargs[:amount])
+      end
+
+      unless kwargs[:base_amount].is_a?(Currency) || kwargs[:base_amount].nil?
+        kwargs[:base_amount] = Currency::EUR(kwargs[:base_amount])
+      end
+
       super(**kwargs)
     end
 
@@ -24,8 +46,26 @@ module Xrechnung
     def to_xml(xml)
       xml.cac :AllowanceCharge do
         xml.cbc :ChargeIndicator, charge_indicator
+
+        if allowance_charge_reason_code
+          xml.cbc :AllowanceChargeReasonCode, allowance_charge_reason_code
+        end
+
+        if allowance_charge_reason
+          xml.cbc :AllowanceChargeReason, allowance_charge_reason
+        end
+
+        if multiplier_factor_numeric
+          xml.cbc :MultiplierFactorNumeric, format("%.2f", multiplier_factor_numeric)
+        end
+
         xml.cbc :Amount, *amount.xml_args
-        xml.cbc :BaseAmount, *base_amount.xml_args
+
+        if base_amount
+          xml.cbc :BaseAmount, *base_amount.xml_args
+        end
+
+        tax_category&.to_xml(xml)
       end
     end
   end

data/lib/xrechnung/currency.rb

@@ -8,7 +8,7 @@ module Xrechnung
     end
 
     def xml_args
-      [value_to_s, currencyID: currency_id]
+      [value_to_s, { currencyID: currency_id }]
     end
   end
 

data/lib/xrechnung/invoice_line.rb

@@ -28,6 +28,10 @@ module Xrechnung
     #   @return [Xrechnung::Price]
     member :price, type: Xrechnung::Price
 
+    # @!attribute allowance_charges
+    #   @return [Array<Xrechnung::AllowanceCharge>]
+    member :allowance_charges, type: Array, default: []
+
     def initialize(**kwargs)
       unless kwargs[:line_extension_amount].is_a?(Currency)
         kwargs[:line_extension_amount] = Currency::EUR(kwargs[:line_extension_amount])
@@ -42,8 +46,9 @@ module Xrechnung
         xml.cbc :InvoicedQuantity, invoiced_quantity.amount_to_s, unitCode: invoiced_quantity.unit_code
         xml.cbc :LineExtensionAmount, *line_extension_amount.xml_args
 
-        unless self.class.members[:invoice_period].optional && invoice_period.nil?
-          invoice_period&.to_xml(xml)
+        invoice_period&.to_xml(xml) unless self.class.members[:invoice_period].optional && invoice_period.nil?
+        allowance_charges.each do |allowance_charge|
+          allowance_charge.to_xml(xml)
         end
         item&.to_xml(xml)
         price&.to_xml(xml)

data/lib/xrechnung/item.rb

@@ -14,6 +14,14 @@ module Xrechnung
     #   @return [Xrechnung::Id]
     member :standard_item_identification_id, type: Xrechnung::Id, optional: true
 
+    # @!attribute buyers_item_identification_id
+    #   @return [Xrechnung::Id]
+    member :buyers_item_identification_id, type: Xrechnung::Id, optional: true
+
+    # @!attribute sellers_item_identification_id
+    #   @return [Xrechnung::Id]
+    member :sellers_item_identification_id, type: Xrechnung::Id, optional: true
+
     # @!attribute commodity_classification
     #   @return [Xrechnung::TaxCategory]
     member :commodity_classification, type: Xrechnung::TaxCategory
@@ -23,16 +31,31 @@ module Xrechnung
     member :classified_tax_category, type: Xrechnung::TaxCategory
 
     # noinspection RubyResolve
-    def to_xml(xml)
+    def to_xml(xml) # rubocop:disable Metrics
       xml.cac :Item do
         xml.cbc :Description, description
         xml.cbc :Name, name
+
         unless standard_item_identification_id.nil?
           xml.cac :StandardItemIdentification do
             xml.cbc :ID, standard_item_identification_id.id, schemeID: standard_item_identification_id.scheme_id
           end
         end
-        xml.cac :CommodityClassification, commodity_classification
+
+        unless buyers_item_identification_id.nil?
+          xml.cac :BuyersItemIdentification do
+            xml.cbc :ID, buyers_item_identification_id.id
+          end
+        end
+
+        unless sellers_item_identification_id.nil?
+          xml.cac :SellersItemIdentification do
+            xml.cbc :ID, sellers_item_identification_id.id
+          end
+        end
+
+        xml.cac :CommodityClassification, commodity_classification unless commodity_classification.nil?
+
         classified_tax_category&.to_xml(xml, root_tag_name: :ClassifiedTaxCategory)
       end
     end

data/lib/xrechnung/legal_monetary_total.rb

@@ -43,7 +43,7 @@ module Xrechnung
       self.class.members.each_key do |name|
         next if self[name].nil?
 
-        xml.cbc :"#{name.to_s.split("_").map(&:capitalize).join}", *self[name].xml_args
+        xml.cbc :"#{name.to_s.split('_').map(&:capitalize).join}", *self[name].xml_args
       end
       xml.target!
     end

data/lib/xrechnung/party.rb

@@ -47,6 +47,9 @@ module Xrechnung
     private
 
     def party_body(xml)
+      xml.cbc :EndpointID, contact&.electronic_mail, schemeID: "EM" if contact&.electronic_mail
+
+      party_identification&.to_xml(xml)
       unless name.nil? # if blank? -> empty name tag
         xml.cac :PartyName do
           if name == ""
@@ -56,7 +59,6 @@ module Xrechnung
           end
         end
       end
-      party_identification&.to_xml(xml)
       postal_address&.to_xml(xml)
       party_tax_scheme&.to_xml(xml)
       party_legal_entity&.to_xml(xml)

data/lib/xrechnung/party_identification.rb

@@ -6,10 +6,18 @@ module Xrechnung
     #   @return [String]
     member :id, type: String
 
+    # @!attribute scheme_id
+    #   @return [String]
+    member :scheme_id, type: String, optional: true
+
     # noinspection RubyResolve
     def to_xml(xml)
       xml.cac :PartyIdentification do
-        xml.cbc :ID, id
+        if scheme_id
+          xml.cbc :ID, id, schemeID: scheme_id
+        else
+          xml.cbc :ID, id
+        end
       end
     end
   end

data/lib/xrechnung/party_legal_entity.rb

@@ -13,8 +13,8 @@ module Xrechnung
     # noinspection RubyResolve
     def to_xml(xml)
       xml.cac :PartyLegalEntity do
-        xml.cbc(:CompanyID, company_id) unless company_id.nil?
         xml.cbc :RegistrationName, registration_name
+        xml.cbc(:CompanyID, company_id) unless company_id.nil?
       end
     end
   end

data/lib/xrechnung/payee_party.rb

@@ -0,0 +1,36 @@
+module Xrechnung
+  # <cac:PayeeParty>
+  #   <cac:PartyIdentification>
+  #     <cbc:ID schemeID="SEPA">FR932874294</cbc:ID>
+  #   </cac:PartyIdentification>
+  #   <cac:PartyName>
+  #     <cbc:Name>Payee Name Ltd</cbc:Name>
+  #   </cac:PartyName>
+  # </cac:PayeeParty>
+  class PayeeParty
+    include MemberContainer
+
+    # @!attribute id
+    #   @return [String]
+    member :id, type: String
+
+    # @!attribute name
+    #   @return [String]
+    member :name, type: String, optional: true
+
+    # noinspection RubyResolve
+    def to_xml(xml)
+      xml.cac :PayeeParty do
+        xml.cac :PartyIdentification do
+          xml.cbc :ID, id, schemeID: "SEPA"
+        end
+
+        if name
+          xml.cac :PartyName do
+            xml.cbc :Name, name
+          end
+        end
+      end
+    end
+  end
+end

data/lib/xrechnung/payment_mandate.rb

@@ -0,0 +1,29 @@
+module Xrechnung
+  # <cac:PaymentMandate>
+  #    <cbc:ID>SEPA-MANDAT-123</cbc:ID>
+  #    <cac:PayerFinancialAccount>
+  #      <cbc:ID>DE02500105170137075030</cbc:ID>
+  #    </cac:PayerFinancialAccount>
+  # </cac:PaymentMandate>
+  class PaymentMandate
+    include MemberContainer
+
+    # @!attribute id
+    #   @return [String]
+    member :id, type: String
+
+    # @!attribute payer_financial_account_id
+    #   @return [String]
+    member :payer_financial_account_id, type: String
+
+    # noinspection RubyResolve
+    def to_xml(xml)
+      xml.cac :PaymentMandate do
+        xml.cbc :ID, id
+        xml.cac :PayerFinancialAccount do
+          xml.cbc :ID, payer_financial_account_id
+        end
+      end
+    end
+  end
+end

data/lib/xrechnung/payment_means.rb

@@ -20,10 +20,16 @@ module Xrechnung
     #   @return [Xrechnung::PayeeFinancialAccount]
     member :payee_financial_account, type: Xrechnung::PayeeFinancialAccount
 
+    # @!attribute payment_mandate
+    #   @return [Xrechnung::PaymentMandate]
+    member :payment_mandate, type: Xrechnung::PaymentMandate, optional: true
+
     # noinspection RubyResolve
     def to_xml(xml)
       xml.cbc :PaymentMeansCode, payment_means_code
       payee_financial_account&.to_xml(xml)
+      payment_mandate&.to_xml(xml)
+      xml.target!
     end
   end
 end

data/lib/xrechnung/price.rb

@@ -15,9 +15,7 @@ module Xrechnung
     member :allowance_charge, type: Xrechnung::AllowanceCharge
 
     def initialize(**kwargs)
-      unless kwargs[:price_amount].is_a?(Currency)
-        kwargs[:price_amount] = Currency::EUR(kwargs[:price_amount])
-      end
+      kwargs[:price_amount] = Currency::EUR(kwargs[:price_amount]) unless kwargs[:price_amount].is_a?(Currency)
       super(**kwargs)
     end
 

data/lib/xrechnung/quantity.rb

@@ -4,9 +4,8 @@ module Xrechnung
       format("%0.2f", amount)
     end
 
-
     def xml_args
-      [amount_to_s, unitCode: unit_code]
+      [amount_to_s, { unitCode: unit_code }]
     end
   end
 end

data/lib/xrechnung/tax_category.rb

@@ -23,7 +23,7 @@ module Xrechnung
 
     # @!attribute percent
     #   @return [BigDecimal]
-    member :percent, type: BigDecimal, transform_value: ->(v) { BigDecimal(v, 0) }
+    member :percent, type: BigDecimal, transform_value: ->(v) { v.nil? ? nil : BigDecimal(v, 0) }
 
     # @!attribute tax_scheme_id
     #   @return [String]
@@ -41,15 +41,16 @@ module Xrechnung
     def to_xml(xml, root_tag_name: :TaxCategory)
       xml.cac root_tag_name do
         xml.cbc :ID, id
-        xml.cbc :Percent, format("%.2f", percent)
-        xml.cac :TaxScheme do
-          xml.cbc :ID, tax_scheme_id
-        end
+        xml.cbc :Percent, format("%.2f", percent) unless percent.nil?
 
         unless tax_exemption_reason_code.nil?
           xml.cbc :TaxExemptionReasonCode, tax_exemption_reason_code
           xml.cbc :TaxExemptionReason, tax_exemption_reason
         end
+
+        xml.cac :TaxScheme do
+          xml.cbc :ID, tax_scheme_id
+        end
       end
     end
   end

data/lib/xrechnung/version.rb

@@ -1,3 +1,3 @@
 module Xrechnung
-  VERSION = "0.3.0"
+  VERSION = "0.5.0".freeze
 end

data/lib/xrechnung.rb

@@ -11,6 +11,8 @@ require "xrechnung/party_tax_scheme"
 require "xrechnung/postal_address"
 require "xrechnung/party"
 require "xrechnung/payee_financial_account"
+require "xrechnung/payment_mandate"
+require "xrechnung/payee_party"
 require "xrechnung/payment_means"
 require "xrechnung/tax_total"
 require "xrechnung/tax_category"
@@ -30,6 +32,22 @@ module Xrechnung
   class Document
     include MemberContainer
 
+    # Default customization specs
+    DEFAULT_CUSTOMIZATION_ID = "urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_3.0"
+    DEFAULT_PROFILE_ID = "urn:fdc:peppol.eu:2017:poacc:billing:01:1.0"
+
+    # Document customization identifier
+    #
+    # @!attribute customization_id
+    #   @return [String]
+    member :customization_id, type: String, default: DEFAULT_CUSTOMIZATION_ID
+
+    # Document profile identifier
+    #
+    # @!attribute profile_id
+    #   @return [String]
+    member :profile_id, type: String, default: DEFAULT_PROFILE_ID
+
     # Invoice number BT-1
     #
     # Eine eindeutige Kennung der Rechnung, die diese im System des Verkäufers identifiziert.
@@ -101,7 +119,7 @@ module Xrechnung
     #
     # @!attribute purchase_order_reference
     #   @return [String]
-    member :purchase_order_reference, type: String
+    member :purchase_order_reference, type: String, optional: true
 
     # Sales order reference BT-14
     #
@@ -147,7 +165,7 @@ module Xrechnung
     #
     # @!attribute tax_currency_code
     #   @return [String]
-    member :tax_currency_code, type: String, default: "EUR"
+    member :tax_currency_code, type: String
 
     # Buyer reference BT-10
     #
@@ -179,7 +197,7 @@ module Xrechnung
     #
     # @!attribute contract_document_reference_id
     #   @return [String]
-    member :contract_document_reference_id, type: String
+    member :contract_document_reference_id, type: String, optional: true
 
     # Project reference BT-11
     #
@@ -187,7 +205,7 @@ module Xrechnung
     #
     # @!attribute project_reference_id
     #   @return [String]
-    member :project_reference_id, type: String
+    member :project_reference_id, type: String, optional: true
 
     # SELLER TAX REPRESENTATIVE PARTY BG-11
     #
@@ -207,6 +225,15 @@ module Xrechnung
     #   @return [Xrechnung::PaymentMeans]
     member :payment_means, type: Xrechnung::PaymentMeans
 
+    # PAYEE PARTY BG-10
+    #
+    # A group of business terms providing information about the Payee, i.e. the role that receives
+    # the payment. Shall be used when the Payee is different from the Seller.
+    #
+    # @!attribute payee_party
+    #   @return [Xrechnung::PayeeParty]
+    member :payee_party, type: Xrechnung::PayeeParty, optional: true
+
     # Payment terms BT-20
     #
     # Eine Textbeschreibung der Zahlungsbedingungen, die für den fälligen Zahlungsbetrag gelten (einschließlich
@@ -245,6 +272,17 @@ module Xrechnung
     #   @return [Array]
     member :invoice_lines, type: Array, default: []
 
+    # DOCUMENT LEVEL ALLOWANCES AND CHARGES BG-20, BG-21
+    #
+    # A group of business terms providing information about allowances
+    # applicable to the Invoice as a whole. A group of business terms providing
+    # information about charges and taxes other than VAT, applicable to the
+    # Invoice as a whole.
+    #
+    # @!attribute allowance_charges
+    #   @return [Array]
+    member :allowance_charges, type: Array, default: []
+
     def to_xml(indent: 2, target: "")
       xml = Builder::XmlMarkup.new(indent: indent, target: target)
       xml.instruct! :xml, version: "1.0", encoding: "UTF-8"
@@ -255,7 +293,8 @@ module Xrechnung
         "xmlns:cbc"          => "urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2",
         "xmlns:xsi"          => "http://www.w3.org/2001/XMLSchema-instance",
         "xsi:schemaLocation" => "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2 http://docs.oasis-open.org/ubl/os-UBL-2.1/xsd/maindoc/UBL-Invoice-2.1.xsd" do
-        xml.cbc :CustomizationID, "urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.3"
+        xml.cbc :CustomizationID, customization_id
+        xml.cbc :ProfileID, profile_id
         xml.cbc :ID, id
         xml.cbc :IssueDate, issue_date
         xml.cbc :DueDate, due_date
@@ -267,17 +306,20 @@ module Xrechnung
 
         xml.cbc :TaxPointDate, tax_point_date unless tax_point_date.nil?
         xml.cbc :DocumentCurrencyCode, document_currency_code
-        xml.cbc :TaxCurrencyCode, tax_currency_code
+        xml.cbc :TaxCurrencyCode, tax_currency_code unless tax_currency_code.nil?
         xml.cbc :BuyerReference, buyer_reference
 
-        unless self.class.members[:invoice_period].optional && invoice_period.nil?
-          invoice_period&.to_xml(xml)
-        end
-
-        xml.cac :OrderReference do
-          xml.cbc :ID, purchase_order_reference
-          unless self.class.members[:sales_order_reference].optional && sales_order_reference.nil?
-            xml.cbc :SalesOrderID, sales_order_reference
+        invoice_period&.to_xml(xml) unless self.class.members[:invoice_period].optional && invoice_period.nil?
+
+        unless self.class.members[:purchase_order_reference].optional && purchase_order_reference.nil? &&
+               self.class.members[:sales_order_reference].optional && sales_order_reference.nil?
+          xml.cac :OrderReference do
+            unless self.class.members[:purchase_order_reference].optional && purchase_order_reference.nil?
+              xml.cbc :ID, purchase_order_reference
+            end
+            unless self.class.members[:sales_order_reference].optional && sales_order_reference.nil?
+              xml.cbc :SalesOrderID, sales_order_reference
+            end
           end
         end
 
@@ -287,12 +329,16 @@ module Xrechnung
           end
         end
 
-        xml.cac :ContractDocumentReference do
-          xml.cbc :ID, contract_document_reference_id
+        unless self.class.members[:contract_document_reference_id].optional && contract_document_reference_id.nil?
+          xml.cac :ContractDocumentReference do
+            xml.cbc :ID, contract_document_reference_id
+          end
         end
 
-        xml.cac :ProjectReference do
-          xml.cbc :ID, project_reference_id
+        unless self.class.members[:project_reference_id].optional && project_reference_id.nil?
+          xml.cac :ProjectReference do
+            xml.cbc :ID, project_reference_id
+          end
         end
 
         xml.cac :AccountingSupplierParty do
@@ -313,10 +359,18 @@ module Xrechnung
           payment_means&.to_xml(xml)
         end
 
+        unless self.class.members[:payee_party].optional && payee_party.nil?
+          payee_party&.to_xml(xml)
+        end
+
         xml.cac :PaymentTerms do
           xml.cbc :Note, payment_terms_note
         end
 
+        allowance_charges.each do |allowance_charge|
+          allowance_charge&.to_xml(xml)
+        end
+
         xml.cac :TaxTotal do
           tax_total&.to_xml(xml)
         end

data/xrechnung.gemspec

@@ -1,4 +1,4 @@
-require_relative 'lib/xrechnung/version'
+require_relative "lib/xrechnung/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "xrechnung"
@@ -6,19 +6,19 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Julian Kornberger"]
   spec.email         = ["jk+github@digineo.de"]
 
-  spec.summary       = %q{Library to create invoices in the XRechnung format.}
-  spec.homepage      = "https://github.com/digineo/xrechnung"
-  spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.summary               = "Library to create invoices in the XRechnung format."
+  spec.homepage              = "https://github.com/digineo/xrechnung"
+  spec.license               = "MIT"
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
-  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["homepage_uri"]    = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/digineo/xrechnung"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) {
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
+  }
 
   spec.require_paths = ["lib"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xrechnung
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Julian Kornberger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-26 00:00:00.000000000 Z
+date: 2024-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -88,6 +88,8 @@ files:
 - lib/xrechnung/party_legal_entity.rb
 - lib/xrechnung/party_tax_scheme.rb
 - lib/xrechnung/payee_financial_account.rb
+- lib/xrechnung/payee_party.rb
+- lib/xrechnung/payment_mandate.rb
 - lib/xrechnung/payment_means.rb
 - lib/xrechnung/postal_address.rb
 - lib/xrechnung/price.rb
@@ -111,14 +113,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.19
 signing_key:
 specification_version: 4
 summary: Library to create invoices in the XRechnung format.