dorsale 3.13.0 → 3.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6523b32ed6ded0a2c2973f262d1c4c653e5686b4e46092598b28f7361ac59490
-  data.tar.gz: 2041d1694e962515f16ba41179fa7feb7059f4afae4c68064cecb0a24c85f9fc
+  metadata.gz: ebdaffde3d6482e50a41707f99a6e11672e92d70217bc78a53998597643c6f7a
+  data.tar.gz: 89a6e804ec650c078e4fc40fdd88c2261e625c889c6125daee6dc90870ed66b2
 SHA512:
-  metadata.gz: c87828175a390e626c9d924b5f03f08ffd2c7499c15325469200674c632d5b2f5a12c53f54aef24007418b08e27ce8f9cd167bdd92314baa751d6342b32e46cd
-  data.tar.gz: '09140a1d504656c7c02086c420ed0a1805a4f52f9b3176f7cbb48c141ac71121df2eb785f4e398e0b1e0294b45cddf9f6f9bc9c4eacfd96efe1370dfd9cdd7f1'
+  metadata.gz: 6c37a324dc797b8b2b0fabfe48c23a115d838b462fd54b7f6bde6548897a7e266983c0576c059cbf1694db245c0102de1725ef4b36c133b9d8ac98841b88c47d
+  data.tar.gz: 21fdf0df6905f79ba1b0acac5d044723e50e15507a39729eea45578f7daf672ab1f4ec024aea193696156470772f3e35da1e9c59349e93a64b0d8042e4609e7c

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Next version
 
