dorsale 2.1.15 → 2.2.0

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

@@ -5,21 +5,35 @@ module Dorsale
 
       belongs_to :invoice, inverse_of: :lines
 
+      validates :invoice, presence: true
+
       default_scope -> {
         order(created_at: :asc)
       }
 
-      before_save :update_total
+      def initialize(*)
+        super
+        assign_default_values
+      end
+
+      before_validation :assign_default_values
+      before_validation :update_total
 
-      def update_total
+      def assign_default_values
         self.quantity   ||= 0
         self.unit_price ||= 0
+        self.vat_rate   ||= ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+      end
+
+      def update_total
+        assign_default_values
         self.total = self.quantity * self.unit_price
       end
 
-      # ???
-      after_save do
-        self.invoice.reload.save
+      after_save :update_invoice_total
+
+      def update_invoice_total
+        self.invoice.reload.save!
       end
 
     end

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

@@ -29,17 +29,16 @@ module Dorsale
       # simple_form
       validates :id_card_id, presence: true
 
-      def initialize(*args)
+      def initialize(*)
         super
-        self.date                = Date.today     if date.nil?
-        self.expires_at          = date + 1.month if expires_at.nil?
-        self.vat_rate            = 20             if vat_rate.nil?
-        self.commercial_discount = 0              if commercial_discount.nil?
-        self.state               = STATES.first   if state.nil?
+        self.state                 = STATES.first   if state.nil?
+        self.date                  = Date.today     if date.nil?
+        assign_default_values
       end
 
       before_create :assign_unique_index
       before_create :assign_tracking_id
+      before_validation :assign_default_values
 
       def assign_unique_index
         if unique_index.nil?
@@ -51,18 +50,82 @@ module Dorsale
         self.tracking_id = date.year.to_s + "-" + unique_index.to_s.rjust(2, "0")
       end
 
-      before_save :update_total
+      def assign_default_values
+        self.expires_at            = date + 1.month if expires_at.nil?
+        self.commercial_discount   = 0              if commercial_discount.nil?
+        self.vat_amount            = 0              if vat_amount.nil?
+        self.total_excluding_taxes = 0              if total_excluding_taxes
+      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
 
-      def update_total
-        self.vat_rate            = 0 if vat_rate.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
+        if commercial_discount.nonzero? && lines_sum.nonzero?
+          discount_rate = commercial_discount / lines_sum
+        else
+          discount_rate = 0.0
+        end
+
+        self.vat_amount = 0.0
+
+        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
+      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
+        self.total_including_taxes
+      end
+
+      def vat_rate
+        if ::Dorsale::BillingMachine.vat_mode == :multiple
+          raise "Quotation#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 "Quotation 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 pdf
-        pdf = ::Dorsale::BillingMachine::QuotationPdf.new(self)
+        pdf = ::Dorsale::BillingMachine.quotation_pdf_model.new(self)
         pdf.build
         pdf
       end

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

@@ -4,22 +4,37 @@ module Dorsale
       self.table_name = "dorsale_billing_machine_quotation_lines"
 
       belongs_to :quotation, inverse_of: :lines
+
+      validates :quotation, presence: true
+
       default_scope -> {
         order(:created_at => :asc)
       }
 
-      before_save :update_total
+      def initialize(*)
+        super
+        assign_default_values
+      end
 
-      def update_total
-        self.quantity ||= 0
+      before_validation :update_total
+
+      def assign_default_values
+        self.quantity   ||= 0
         self.unit_price ||= 0
+        self.vat_rate   ||= ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+      end
+
+      def update_total
+        assign_default_values
         self.total = self.quantity * self.unit_price
       end
 
-      # ???
-      after_save do
-        self.quotation.reload.save
+      after_save :update_quotation_total
+
+      def update_quotation_total
+        self.quotation.reload.save!
       end
+
     end
   end
 end

data/app/pdfs/dorsale/billing_machine/invoice_multiple_vat_pdf.rb

