zugpferd 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb023a7256c9cf26f6688283b6204bbccc0f46f2a6c8f0bb8082c2b1db277151
-  data.tar.gz: 00d5dc92b2d38a3744af4388017629d83b74b28241014448c75b684fb8de7c5c
+  metadata.gz: 97af66296e92817aef2f4f2fbea2e0ebb7170fb3856732a552ac32210a8e085f
+  data.tar.gz: cc23dea33a361b6fcfc93a52c0928a70bea18757cb2e022dbf123b142480383a
 SHA512:
-  metadata.gz: 0b6313dfce9be63204e9c7317be9abfbd38c0a53c97e5a7960c4b4fab98421f7f5ec892af59457c4babcdc0ec811de4159f926ae8f443df5f1d417055eb3847f
-  data.tar.gz: 449b38ee768cea1a0a5167f498c5b80a6bc3604bfe92967cabed4e51d230fe56b307dd88c5313886cb2b67d6b053932bf5f8e575b18385b781fd323f74d10fdf
+  metadata.gz: 79479ce622f08767f6ac5d3d63b5826ca3a3eef621d768005c417600f16b308856280e270a7188f49a03b3ff25f03ec0b169861570cde588fc72005d64a96b92
+  data.tar.gz: 31d343e25f7d8c5e9d2eb459f941b5a0f67d38169e8f264f66100382e8d11ace7e5f2bfb79497d5d0dbbf6f2097965078f7b9fd2ffb0903ae1a56c3c622bdc53

data/lib/zugpferd/cii/mapping.rb

@@ -64,6 +64,7 @@ module Zugpferd
         legal_registration_id: "ram:SpecifiedLegalOrganization/ram:ID",
         legal_form:            "ram:Description",
         vat_identifier:        "ram:SpecifiedTaxRegistration/ram:ID[@schemeID='VA']",
+        tax_registration_identifier: "ram:SpecifiedTaxRegistration/ram:ID[@schemeID='FC']",
         electronic_address:    "ram:URIUniversalCommunication/ram:URIID",
       }.freeze
 

data/lib/zugpferd/cii/reader.rb

@@ -58,7 +58,7 @@ module Zugpferd
           customization_id: text(root, INVOICE[:customization_id]),
           profile_id: text(root, INVOICE[:profile_id]),
           note: text(root, INVOICE[:note]),
-          seller: build_party(root.at_xpath(SELLER, NS)),
+          seller: build_party(root.at_xpath(SELLER, NS), seller: true),
           buyer: build_party(root.at_xpath(BUYER, NS)),
           line_items: root.xpath(INVOICE_LINE, NS).map { |n| build_line_item(n) },
           allowance_charges: settlement ? build_allowance_charges(settlement) : [],
@@ -69,7 +69,8 @@ module Zugpferd
         )
       end
 
-      def build_party(node)
+      # Seller-only terms are read only for the seller
+      def build_party(node, seller: false)
         return nil unless node
 
         party = Model::TradeParty.new(
@@ -77,8 +78,9 @@ module Zugpferd
           trading_name: text(node, PARTY[:trading_name]),
           identifier: text(node, PARTY[:identifier]),
           legal_registration_id: text(node, PARTY[:legal_registration_id]),
-          legal_form: text(node, PARTY[:legal_form]),
+          legal_form: (text(node, PARTY[:legal_form]) if seller),
           vat_identifier: text(node, PARTY[:vat_identifier]),
+          tax_registration_identifier: (text(node, PARTY[:tax_registration_identifier]) if seller),
           electronic_address: text(node, PARTY[:electronic_address]),
         )
 

data/lib/zugpferd/cii/writer.rb

@@ -74,7 +74,7 @@ module Zugpferd
       def build_agreement(xml, doc)
         xml["ram"].ApplicableHeaderTradeAgreement do
           xml["ram"].BuyerReference doc.buyer_reference if doc.buyer_reference
-          build_party(xml, "SellerTradeParty", doc.seller) if doc.seller
+          build_party(xml, "SellerTradeParty", doc.seller, seller: true) if doc.seller
           build_party(xml, "BuyerTradeParty", doc.buyer) if doc.buyer
           build_buyer_order_reference(xml, doc) if doc.purchase_order_reference
         end
@@ -86,7 +86,8 @@ module Zugpferd
         end
       end
 
-      def build_party(xml, element_name, party)
+      # Seller-only terms are written only for the seller
+      def build_party(xml, element_name, party, seller: false)
         xml["ram"].send(element_name) do
           if party.identifier
             xml["ram"].ID party.identifier
@@ -94,7 +95,7 @@ module Zugpferd
 
           xml["ram"].Name party.name
 
-          xml["ram"].Description party.legal_form if party.legal_form
+          xml["ram"].Description party.legal_form if seller && party.legal_form
 
           if party.legal_registration_id || party.trading_name
             xml["ram"].SpecifiedLegalOrganization do
@@ -120,6 +121,12 @@ module Zugpferd
               xml["ram"].ID(party.vat_identifier, schemeID: "VA")
             end
           end
