dorsale 2.1.15 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3505e14196dde3c953a66cb0db7901fe2a6e20f0
-  data.tar.gz: e8bf1414ac980b8fd95cc0df7e3f4943724f475c
+  metadata.gz: 8867b1166c306db7c1c1227b6620e7ebf33052fa
+  data.tar.gz: 9307c0cc4c70c94828974ac1cd8c4de1b4fbf941
 SHA512:
-  metadata.gz: a0c488c7bffed695829fdda51fa4888b53761ab76e2bff4c70987f7873c20a3ff5570a913615adece5e62c4d295a035243236ba86c2d863b10e3e9322aeb877d
-  data.tar.gz: 58a36440d6ba7aebab56eae3ad9760c0c99acb7abec442fcf8ede2d772cee96a78d5d67a150f8d95d5a99c71f22c0980d8c79446ed88d0cac5f5af250931dba7
+  metadata.gz: 255fcb3f86de25c676ef57fb49b27ae7c33992cfa39ebddf00f97bafec4eb5332bc74d4a0d6909e289fab1bc59fd268fdaeb13af947d0212c3c91eb071e51f1d
+  data.tar.gz: 4be0167e0b53ddd496154153883b95a436fd3c14d18e1d487767a69ee3220c9068aa2d7675c42b89c157369cb34ad66f4184fca8cc5c8734a8b8588faf7df703

data/app/assets/javascripts/dorsale/billing_machine/all.coffee

@@ -1,20 +1,85 @@
 //= require_tree .
 
 accounting.settings =
-  currency:
-    symbol : "€"   # default currency symbol is '$'
-    format: "%v%s" # controls output: %s = symbol, %v = value/number (can be object: see below)
-    decimal : ","  # decimal point separator
-    thousand: "."  # thousands separator
-    precision : 2   # decimal places
-
   number:
-    precision : 2  # default precision on numbers is 0
-    thousand: "."
+    precision : 2
+    thousand: " "
     decimal : ","
 
-window.display_euros = (amount, target) ->
-  if isNaN amount
-    target.text('Saisie invalide')
-  else
-    target.text(accounting.formatMoney(amount))
+window.str2num = (str) ->
+  parseFloat(String(str).replace(",", ".").replace(" ", "")) || 0.0
+
+window.num2str = (num) ->
+  num = parseFloat(num)
+  accounting.formatNumber(num)
+
+$(document).on "ready page:load cocoon:after-insert", ->
+  $("#billing_machine-form input.number").keyup ->
+    total_excluding_taxes = 0.0
+
+    # Update line totals
+    $("#billing_machine-form .line").map ->
+      quantity   = str2num $(this).find(".line-quantity input").val()
+      unit_price = str2num $(this).find(".line-unit_price input").val()
+      line_total = unit_price * quantity
+      $(this).find(".line-total input").val num2str line_total
+
+      total_excluding_taxes += line_total
+
+    # Substract discount to total excluding taxes
+    commercial_discount   = str2num $(".commercial_discount input").val()
+    raw_total_excluding_taxes = total_excluding_taxes
+    total_excluding_taxes = raw_total_excluding_taxes - commercial_discount
+    $(".total_excluding_taxes input").val num2str total_excluding_taxes
+
+    discount_rate = commercial_discount / raw_total_excluding_taxes
+
+    # VAT amount based on each line total with discount rate
+    vat_amount = 0.0
+    $("#billing_machine-form .line").map ->
+      # Per line VAT rate
+      if $(this).find(".line-vat_rate input").length > 0
+        vat_rate = str2num $(this).find(".line-vat_rate input").val()
+      # Global VAT rate
+      else
+        vat_rate = str2num $("#totals-table .vat_rate input").val()
+
+      line_total = str2num $(this).find(".line-total input").val()
+      discounted_line_total = line_total - (line_total * discount_rate)
+      line_vat_amount = discounted_line_total * vat_rate / 100
+      vat_amount += line_vat_amount
+    $(".vat_amount input").val num2str vat_amount
+
+    total_including_taxes = total_excluding_taxes + vat_amount
+    $(".total_including_taxes input").val num2str total_including_taxes
+
+    # Advances is for invoices only, not for quotations
+    if $(".advance input").length > 0 && $(".balance input").length > 0
+      advance = str2num $(".advance input").val()
+      balance = total_including_taxes - advance
+      $(".balance input").val num2str balance
+
+  # Update amount on page load
+  $("#billing_machine-form input").keyup()
+
+  # Format all input correctly
+  $("#billing_machine-form input.number").blur ->
+    $("#billing_machine-form input.number").map ->
+      formatted_number = num2str str2num $(this).val()
+      $(this).val formatted_number
+  $("#billing_machine-form input.number").blur()
+
+  # Auto ajust line label textarea height
+  $("#billing_machine-form textarea").keyup ->
+     this.rows = this.value.split("\n").length
+  $("#billing_machine-form textarea").keyup()
+
+  # Fix Cocoon bug
+  $("#billing_machine-form .line textarea").map ->
+    this.value = this.value.trim()
+
+  # Button to delete line
+  $("#billing_machine-form a.delete").click ->
+    $(this).parents("td").find("input").val(1)
+    $(this).parents("tr").hide()
+    return false

