address BG-3 Warning and gross price error

Author: Akise17

lib/secretariat/invoice.rb

@@ -23,6 +23,8 @@ module Secretariat
     :service_period_start,
     :service_period_end,
     :invoice_type,
+    :invoice_reference_id,
+    :invoice_reference_date,
     :seller,
     :buyer,
     :buyer_reference,
@@ -321,6 +323,18 @@ def to_xml(version: 1, validate: true, mode: :zugferd)
                 Helpers.currency_element(xml, 'ram', 'TotalPrepaidAmount', paid_amount, currency_code, add_currency: version == 1)
                 Helpers.currency_element(xml, 'ram', 'DuePayableAmount', due_amount, currency_code, add_currency: version == 1)
               end
+
+              if invoice_reference_id && invoice_reference_date
+                invoice_reference = by_version(version, 'InvoiceReferencedDocument', 'InvoiceReferencedDocument')
+                xml['ram'].send(invoice_reference) do
+                  xml['ram'].IssuerAssignedID invoice_reference_id
+                  xml['ram'].FormattedIssueDateTime do
+                    xml['qdt'].DateTimeString(format: '102') do
+                      xml.text(invoice_reference_date.strftime('%Y%m%d'))
+                    end
+                  end
+                end
+              end
             end
             if version == 1
               line_items.each_with_index do |item, i|

lib/secretariat/line_item.rb

@@ -129,35 +129,38 @@ def to_xml(xml, line_item_index, version: 2, validate: true)
         agreement = by_version(version, 'SpecifiedSupplyChainTradeAgreement', 'SpecifiedLineTradeAgreement')
 
         xml['ram'].send(agreement) do
-          xml['ram'].GrossPriceProductTradePrice do
-            Helpers.currency_element(xml, 'ram', 'ChargeAmount', gross_amount, currency_code, add_currency: version == 1, digits: 4)
-            if version >= 2 && discount_amount
-              xml['ram'].BasisQuantity(unitCode: unit_code) do
-                xml.text(Helpers.format(BASIS_QUANTITY, digits: 4))
-              end
-              xml['ram'].AppliedTradeAllowanceCharge do
-                xml['ram'].ChargeIndicator do
-                  xml['udt'].Indicator 'false'
+          if gross_based
+            xml['ram'].GrossPriceProductTradePrice do
+              Helpers.currency_element(xml, 'ram', 'ChargeAmount', gross_amount, currency_code, add_currency: version == 1, digits: 4)
+              if version >= 2 && discount_amount
+                xml['ram'].BasisQuantity(unitCode: unit_code) do
+                  xml.text(Helpers.format(BASIS_QUANTITY, digits: 4))
+                end
+                xml['ram'].AppliedTradeAllowanceCharge do
+                  xml['ram'].ChargeIndicator do
+                    xml['udt'].Indicator 'false'
+                  end
+                  Helpers.currency_element(xml, 'ram', 'ActualAmount', discount_amount, currency_code, add_currency: version == 1)
+                  xml['ram'].Reason discount_reason
                 end
-                Helpers.currency_element(xml, 'ram', 'ActualAmount', discount_amount, currency_code, add_currency: version == 1)
-                xml['ram'].Reason discount_reason
               end
-            end
-            if version == 1 && discount_amount
-              xml['ram'].AppliedTradeAllowanceCharge do
-                xml['ram'].ChargeIndicator do
-                  xml['udt'].Indicator 'false'
+              if version == 1 && discount_amount
+                xml['ram'].AppliedTradeAllowanceCharge do
+                  xml['ram'].ChargeIndicator do
+                    xml['udt'].Indicator 'false'
+                  end
+                  Helpers.currency_element(xml, 'ram', 'ActualAmount', discount_amount, currency_code, add_currency: version == 1)
+                  xml['ram'].Reason discount_reason
                 end
-                Helpers.currency_element(xml, 'ram', 'ActualAmount', discount_amount, currency_code, add_currency: version == 1)
-                xml['ram'].Reason discount_reason
               end
             end
-          end
-          xml['ram'].NetPriceProductTradePrice do
-            Helpers.currency_element(xml, 'ram', 'ChargeAmount', net_amount, currency_code, add_currency: version == 1, digits: 4)
-            if version >= 2
-              xml['ram'].BasisQuantity(unitCode: unit_code) do
-                xml.text(Helpers.format(BASIS_QUANTITY, digits: 4))
+          else
+            xml['ram'].NetPriceProductTradePrice do
+              Helpers.currency_element(xml, 'ram', 'ChargeAmount', net_amount, currency_code, add_currency: version == 1, digits: 4)
+              if version >= 2
+                xml['ram'].BasisQuantity(unitCode: unit_code) do
+                  xml.text(Helpers.format(BASIS_QUANTITY, digits: 4))
+                end
               end
             end
           end