+## 3.14.0
+- Add `Dorsale::BillingMachine.vat_round_by_line` option
+- Revert default `vat_round_by_line` value introduced in 3.10.0 (it's now false again)
+
 ## 3.13.0
 - Rails 5.2 compatible
 

data/app/assets/javascripts/dorsale/engines/{billing_machine.coffee → billing_machine.coffee.erb}

@@ -1,5 +1,7 @@
 @BillingMachine = {}
 
+BillingMachine.vat_round_by_line = <%= Dorsale::BillingMachine.vat_round_by_line %>
+
 BillingMachine.settings =
   precision : 2
   thousand  : " " # nbsp
@@ -18,7 +20,7 @@ BillingMachine.num2str = (num) ->
   accounting.formatNumber(num, settings.precision, settings.thousand, settings.decimal)
 
 BillingMachine.round2 = (num) ->
-  return +(Math.round(num + "e+2")  + "e-2")
+  return +(Math.round(num + "e+2") + "e-2")
 
 BillingMachine.updateTotals = ->
   total_excluding_taxes = 0.0
@@ -42,7 +44,7 @@ BillingMachine.updateTotals = ->
   discount_rate = commercial_discount / raw_total_excluding_taxes
 
   # VAT amount based on each line total with discount rate
-  vat_amount = 0.0
+  total_vat_amount = 0.0
   $("#billing_machine-form .line").map ->
     return if parseInt($(this).find("input[name*=destroy]").val()) == 1
 
@@ -55,11 +57,13 @@ BillingMachine.updateTotals = ->
 
     line_total = BillingMachine.str2num $(this).find(".line-total input").val()
     discounted_line_total = line_total - (line_total * discount_rate)
-    line_vat_amount = BillingMachine.round2(discounted_line_total * vat_rate / 100)
-    vat_amount += line_vat_amount
-  $(".vat_amount input").val BillingMachine.num2str vat_amount
+    line_vat_amount = discounted_line_total * vat_rate / 100
+    line_vat_amount = BillingMachine.round2(line_vat_amount) if BillingMachine.vat_round_by_line
+    total_vat_amount += line_vat_amount
+    total_vat_amount = BillingMachine.round2(total_vat_amount)
+  $(".vat_amount input").val BillingMachine.num2str total_vat_amount
 
-  total_including_taxes = total_excluding_taxes + vat_amount
+  total_including_taxes = total_excluding_taxes + total_vat_amount
   $(".total_including_taxes input").val BillingMachine.num2str total_including_taxes
 
   # Advances is for invoices only, not for quotations

data/app/models/dorsale/billing_machine.rb

@@ -13,6 +13,13 @@ module Dorsale::BillingMachine
       @vat_mode = new_mode
     end
 
+    def vat_round_by_line
+      @vat_round_by_line = false if @vat_round_by_line.nil?
+      @vat_round_by_line
+    end
+
+    attr_writer :vat_round_by_line
+
     def invoice_pdf_model
       "::Dorsale::BillingMachine::Invoice#{vat_mode.to_s.capitalize}VatPdf".constantize
     end

data/app/models/dorsale/billing_machine/invoice.rb

@@ -57,7 +57,7 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
     lines.each(&:update_total)
     apply_vat_rate_to_lines
 
-    lines_sum = lines.map(&:total).sum
+    lines_sum = lines.map(&:total).sum.round(2)
 
     self.total_excluding_taxes = lines_sum - commercial_discount
 
@@ -71,9 +71,13 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
 
     lines.each do |line|
       line_total = line.total - (line.total * discount_rate)
-      self.vat_amount += (line_total * line.vat_rate / 100.0).round(2)
+      line_vat = (line_total * line.vat_rate / 100.0)
+      line_vat = line_vat.round(2) if Dorsale::BillingMachine.vat_round_by_line
+      self.vat_amount += line_vat
     end
 
+    self.vat_amount = vat_amount.round(2)
+
     self.total_including_taxes = total_excluding_taxes + vat_amount
     self.balance               = total_including_taxes - advance
   end

data/app/models/dorsale/billing_machine/quotation.rb

@@ -76,9 +76,13 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
 
     lines.each do |line|
       line_total = line.total - (line.total * discount_rate)
-      self.vat_amount += (line_total * line.vat_rate / 100.0).round(2)
+      line_vat = (line_total * line.vat_rate / 100.0)
+      line_vat = line_vat.round(2) if Dorsale::BillingMachine.vat_round_by_line
+      self.vat_amount += line_vat
     end
 
+    self.vat_amount = vat_amount.round(2)
+
     self.total_including_taxes = total_excluding_taxes + vat_amount
   end
 

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.13.0"
+  VERSION = "3.14.0"
 end

data/spec/models/dorsale/billing_machine/invoice_line_spec.rb

@@ -42,11 +42,11 @@ describe Dorsale::BillingMachine::InvoiceLine, type: :model do
 
   it "should update the total upon save" do
     line = create(:billing_machine_invoice_line, quantity: 12.34, unit_price: 12.34, total: 0)
-    expect(line.total).to eq(152.28)
+    expect(line.total.to_f).to eq 152.28
   end
 
   it "should update the total gracefully with invalid data" do
     line = create(:billing_machine_invoice_line, quantity: nil, unit_price: nil, total: 0)
-    expect(line.total).to eq(0)
+    expect(line.total.to_f).to eq 0
   end
 end

data/spec/models/dorsale/billing_machine/invoice_spec.rb

@@ -202,30 +202,47 @@ describe Dorsale::BillingMachine::Invoice, type: :model do
       expect(invoice.balance).to eq(108)
     end
 
-    it "should round numbers" do
-      invoice = create(:billing_machine_invoice,
-        :commercial_discount => 0,
-      )
-
-      create(:billing_machine_invoice_line,
-        :quantity   => 12.34,
-        :unit_price => 12.34,
-        :vat_rate   => 20,
-        :invoice    => invoice,
-      ) # total 152.28
-
-      create(:billing_machine_invoice_line,
-        :quantity   => 12.34,
-        :unit_price => 12.34,
-        :vat_rate   => 20,
-        :invoice    => invoice,
-      ) # total 152.28
+    describe "VAT round" do
+      let(:invoice) {
+        invoice = create(:billing_machine_invoice,
+          :commercial_discount => 0,
+        )
+
+        create(:billing_machine_invoice_line,
+          :quantity   => 12.34,
+          :unit_price => 12.34,
+          :vat_rate   => 20,
+          :invoice    => invoice,
+        ) # vat 30.45512 / total 152.2756
+
+        create(:billing_machine_invoice_line,
+          :quantity   => 12.34,
+          :unit_price => 12.34,
+          :vat_rate   => 20,
+          :invoice    => invoice,
+        ) # vat 30.45512 / total 152.2756
+
+        invoice
+      }
+
+      after { Dorsale::BillingMachine.vat_round_by_line = nil }
+
+      it "should round VAT by line" do
+        Dorsale::BillingMachine.vat_round_by_line = true
+        expect(invoice.total_excluding_taxes.to_f).to eq(304.56)
+        expect(invoice.vat_amount.to_f).to eq(60.92)
+        expect(invoice.total_including_taxes.to_f).to eq(365.48)
+        expect(invoice.balance.to_f).to eq(365.48)
+      end
 
-      expect(invoice.total_excluding_taxes).to eq(304.56)
-      expect(invoice.vat_amount).to eq(60.92)
-      expect(invoice.total_including_taxes).to eq(365.48)
-      expect(invoice.balance).to eq(365.48)
-    end
+      it "should round VAT globally" do
+        Dorsale::BillingMachine.vat_round_by_line = false
+        expect(invoice.total_excluding_taxes.to_f).to eq(304.56)
+        expect(invoice.vat_amount.to_f).to eq(60.91)
+        expect(invoice.total_including_taxes.to_f).to eq(365.47)
+        expect(invoice.balance.to_f).to eq(365.47)
+      end
+    end # describe "VAT round"
 
     it "should work fine even with empty lines" do
       invoice = create(:billing_machine_invoice)

data/spec/models/dorsale/billing_machine/quotation_line_spec.rb

@@ -41,11 +41,11 @@ describe Dorsale::BillingMachine::QuotationLine do
 
   it "should update the total upon save" do
     line = create(:billing_machine_quotation_line, quantity: 12.34, unit_price: 12.34, total: 0)
-    expect(line.total).to eq(152.28)
+    expect(line.total.to_f).to eq 152.28
   end
 
   it "should update the total gracefully with invalid data" do
     line = create(:billing_machine_quotation_line, quantity: nil, unit_price: nil, total: 0)
-    expect(line.total).to eq(0)
+    expect(line.total.to_f).to eq 0
   end
 end

data/spec/models/dorsale/billing_machine/quotation_spec.rb

@@ -152,30 +152,47 @@ describe Dorsale::BillingMachine::Quotation do
       Dorsale::BillingMachine.vat_mode = :single
     end
 
-    it "should round numbers" do
-      quotation = create(:billing_machine_quotation,
-        :commercial_discount => 0,
-      )
-
-      create(:billing_machine_quotation_line,
-        :quantity   => 12.34,
-        :unit_price => 12.34,
-        :vat_rate   => 20,
-        :quotation  => quotation,
-      ) # total 152.28
-
-      create(:billing_machine_quotation_line,
-        :quantity   => 12.34,
-        :unit_price => 12.34,
-        :vat_rate   => 20,
-        :quotation  => quotation,
-      ) # total 152.28
+    describe "VAT round" do
+      let(:quotation) {
+        quotation = create(:billing_machine_quotation,
+          :commercial_discount => 0,
+        )
+
+        create(:billing_machine_quotation_line,
+          :quantity   => 12.34,
+          :unit_price => 12.34,
+          :vat_rate   => 20,
+          :quotation  => quotation,
+        ) # vat 30.45512 / total 152.2756
+
+        create(:billing_machine_quotation_line,
+          :quantity   => 12.34,
+          :unit_price => 12.34,
+          :vat_rate   => 20,
+          :quotation  => quotation,
+        ) # vat 30.45512 / total 152.2756
+
+        quotation
+      }
+
+      after { Dorsale::BillingMachine.vat_round_by_line = nil }
+
+      it "should round VAT by line" do
+        Dorsale::BillingMachine.vat_round_by_line = true
+        expect(quotation.total_excluding_taxes.to_f).to eq(304.56)
+        expect(quotation.vat_amount.to_f).to eq(60.92)
+        expect(quotation.total_including_taxes.to_f).to eq(365.48)
+        expect(quotation.balance.to_f).to eq(365.48)
+      end
 
-      expect(quotation.total_excluding_taxes).to eq(304.56)
-      expect(quotation.vat_amount).to eq(60.92)
-      expect(quotation.total_including_taxes).to eq(365.48)
-      expect(quotation.balance).to eq(365.48)
-    end
+      it "should round VAT globally" do
+        Dorsale::BillingMachine.vat_round_by_line = false
+        expect(quotation.total_excluding_taxes.to_f).to eq(304.56)
+        expect(quotation.vat_amount.to_f).to eq(60.91)
+        expect(quotation.total_including_taxes.to_f).to eq(365.47)
+        expect(quotation.balance.to_f).to eq(365.47)
+      end
+    end # describe "VAT round" do
 
     it "should work fine even with empty lines" do
       quotation = create(:billing_machine_quotation, commercial_discount: nil)

data/spec/models/dorsale/billing_machine_spec.rb

@@ -5,31 +5,53 @@ RSpec.describe Dorsale::BillingMachine do
     ::Dorsale::BillingMachine
   }
 