@@ -0,0 +1,130 @@
+module Dorsale
+  module BillingMachine
+    class InvoiceMultipleVatPdf < ::Dorsale::BillingMachine::InvoiceSingleVatPdf
+
+      def first_column_width
+        6.4.cm
+      end
+
+      def second_column_width
+        2.cm
+      end
+
+      def third_column_width
+        second_column_width
+      end
+
+      def fourth_column_width
+       second_column_width
+      end
+
+      def fifth_column_width
+        2.9.cm
+      end
+
+      def last_column_width
+        bounds.width - first_column_width - second_column_width - third_column_width - fourth_column_width - fifth_column_width
+      end
+
+      def build_table
+        left   = bounds.left
+        top    = bounds.top
+        width  = bounds.width - left
+
+        bounding_box [left, top], width: width, height: 9.5.cm do
+          repeat :all do
+            float do
+                table [["","","","","",""]],
+                    :column_widths => [first_column_width, second_column_width, third_column_width, fourth_column_width, fifth_column_width, last_column_width],
+                    :cell_style => {:height => 9.5.cm} do
+                      row(0).style :text_color       => BLACK
+                      row(0).style :font_style       => :bold
+                      column(0).style :align => :left
+                      column(1..4).style :align => :right
+                    end
+                 end
+              end
+          end
+
+        bounding_box [left, top], width: width, height: 8.8.cm do
+          draw_bounds_debug
+          repeat :all do
+            build_line
+          end
+          table_products = [[I18n.t("pdfs.designation"),
+            I18n.t("pdfs.quantity"),
+            I18n.t("pdfs.unity"),
+            I18n.t("pdfs.tax"),
+            I18n.t("pdfs.unit_price"),
+            I18n.t("pdfs.line_total")]]
+
+
+          @main_document.lines.each do |line|
+            table_products.push [line.label,
+                number(line.quantity).gsub(",00","").gsub(".00",""),
+                line.unit,
+                percentage(line.vat_rate),
+                euros(line.unit_price),
+                euros(line.total),]
+          end
+
+        table table_products,
+          :column_widths => [first_column_width, second_column_width, third_column_width, fourth_column_width, fifth_column_width, last_column_width],
+          :header => true,
+          :cell_style    => {border_width: 0} do
+            row(0).font_style = :bold
+            row(0).border_width = 1,
+            cells.style do |c|
+              c.align = c.column == 0 ? :left : :right
+            end
+          end
+        end
+      end
+
+      def build_total
+
+        left   = bounds.left
+        top    = bounds.top - 10.3.cm
+        width  = bounds.width - left
+
+        bounding_box [left, top], width: width, height: middle_height - 9.5.cm do
+          draw_bounds_debug
+
+          table_totals = [[]]
+
+          if has_discount
+            table_totals.push ["#{I18n.t("pdfs.commercial_discount")}", "\- #{euros(@main_document.commercial_discount)}"]
+          end
+
+          table_totals.push ["#{I18n.t("pdfs.total_excluding_taxes")}", euros(@main_document.total_excluding_taxes)]
+
+          table_totals.push ["#{I18n.t("pdfs.vat_amount")}", euros(@main_document.vat_amount)]
+
+          if has_advance
+            table_totals.push ["#{I18n.t("pdfs.advance")}", euros(@main_document.advance)]
+            table_totals.push ["#{I18n.t("pdfs.total_including_taxes")}", euros(@main_document.balance)]
+          else
+            table_totals.push ["#{I18n.t("pdfs.total_including_taxes")}", euros(@main_document.total_including_taxes)]
+          end
+
+          table table_totals,
+            :column_widths => [fifth_column_width , last_column_width],
+            :cell_style    => {border_width: [0, 1, 0 ,0]},
+            :position      => :right do
+              row(-1).style :font_style       => :bold
+              column(0).padding_right = 0.2.cm
+              row(-1).borders = [:top, :right]
+              row(-1).border_width = 1
+              cells.style do |c|
+                c.align = :right
+              end
+            end
+          stroke do
+            rectangle [(bounds.right - fifth_column_width - last_column_width), bounds.top], (fifth_column_width + last_column_width), (bounds.top-cursor)
+          end
+        end
+      end
+
+    end
+  end
+end