data/app/assets/stylesheets/dorsale/billing_machine/all.sass

@@ -13,3 +13,126 @@
 
   .on_alert
     background: $state-danger-bg !important
+
+
+#billing_machine-form,
+#billing_machine-show
+  table
+    width: 100%
+
+    td, th
+      border: 1px solid #DDD
+
+    th
+      width: 8em
+      padding: 0.5em
+
+    td
+      padding: 0 0.25em 0 0
+
+    td > input,
+    td > textarea,
+      text-align: right
+      margin: 0.5em 0 0.5em 1em
+      padding: 0.5em
+      background: transparent
+      width: calc(100% - 2em)
+      outline: none
+      border: none
+      border-radius: 0px !important
+      box-shadow: none
+      border-bottom: 1px solid #E0E0E0
+
+    textarea
+      display: block
+      height: initial !important
+      resize: none
+      overflow: hidden
+
+    span.unit
+      display: inline-block
+      width: 1em
+      text-align: right
+
+    th.line-label
+      width: auto
+      text-align: left
+
+    td.line-label,
+    td.line-label input,
+    td.line-label textarea,
+    td.line-unit,
+    td.line-unit input,
+    td.line-unit textarea,
+      text-align: left
+
+    th.actions,
+    td.actions,
+      padding: 0
+      width: 2.5em
+      text-align: center
+
+    th.actions
+      border: none
+
+    // disabled fields
+    td[class*=total],
+    td[class*=balance],
+    td[class*=vat_amount],
+      background: #F1F2F3
+
+      > input
+        border: none
+
+    tfoot td[colspan],
+      border: none
+
+  a#add-new-line
+    margin-bottom: 3em
+
+  .form-control
+    @extend .input-sm
+
+  .form-group
+    margin: 0
+
+  .form-group + .form-group
+    margin-top: 1em
+
+  label abbr
+    border: none
+
+  #lines-table
+    margin-bottom: 2em
+
+  #totals-table
+    width: 24em
+    margin: 0 0 0 auto
+
+    th
+      width: 16em
+      text-align: right
+      padding-right: 1em
+
+    td
+      width: 8em
+
+  #quotation_comments
+    height: 5.5em !important
+
+
+#billing_machine-show
+  table
+    th, td
+      padding: 0.5em
+
+    td
+      text-align: right
+
+    td[class*=total],
+    td[class*=balance],
+    td[class*=vat_amount],
+      background: #FFFFFF
+
+#billing_machine-show + .attachments-panel
+  margin-top: 1em

data/app/controllers/dorsale/billing_machine/invoices_controller.rb

@@ -149,9 +149,8 @@ module Dorsale
           :paid,
           :date,
           :commercial_discount,
-          :vat_amount,
-          :advance,
           :vat_rate,
+          :advance,
           :due_date,
           :lines_attributes => [
             :_destroy,
@@ -160,6 +159,7 @@ module Dorsale
             :quantity,
             :unit,
             :unit_price,
+            :vat_rate,
           ],
         ]
       end

data/app/controllers/dorsale/billing_machine/quotations_controller.rb

@@ -23,9 +23,9 @@ module Dorsale
         @quotations_without_pagination = @quotations # All filtered quotations (not paginated)
         @quotations = @quotations.page(params[:page]).per(50)
 
-        @total_duty = @quotations_without_pagination.to_a
+        @total_excluding_taxes = @quotations_without_pagination.to_a
           .select{ |q| q.state != "canceled" }