-  it "default vat_mode should be :single" do
-    expect(bm.vat_mode).to eq :single
-    expect(bm.invoice_pdf_model).to eq Dorsale::BillingMachine::InvoiceSingleVatPdf
-    expect(bm.quotation_pdf_model).to eq Dorsale::BillingMachine::QuotationSingleVatPdf
-  end
-
-  it "vat_mode should accept :multiple value" do
-    bm.vat_mode = :multiple
-    expect(bm.vat_mode).to eq :multiple
-    expect(bm.invoice_pdf_model).to eq Dorsale::BillingMachine::InvoiceMultipleVatPdf
-    expect(bm.quotation_pdf_model).to eq Dorsale::BillingMachine::QuotationMultipleVatPdf
-  end
-
-  it "vat_mode should not accept :abc value" do
-    expect {
-      bm.vat_mode = :abc
-    }.to raise_error(RuntimeError)
-  end
-
-  it "default currency should be €" do
-    expect(bm.default_currency).to eq "€"
-  end
-
-  it "assign an other default currency" do
-    bm.default_currency = "$"
-    expect(bm.default_currency).to eq "$"
-  end
+  describe "::vat_mode" do
+    it "default vat_mode should be :single" do
+      expect(bm.vat_mode).to eq :single
+      expect(bm.invoice_pdf_model).to eq Dorsale::BillingMachine::InvoiceSingleVatPdf
+      expect(bm.quotation_pdf_model).to eq Dorsale::BillingMachine::QuotationSingleVatPdf
+    end
+
+    it "vat_mode should accept :multiple value" do
+      bm.vat_mode = :multiple
+      expect(bm.vat_mode).to eq :multiple
+      expect(bm.invoice_pdf_model).to eq Dorsale::BillingMachine::InvoiceMultipleVatPdf
+      expect(bm.quotation_pdf_model).to eq Dorsale::BillingMachine::QuotationMultipleVatPdf
+    end
+
+    it "vat_mode should not accept :abc value" do
+      expect {
+        bm.vat_mode = :abc
+      }.to raise_error(RuntimeError)
+    end
+  end # describe "::vat_mode"
+
+  describe "::vat_round_by_line" do
+    after { Dorsale::BillingMachine.vat_round_by_line = nil }
+
+    it "should return default value" do
+      expect(Dorsale::BillingMachine.vat_round_by_line).to eq false
+    end
+
+    it "should assign false value" do
+      Dorsale::BillingMachine.vat_round_by_line = false
+      expect(Dorsale::BillingMachine.vat_round_by_line).to eq false
+    end
+
+    it "should assign true value" do
+      Dorsale::BillingMachine.vat_round_by_line = true
+      expect(Dorsale::BillingMachine.vat_round_by_line).to eq true
+    end
+  end # describe "::vat_round_by_line"
+
+  describe "::default_currency" do
+    it "default currency should be €" do
+      expect(bm.default_currency).to eq "€"
+    end
+
+    it "assign an other default currency" do
+      bm.default_currency = "$"
+      expect(bm.default_currency).to eq "$"
+    end
+  end # describe "::default_currency"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.13.0
+  version: 3.14.0
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2019-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -433,7 +433,7 @@ files:
 - app/assets/javascripts/dorsale/dependencies.coffee
 - app/assets/javascripts/dorsale/engines.coffee
 - app/assets/javascripts/dorsale/engines/alexandrie.coffee
-- app/assets/javascripts/dorsale/engines/billing_machine.coffee
+- app/assets/javascripts/dorsale/engines/billing_machine.coffee.erb
 - app/assets/javascripts/dorsale/engines/customer_vault.coffee
 - app/assets/javascripts/dorsale/engines/flyboy.coffee
 - app/assets/javascripts/url.min.js