data/app/pdfs/dorsale/billing_machine/{invoice_pdf.rb → invoice_single_vat_pdf.rb}

@@ -2,7 +2,7 @@ require "prawn/measurement_extensions"
 
 module Dorsale
   module BillingMachine
-    class InvoicePdf < Prawn::Document
+    class InvoiceSingleVatPdf < Prawn::Document
       include Dorsale::Alexandrie::Prawn
       include Dorsale::AllHelpers
       include ActionView::Helpers::NumberHelper
@@ -284,16 +284,16 @@ module Dorsale
             table_totals.push ["#{I18n.t("pdfs.commercial_discount")}", "\- #{euros(@main_document.commercial_discount)}"]
           end
 
-          table_totals.push ["#{I18n.t("pdfs.total_duty")}", euros(@main_document.total_duty)]
+          table_totals.push ["#{I18n.t("pdfs.total_excluding_taxes")}", euros(@main_document.total_excluding_taxes)]
 
           vat_rate = number(@main_document.vat_rate)
           table_totals.push ["#{I18n.t("pdfs.vat")}#{vat_rate} %", euros(@main_document.vat_amount)]
 
           if has_advance
             table_totals.push ["#{I18n.t("pdfs.advance")}", euros(@main_document.advance)]
-            table_totals.push ["#{I18n.t("pdfs.total_all_taxes")}", euros(@main_document.balance)]
+            table_totals.push ["#{I18n.t("pdfs.total_including_taxes")}", euros(@main_document.balance)]
           else
-            table_totals.push ["#{I18n.t("pdfs.total_all_taxes")}", euros(@main_document.total_all_taxes)]
+            table_totals.push ["#{I18n.t("pdfs.total_including_taxes")}", euros(@main_document.total_including_taxes)]
           end
 
           table table_totals,
@@ -419,4 +419,4 @@ module Dorsale
       end
     end
   end
-end
+end

data/app/pdfs/dorsale/billing_machine/quotation_multiple_vat_pdf.rb

@@ -0,0 +1,7 @@
+module Dorsale
+  module BillingMachine
+    class QuotationMultipleVatPdf < ::Dorsale::BillingMachine::InvoiceMultipleVatPdf
+      include ::Dorsale::BillingMachine::QuotationPdfCommonMethods
+    end
+  end
+end

data/app/pdfs/dorsale/billing_machine/{quotation_pdf.rb → quotation_pdf_common_methods.rb}

@@ -1,6 +1,6 @@
 module Dorsale
   module BillingMachine
-    class QuotationPdf < ::Dorsale::BillingMachine::InvoicePdf
+    module QuotationPdfCommonMethods
       def build
         super
         build_attachments

data/app/pdfs/dorsale/billing_machine/quotation_single_vat_pdf.rb

@@ -0,0 +1,7 @@
+module Dorsale
+  module BillingMachine
+    class QuotationSingleVatPdf < ::Dorsale::BillingMachine::InvoiceSingleVatPdf
+      include ::Dorsale::BillingMachine::QuotationPdfCommonMethods
+    end
+  end
+end

data/app/views/dorsale/billing_machine/invoices/_data_context.html.slim

@@ -1,10 +1,10 @@
 .invoice-context: .context
   = context_title ::Dorsale::BillingMachine::Invoice.t(:data)
 
-  - total_duty = @invoices_without_pagination.map(&:total_duty).delete_if {|e| e.blank?}.inject(:+) || 0
+  - total_excluding_taxes = @invoices_without_pagination.map(&:total_excluding_taxes).delete_if {|e| e.blank?}.inject(:+) || 0
   - vat_amount = @invoices_without_pagination.map(&:vat_amount).delete_if {|e| e.blank?}.inject(:+) || 0
-  - total_all_taxes = @invoices_without_pagination.map(&:total_all_taxes).delete_if {|e| e.blank?}.inject(:+) || 0
+  - total_including_taxes = @invoices_without_pagination.map(&:total_including_taxes).delete_if {|e| e.blank?}.inject(:+) || 0
 
