fix bug: accounting period export

app/models/accounting_period.rb

@@ -34,7 +34,12 @@ class AccountingPeriod < ApplicationRecord
   def invoices_with_vat(invoices)
     vat_service = VatHistoryService.new
     invoices.map do |i|
-      { invoice: i, vat_rate: vat_service.invoice_vat(i) / 100.0 }
+      vat_rate_group = {}
+      i.invoice_items.each do |item|
+        vat_type = item.invoice_item_type
+        vat_rate_group[vat_type] = vat_service.invoice_vat(item) / 100.0 unless vat_rate_group[vat_type]
+      end
+      { invoice: i, vat_rate: vat_rate_group }
     end
   end
 
@@ -70,7 +75,7 @@ class AccountingPeriod < ApplicationRecord
   end
 
   def price_without_taxe(invoice)
-    invoice[:invoice].total - (invoice[:invoice].total * invoice[:vat_rate])
+    invoice[:invoice].invoice_items.map(&:net_amount).sum
   end
 
   def compute_totals

app/services/accounting_export_service.rb

@@ -134,9 +134,9 @@ class AccountingExportService
 
   # Generate the "VAT" row, which contains the credit to the VAT account, with VAT amount only
   def vat_row(invoice)
-    rate = VatHistoryService.new.invoice_vat(invoice)
+    total = invoice.invoice_items.map(&:net_amount).sum
     # we do not render the VAT row if it was disabled for this invoice
-    return nil if rate.zero?
+    return nil if total == invoice.total
 
     row(
       invoice,

app/views/archive/_accounting.json.jbuilder

@@ -34,7 +34,7 @@ json.invoices do
         json.id item.object_id
         json.main item.main
       end
-      json.partial! 'archive/vat', price: item.amount, vat_rate: invoice[:vat_rate]
+      json.partial! 'archive/vat', price: item.amount, vat_rate: invoice[:vat_rate][item.invoice_item_type]
     end
   end
 end