+
+          if seller && party.tax_registration_identifier
+            xml["ram"].SpecifiedTaxRegistration do
+              xml["ram"].ID(party.tax_registration_identifier, schemeID: "FC")
+            end
+          end
         end
       end
 

data/lib/zugpferd/model/trade_party.rb

@@ -10,14 +10,16 @@ module Zugpferd
       # @return [String, nil] BT-28/BT-45 Trading name
       # @return [String, nil] BT-29/BT-46 Party identifier
       # @return [String, nil] BT-30/BT-47 Legal registration identifier
-      # @return [String, nil] BT-33 Company legal form
+      # @return [String, nil] BT-33 Company legal form (seller only)
       # @return [String, nil] BT-31/BT-48 VAT identifier
+      # @return [String, nil] BT-32 Seller tax registration identifier (seller only)
       # @return [String, nil] BT-34/BT-49 Electronic address
       # @return [String, nil] BT-34-1/BT-49-1 Electronic address scheme
       # @return [PostalAddress, nil] BG-5/BG-8 Postal address
       # @return [Contact, nil] BG-6/BG-9 Contact information
       attr_accessor :name, :trading_name, :identifier,
                     :legal_registration_id, :legal_form, :vat_identifier,
+                    :tax_registration_identifier,
                     :electronic_address, :electronic_address_scheme,
                     :postal_address, :contact
 

data/lib/zugpferd/ubl/mapping.rb

@@ -63,6 +63,7 @@ module Zugpferd
         legal_registration_id:   "cac:PartyLegalEntity/cbc:CompanyID",
         legal_form:              "cac:PartyLegalEntity/cbc:CompanyLegalForm",
         vat_identifier:          "cac:PartyTaxScheme[cac:TaxScheme/cbc:ID='VAT']/cbc:CompanyID",
+        tax_registration_identifier: "cac:PartyTaxScheme[cac:TaxScheme/cbc:ID!='VAT']/cbc:CompanyID",
         electronic_address:      "cbc:EndpointID",
       }.freeze
 

data/lib/zugpferd/ubl/reader.rb

@@ -51,7 +51,7 @@ module Zugpferd
           customization_id: text(root, INVOICE[:customization_id]),
           profile_id: text(root, INVOICE[:profile_id]),
           note: text(root, INVOICE[:note]),
-          seller: build_party(root.at_xpath(SELLER, @ns)),
+          seller: build_party(root.at_xpath(SELLER, @ns), seller: true),
           buyer: build_party(root.at_xpath(BUYER, @ns)),
           line_items: root.xpath(line_element, @ns).map { |n| build_line_item(n) },
           allowance_charges: root.xpath(ALLOWANCE_CHARGE, @ns).map { |n| build_allowance_charge(n) },
@@ -62,7 +62,8 @@ module Zugpferd
         )
       end
 
-      def build_party(node)
+      # Seller-only terms are read only for the seller
+      def build_party(node, seller: false)
         return nil unless node
 
         party = Model::TradeParty.new(
@@ -70,8 +71,9 @@ module Zugpferd
           trading_name: text(node, PARTY[:trading_name]),
           identifier: text(node, PARTY[:identifier]),
           legal_registration_id: text(node, PARTY[:legal_registration_id]),
-          legal_form: text(node, PARTY[:legal_form]),
+          legal_form: (text(node, PARTY[:legal_form]) if seller),
           vat_identifier: text(node, PARTY[:vat_identifier]),
+          tax_registration_identifier: (text(node, PARTY[:tax_registration_identifier]) if seller),
           electronic_address: text(node, PARTY[:electronic_address]),
         )
 

data/lib/zugpferd/ubl/writer.rb

@@ -68,7 +68,7 @@ module Zugpferd
       def build_supplier(xml, party, payment_instructions = nil)
         xml["cac"].AccountingSupplierParty do
           build_party(xml, party,
-            creditor_reference_id: payment_instructions&.creditor_reference_id)
+            creditor_reference_id: payment_instructions&.creditor_reference_id, seller: true)
         end
       end
 
@@ -78,7 +78,8 @@ module Zugpferd
         end
       end
 
-      def build_party(xml, party, creditor_reference_id: nil)
+      # Seller-only terms are written only for the seller
+      def build_party(xml, party, creditor_reference_id: nil, seller: false)
         xml["cac"].Party do
           if party.electronic_address
             attrs = {}
@@ -115,10 +116,19 @@ module Zugpferd
             end
           end
 
+          if seller && party.tax_registration_identifier
+            xml["cac"].PartyTaxScheme do
+              xml["cbc"].CompanyID party.tax_registration_identifier
+              xml["cac"].TaxScheme do
+                xml["cbc"].ID "FC"
+              end
+            end
+          end
+
           xml["cac"].PartyLegalEntity do
             xml["cbc"].RegistrationName party.name
             xml["cbc"].CompanyID party.legal_registration_id if party.legal_registration_id
-            xml["cbc"].CompanyLegalForm party.legal_form if party.legal_form
+            xml["cbc"].CompanyLegalForm party.legal_form if seller && party.legal_form
           end
 
           build_contact(xml, party.contact) if party.contact

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zugpferd
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Alexander Zeitler