-          .map(&:total_duty)
+          .map(&:total_excluding_taxes)
           .delete_if(&:blank?)
           .sum
 
@@ -35,9 +35,9 @@ module Dorsale
           .delete_if(&:blank?)
           .sum
 
-        @total_all_taxes = @quotations_without_pagination.to_a
+        @total_including_taxes = @quotations_without_pagination.to_a
           .select{ |q| q.state != "canceled" }
-          .map(&:total_all_taxes)
+          .map(&:total_including_taxes)
           .delete_if(&:blank?)
           .sum
 
@@ -170,7 +170,6 @@ module Dorsale
           :date,
           :expires_at,
           :comments,
-          :vat_amount,
           :vat_rate,
           :commercial_discount,
           :lines_attributes => [
@@ -180,6 +179,7 @@ module Dorsale
             :quantity,
             :unit,
             :unit_price,
+            :vat_rate,
           ],
         ]
       end

data/app/helpers/dorsale/text_helper.rb

@@ -53,20 +53,38 @@ module Dorsale
       strip_tags(str).gsub("\n", "<br />").html_safe
     end
 
-    def info(object, attribute, text = nil)
-      label = content_tag(:strong) do
-        object.t(attribute)
-      end
-
-      span_css_class = "#{object.class.model_name.element}-#{attribute}"
-
-      value = content_tag(:span, class: span_css_class) do
-        ( text || object.send(attribute) ).to_s
+    def info(object, attribute, text_or_options = nil, options = {})
+      if text_or_options.is_a?(Hash)
+        text    = nil
+        options = text_or_options
+      else
+        text = text_or_options
       end
 
-      content_tag(:div, class: "info") do
-        "#{label} : #{value}".html_safe
+      label     = options[:label]     || object.t(attribute)
+      tag       = options[:tag]       || :div
+      separator = options[:separator] || " : "
+      helper    = options[:helper]
+      i18n_key  = "#{object.class.to_s.tableize.singularize}/#{attribute}"
+      nested    = I18n.t("activerecord.attributes.#{i18n_key}").is_a?(Hash)
+
+      value = text
+      value = object.public_send(attribute)     if value.nil?
+      value = object.t("#{attribute}.#{value}") if nested
+      value = send(helper, value)               if helper
+      value = number(value)                     if value.is_a?(Numeric)
+      value = l(value)                          if value.is_a?(Time)
+      value = l(value)                          if value.is_a?(Date)
+      value = value.to_s
+
+      html_label     = content_tag(:strong, class: "info-label") { label }
+      span_css_class = "info-value #{object.class.model_name.element}-#{attribute}"
+      html_value     = content_tag(:span, class: span_css_class) { value }
+
+      content_tag(tag, class: "info") do
+        [html_label, separator, html_value].join.html_safe
       end
     end
-  end
-end
+
+  end # TextHelper
+end # Dorsale

data/app/models/dorsale/billing_machine.rb

@@ -0,0 +1,27 @@
+module Dorsale::BillingMachine
+  DEFAULT_VAT_RATE = 20.00
+
+  class << self
+    def vat_modes
+      [:single, :multiple]
+    end
+
+    def vat_mode
+      @vat_mode ||= :single
+    end
+
+    def vat_mode=(new_mode)
+      raise "invalid mode #{new_mode}" unless vat_modes.include?(new_mode)
+      @vat_mode = new_mode
+    end
+
+    def invoice_pdf_model
+      "::Dorsale::BillingMachine::Invoice#{vat_mode.to_s.capitalize}VatPdf".constantize
+    end
+
+    def quotation_pdf_model
+      "::Dorsale::BillingMachine::Quotation#{vat_mode.to_s.capitalize}VatPdf".constantize
+    end
+
+  end
+end

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

@@ -21,16 +21,14 @@ module Dorsale
 
       def initialize(*args)
         super
-        self.date                = Date.today       if date.nil?
-        self.due_date            = 30.days.from_now if due_date.nil?
-        self.vat_rate            = 20               if vat_rate.nil?
-        self.advance             = 0                if advance.nil?
-        self.commercial_discount = 0                if commercial_discount.nil?
-        self.paid                = false            if paid.nil?
+        assign_default_values
+        self.due_date              = 30.days.from_now if due_date.nil?
+        self.date                  = Date.today       if date.nil?
       end
 
       before_create :assign_unique_index
       before_create :assign_tracking_id