-  = context_info ::Dorsale::BillingMachine::Invoice.t(:total_duty), euros(total_duty)
+  = context_info ::Dorsale::BillingMachine::Invoice.t(:total_excluding_taxes), euros(total_excluding_taxes)
   = context_info ::Dorsale::BillingMachine::Invoice.t(:vat_amount), euros(vat_amount)
-  = context_info ::Dorsale::BillingMachine::Invoice.t(:total_all_taxes), euros(total_all_taxes)
+  = context_info ::Dorsale::BillingMachine::Invoice.t(:total_including_taxes), euros(total_including_taxes)

data/app/views/dorsale/billing_machine/invoices/_details.html.slim

@@ -0,0 +1,130 @@
+- vat_mode      = ::Dorsale::BillingMachine.vat_mode
+- document_type = document.class.to_s.split("::").last.downcase.to_sym
+
+#billing_machine-show
+  h1
+    = document.class.t.capitalize
+    - if document.tracking_id.present?
+      = " n° "
+      = document.tracking_id
+
+  .row
+    .col-md-6
+      .well
+        = info document, :label
+
+    .col-md-6
+      .well
+        = info document, :date
+        hr
+          - if document.customer.present?
+            = document.customer.name
+            br
+            = document.customer.address.street
+            br
+            = document.customer.address.street_bis
+            br
+            = document.customer.address.zip
+            = " "
+            = document.customer.address.city
+            br
+            = document.customer.address.country
+
+  table#lines-table
+    thead
+      tr
+        th.line-label      = document.lines.first.class.t(:label)
+        th.line-quantity   = document.lines.first.class.t(:quantity)
+        th.line-unit       = document.lines.first.class.t(:unit)
+        - if vat_mode == :multiple
+          th.line-vat_rate   = document.lines.first.class.t(:vat_rate)
+        th.line-unit_price = document.lines.first.class.t(:unit_price)
+        th.line-total      = document.lines.first.class.t(:total)
+
+    tbody
+      - document.lines.each do |line|
+        = render "line_details", line: line
+
+  .row
+    .col-sm-6
+      .well
+        = document.payment_term.try(:label)
+
+        - if document_type == :invoice
+          = info document, :due_date
+          = info document, :paid
+
+        - if document_type == :quotation
+          = info document, :state
+          br
+
+          = info document, :expires_at
+          br
+
+          - if document.comments.present?
+            = info document, :comments, text2html(document.comments), separator: " :<br />"
+            br
+
+
+    .col-sm-6
+        table#totals-table
+          tbody
+            - if document.commercial_discount.nonzero?
+              tr
+                th.commercial_discount-label
+                  = document.class.t(:commercial_discount)
+
+                td.commercial_discount
+                  = " - #{euros document.commercial_discount}"
+
+
+            tr
+              th.total_excluding_taxes-label
+                = document.class.t(:total_excluding_taxes)
+
+              td.total_excluding_taxes
+                = euros document.total_excluding_taxes
+
+            - if vat_mode == :single
+              tr
+                th.vat_rate-label
+                  = document.class.t(:vat_rate)
+
+                td.vat_rate
+                  = percentage document.vat_rate
+
+            tr
+              th.vat_amount-label
+                = document.class.t(:vat_amount)
+
+              td.vat_amount
+                = euros document.vat_amount
+
+            tr
+              th.total_including_taxes-label
+                = document.class.t(:total_including_taxes)
+
+              td.total_including_taxes
+                = euros document.total_including_taxes
+
+            - if document.respond_to?(:advance)
+              - document.advance.present?
+                tr
+                  th.advance-label
+                    = document.class.t(:advance)
+
+                  td.advance
+                    = euros document.advance
+
+              tr
+                th.balance-label
+                  = document.class.t(:balance)
+
+                td.balance
+                  = euros document.balance
+
+- if document_type == :quotation
+  .attachments-panel
+    = panel title: document.t(:documents)
+      .panel-body
+        = attachments_for document