diff --git a/Gemfile.lock b/Gemfile.lock index a6c822723..44290fffd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,10 +18,10 @@ GIT GIT remote: https://github.com/internetee/e_invoice.git - revision: da18f3da3219315f732b94fbc165fe83cb828a99 + revision: 590dcd3b769ea57edd4c4626547b37120a02b127 branch: master specs: - e_invoice (0.1.1) + e_invoice (0.1.2) builder (~> 3.2) nokogiri savon diff --git a/app/models/invoice/e_invoice_generator.rb b/app/models/invoice/e_invoice_generator.rb index 4830e486a..326984476 100644 --- a/app/models/invoice/e_invoice_generator.rb +++ b/app/models/invoice/e_invoice_generator.rb @@ -91,13 +91,13 @@ class Invoice def generate_monthly_invoice_item(invoice, item) EInvoice::InvoiceItem.new.tap do |i| i.description = item.description - i.description = "[#{item.product_id}] #{item.description}" if item.product_id + i.product_id = item.product_id i.unit = item.unit i.price = item.price i.quantity = item.quantity + i.vat_rate = invoice.vat_rate if item.price && item.quantity i.subtotal = (item.price * item.quantity).round(3) - i.vat_rate = invoice.vat_rate i.vat_amount = i.subtotal * (i.vat_rate / 100) i.total = i.subtotal + i.vat_amount end