+      before_validation :assign_default_values
 
       def assign_unique_index
         if unique_index.nil?
@@ -42,24 +40,75 @@ module Dorsale
         self.tracking_id = date.year.to_s + "-" + unique_index.to_s.rjust(2, "0")
       end
 
-      before_save :update_balance
+      def assign_default_values
+        self.advance               = 0.0   if advance.nil?
+        self.vat_amount            = 0.0   if vat_amount.nil?
+        self.commercial_discount   = 0.0   if commercial_discount.nil?
+        self.total_excluding_taxes = 0.0   if total_excluding_taxes.nil?
+        self.paid                  = false if paid.nil?
+      end
+
+      before_save :update_totals
+
+      def update_totals
+        assign_default_values
+        lines_sum = lines.map(&:total).sum
+
+        self.total_excluding_taxes = lines_sum - commercial_discount
+
+        if commercial_discount.nonzero? && lines_sum.nonzero?
+          discount_rate = commercial_discount / lines_sum
+        else
+          discount_rate = 0.0
+        end
+
+        self.vat_amount = 0.0
 
-      def update_balance
-        self.vat_rate            = 0 if vat_rate.nil?
-        self.advance             = 0 if advance.nil?
-        self.commercial_discount = 0 if commercial_discount.nil?
-        self.total_duty          = (lines.pluck(:total)).sum - commercial_discount
-        self.vat_amount          = total_duty * vat_rate / 100.0
-        self.total_all_taxes     = total_duty + vat_amount
-        self.balance             = total_all_taxes - advance
+        lines.each do |line|
+          line_total = line.total - (line.total * discount_rate)
+          self.vat_amount += (line_total * line.vat_rate / 100.0)
+        end
+
+        self.total_including_taxes = total_excluding_taxes + vat_amount
+        self.balance               = total_including_taxes - advance
       end
 
       def pdf
-        pdf = ::Dorsale::BillingMachine::InvoicePdf.new(self)
+        pdf = ::Dorsale::BillingMachine.invoice_pdf_model.new(self)
         pdf.build
         pdf
       end
 
+      def vat_rate
+        if ::Dorsale::BillingMachine.vat_mode == :multiple
+          raise "Invoice#vat_rate is not available in multiple vat mode"
+        end
+
+        return @vat_rate if @vat_rate
+
+        vat_rates = lines.map(&:vat_rate).uniq
+
+        if vat_rates.length > 1
+          raise "Invoice has multiple vat rates"
+        end
+
+        vat_rates.first || ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+      end
+
+      def vat_rate=(value)
+        @vat_rate = value
+      end
+
+      before_validation :apply_vat_rate_to_lines
+
+      def apply_vat_rate_to_lines
+        return if ::Dorsale::BillingMachine.vat_mode == :multiple
+
+        lines.each do |line|
+          line.vat_rate = vat_rate
+        end
+      end
+
       def payment_status
         if paid?
           return :paid
@@ -74,6 +123,18 @@ module Dorsale
         end
       end
 
+      def total_excluding_taxes=(*); super; end
+      private :total_excluding_taxes=
+
+      def vat_amount=(*); super; end
+      private :vat_amount=
+
+      def total_including_taxes=(*); super; end
+      private :total_including_taxes=
+
+      def balance=(*); super; end
+      private :balance=
+
       def self.to_csv(options = { :force_quotes => true, :col_sep => ";" })
         CSV.generate(options) do |csv|
           column_names = [
@@ -88,7 +149,6 @@ module Dorsale
             "Pays",
             "Remise commerciale",
             "Montant HT",
-            "Taux TVA",
             "Montant TVA",
             "Montant TTC",
             "Acompte",
@@ -109,10 +169,9 @@ module Dorsale
               invoice.customer.try(:address).try(:city),
               invoice.customer.try(:address).try(:country),
               french_number(invoice.commercial_discount),
-              french_number(invoice.total_duty),
-              french_number(invoice.vat_rate),
+              french_number(invoice.total_excluding_taxes),
               french_number(invoice.vat_amount),
-              french_number(invoice.total_all_taxes),
+              french_number(invoice.total_including_taxes),
               french_number(invoice.advance),
               french_number(invoice.balance)
             ]