dorsale 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 036a8e7daa4a56228015f33c54a49e8e8d49166d
-  data.tar.gz: 7581a26c6609bd540efc2b6e5f46fe57f1c82a6a
+  metadata.gz: 57956c90cb324e65238ad0d72a66b538e044ba40
+  data.tar.gz: 8e614d4582c2c2909ec67ad5c509daae956c87d2
 SHA512:
-  metadata.gz: 66305f6892647ddb286998294a010a5df74b8a3185c73e4f5473f28e488d83576df9315de351ede8ccf6f8fdb6a4bda34fbd1ad7fd9233e6d0a76c59c8a37e2a
-  data.tar.gz: aa9c94689862dbb754c1b311808f270bf9cb0605cb2c5df8dad3f7992efe32fe3bec83d44c2bb0aff0382277a8947b97012da8e151dcd7d819c0db2ad27b71f6
+  metadata.gz: 0553f289005f1bab1508e99e70ffd98dfe45af6fcd0cf1c9f2a88ef05df9d8b710433087ba8ec525c4cead1c4e54698795a8224a4d0c2f96a14eb50ffe0d41e5
+  data.tar.gz: 5e0b1645df02305d039f82fe5fec1da5179cfb664262c8953e0ad3fa92bb3d7915e4b093c2a7a2d469332f57cc83adf0ae617ab3088667c2669a43416185de99

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

@@ -11,14 +11,17 @@ $(document).on "ready page:load", ->
 
     update_total = ->
       total_duty = 0
-      vat_rate = $('#invoice_vat_rate').val().replace(',', '.')
-      advance = $('#invoice_advance').val().replace(',', '.')
+      vat_rate = parseFloat $('#invoice_vat_rate').val().replace(',', '.') || 0
+      advance = parseFloat $('#invoice_advance').val().replace(',', '.') || 0
+      commercial_discount = parseFloat $('#invoice_commercial_discount').val().replace(',', '.') || 0
 
       $('.invoice-line').each (index, element)->
           remove_me = $(element).find('.remove-line input[type="hidden"]').val()
           total_duty += sum_line $(element) if remove_me == 'false'
+      total_duty -= commercial_discount
       vat_amount = vat_rate * total_duty / 100.0
 
+      display_euros(commercial_discount, $('#invoice-commercial_discount'))
       display_euros(total_duty, $('#invoice-total_duty'))
       display_euros(vat_amount, $('#invoice-vat_amount'))
       display_euros(vat_amount+total_duty, $('#invoice-total_all_taxes'))
@@ -28,7 +31,7 @@ $(document).on "ready page:load", ->
     $('#invoice-lines').on 'input', 'input.line-quantity, input.line-unit_price', (event) ->
       update_line_total $(event.currentTarget).parents('.invoice-line')
       update_total()
-    $('#invoice').on 'input', 'input#invoice_vat_rate, input#invoice_advance', (event) ->
+    $('#invoice').on 'input','input#invoice_commercial_discount, input#invoice_vat_rate, input#invoice_advance', (event) ->
        update_total()
     $('#invoice').on 'cocoon:after-remove', (event) ->
        update_total()

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

@@ -11,23 +11,25 @@ $(document).on "ready page:load", ->
 
     update_total = ->
       total_duty = 0
-      vat_rate = $('#quotation_vat_rate').val().replace(',', '.')
+      vat_rate = parseFloat $('#quotation_vat_rate').val().replace(',', '.') || 0
+      commercial_discount = parseFloat $('#quotation_commercial_discount').val().replace(',', '.') || 0
 
       $('.quotation-line').each (index, element)->
           remove_me = $(element).find('.remove-line input[type="hidden"]').val()
           total_duty += sum_line $(element) if remove_me == 'false'
+      total_duty -= commercial_discount
       vat_amount = vat_rate * total_duty / 100.0
 
+      display_euros(commercial_discount, $('#quotation-commercial_discount'))
       display_euros(total_duty, $('#quotation-total_duty'))
       display_euros(vat_amount, $('#quotation-vat_amount'))
       display_euros(vat_amount+total_duty, $('#quotation-total_all_taxes'))
 
-
     # Set listener on inputs
     $('#quotation-lines').on 'input', 'input.line-quantity, input.line-unit_price', (event) ->
       update_line_total $(event.currentTarget).parents('.quotation-line')
       update_total()
-    $('#quotation').on 'input', 'input#quotation_vat_rate', (event) ->
+    $('#quotation').on 'input', 'input#quotation_commercial_discount, input#quotation_vat_rate', (event) ->
        update_total()
     $('#quotation').on 'cocoon:after-remove', (event) ->
        update_total()

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

@@ -147,6 +147,7 @@ module Dorsale
           :label,
           :paid,
           :date,
+          :commercial_discount,
           :vat_amount,
           :advance,
           :vat_rate,

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

@@ -131,6 +131,7 @@ module Dorsale
           :comments,
           :vat_amount,
           :vat_rate,
+          :commercial_discount,
           :lines_attributes => [
             :_destroy,
             :id,

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

@@ -21,11 +21,12 @@ 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.paid     = false            if paid.nil?
+        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?
       end
 
       before_create :assign_unique_index
@@ -44,12 +45,13 @@ module Dorsale
       before_save :update_balance
 
       def update_balance
-        self.vat_rate        = 0 if vat_rate.nil?
-        self.advance         = 0 if advance.nil?
-        self.total_duty      = lines.pluck(:total).sum
-        self.vat_amount      = total_duty * vat_rate / 100.0
-        self.total_all_taxes = total_duty + vat_amount
-        self.balance         = total_all_taxes - advance
+        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
       end
 
       def pdf
@@ -84,6 +86,7 @@ module Dorsale
             "Code postal",
             "Ville",
             "Pays",
+            "Remise commerciale",
             "Montant HT",
             "Taux TVA",
             "Montant TVA",
@@ -105,6 +108,7 @@ module Dorsale
               invoice.customer.try(:address).try(:zip),
               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.vat_amount),

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

@@ -28,9 +28,10 @@ module Dorsale
 
       def initialize(*args)
         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.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?
       end
 
       before_create :assign_unique_index
@@ -49,10 +50,11 @@ module Dorsale
       before_save :update_total
 
       def update_total
-        self.vat_rate        = 0 if vat_rate.nil?
-        self.total_duty      = lines.pluck(:total).sum
-        self.vat_amount      = total_duty * vat_rate / 100.0
-        self.total_all_taxes = total_duty + vat_amount
+        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
       end
 
       def pdf

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

@@ -123,6 +123,9 @@ module Dorsale
 
       def build_synthesis
         font_size 10
+          if (@main_document.commercial_discount && @main_document.commercial_discount != 0.0)
+            @table_matrix.push ['Remise commerciale', '', '', euros(@main_document.commercial_discount)]
+          end
           @table_matrix.push ['Net HT', '', '', euros(@main_document.total_duty)]
           vat_rate = french_number(@main_document.vat_rate)
           @table_matrix.push ["TVA #{vat_rate} %", '', '', euros(@main_document.vat_amount)]

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

@@ -28,6 +28,9 @@ module Dorsale
 
       def build_synthesis
         font_size 10
+          if (@main_document.commercial_discount && @main_document.commercial_discount != 0.0)
+            @table_matrix.push ['Remise commerciale', '', '', euros(@main_document.commercial_discount)]
+          end
           @table_matrix.push ['Net HT', '', '', euros(@main_document.total_duty)]
           vat_rate = french_number(@main_document.vat_rate)
           @table_matrix.push ["TVA #{vat_rate} %", '', '', euros(@main_document.vat_amount)]

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

@@ -17,6 +17,7 @@
       = f.input :customer_guid, collection: @people.map{ |e| [e.name, e.guid] }
       = f.input :vat_rate, as: :string
       = f.input :advance, as: :string
+      = f.input :commercial_discount, as: :string
 
       - if @id_cards.one?
         = f.hidden_field :id_card_id
@@ -31,6 +32,13 @@
         = link_to_add_association t("actions.add_line"), f, :lines, class: "btn btn-primary", id: "add-new-line"
 
     .total.well
+      .row
+        label.col-sm-3.control-label
+          = @invoice.t(:commercial_discount)
+          = " : "
+        .col-sm-9
+          .form-control-static#invoice-commercial_discount
+
       .row
         label.col-sm-3.control-label
           = @invoice.t(:total_duty)

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

@@ -22,16 +22,17 @@
       .col-xs-12.col-sm-6
         = info @invoice, :tracking_id
         = info @invoice, :label
-        = info @invoice, :date,            date(@invoice.date)
-        = info @invoice, :due_date,        date(@invoice.due_date)
-        = info @invoice, :payment_term,    @invoice.payment_term.try(:label)
-        = info @invoice, :vat_rate,        percentage(@invoice.vat_rate)
+        = info @invoice, :date,                date(@invoice.date)
+        = info @invoice, :due_date,            date(@invoice.due_date)
+        = info @invoice, :payment_term,        @invoice.payment_term.try(:label)
+        = info @invoice, :vat_rate,            percentage(@invoice.vat_rate)
         = info @invoice, :payment_status
-        = info @invoice, :total_duty,      euros(@invoice.total_duty)
-        = info @invoice, :vat_amount,      euros(@invoice.vat_amount)
-        = info @invoice, :advance,         euros(@invoice.advance)
-        = info @invoice, :total_all_taxes, euros(@invoice.total_all_taxes)
-        = info @invoice, :balance,         euros(@invoice.balance)
+        = info @invoice, :commercial_discount, euros(@invoice.commercial_discount)
+        = info @invoice, :total_duty,          euros(@invoice.total_duty)
+        = info @invoice, :vat_amount,          euros(@invoice.vat_amount)
+        = info @invoice, :advance,             euros(@invoice.advance)
+        = info @invoice, :total_all_taxes,     euros(@invoice.total_all_taxes)
+        = info @invoice, :balance,             euros(@invoice.balance)
 
     - @invoice.lines.each do |line|
       .panel.panel-default

data/app/views/dorsale/billing_machine/quotations/_form.html.slim

@@ -15,6 +15,7 @@
       = f.association :payment_term, collection: @payment_terms
       = f.input :customer_guid, collection: @people.map{ |e| [e.name, e.guid] }
       = f.input :vat_rate, as: :string
+      = f.input :commercial_discount, as: :string
 
       - if @id_cards.one?
         = f.hidden_field :id_card_id
@@ -31,6 +32,13 @@
         = link_to_add_association t("actions.add_line"), f, :lines, class: "btn btn-primary", id: "add-new-line"
 
     .total.well
+      .row
+        label.col-sm-3.control-label
+          = @quotation.t(:commercial_discount)
+          = " : "
+        .col-sm-9
+          .form-control-static#quotation-commercial_discount
+
       .row
         label.col-sm-3.control-label
           = @quotation.t(:total_duty)

data/app/views/dorsale/billing_machine/quotations/show.html.slim

@@ -22,13 +22,14 @@
       .col-xs-12.col-sm-6
         = info @quotation, :tracking_id
         = info @quotation, :label
-        = info @quotation, :date,            date(@quotation.date)
-        = info @quotation, :expires_at,      date(@quotation.expires_at)
-        = info @quotation, :payment_term,    @quotation.payment_term.try(:label)
-        = info @quotation, :vat_rate,        percentage(@quotation.vat_rate)
-        = info @quotation, :total_duty,      euros(@quotation.total_duty)
-        = info @quotation, :vat_amount,      euros(@quotation.vat_amount)
-        = info @quotation, :total_all_taxes, euros(@quotation.total_all_taxes)
+        = info @quotation, :date,                date(@quotation.date)
+        = info @quotation, :expires_at,          date(@quotation.expires_at)
+        = info @quotation, :payment_term,        @quotation.payment_term.try(:label)
+        = info @quotation, :vat_rate,            percentage(@quotation.vat_rate)
+        = info @quotation, :commercial_discount, euros(@quotation.commercial_discount)
+        = info @quotation, :total_duty,          euros(@quotation.total_duty)
+        = info @quotation, :vat_amount,          euros(@quotation.vat_amount)
+        = info @quotation, :total_all_taxes,     euros(@quotation.total_all_taxes)
 
     - @quotation.lines.each do |line|
       .panel.panel-default

data/config/locales/billing_machine.fr.yml

@@ -6,6 +6,8 @@ fr:
       dorsale/billing_machine/id_card: "carte d'identité"
       dorsale/billing_machine/payment_term: "conditions de paiement"
 
+
+
     attributes:
       dorsale/billing_machine/id_card:
         id_card_name: "nom de la carte"

data/config/locales/common.en.yml

@@ -135,6 +135,7 @@ en:
     total_all_taxes       : "Total all taxes"
     balance               : "Balance"
     expires_at            : "Expires at"
+    commercial_discount   : "Commercial discount"
 
   errors:
     messages:

data/config/locales/common.fr.yml

@@ -135,6 +135,7 @@ fr:
     total_all_taxes       : "Total TTC"
     balance               : "Total à payer"
     expires_at            : "Date d'expiration"
+    commercial_discount   : "Remise commerciale"
 
   errors:
     messages:

data/db/migrate/20151012181412_add_commercial_discount_to_invoices_and_quotations.rb

@@ -0,0 +1,12 @@
+class AddCommercialDiscountToInvoicesAndQuotations < ActiveRecord::Migration
+  def change
+    add_column :dorsale_billing_machine_quotations, :commercial_discount, :decimal
+    add_column :dorsale_billing_machine_invoices, :commercial_discount, :decimal
+  end
+
+  def down
+    remove_column :dorsale_billing_machine_quotations, :commercial_discount
+    remove_column :dorsale_billing_machine_invoices, :commercial_discount
+  end
+
+end

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "2.1.5"
+  VERSION = "2.1.6"
 end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150805134318) do
+ActiveRecord::Schema.define(version: 20151012181412) do
 
   create_table "dorsale_addresses", force: :cascade do |t|
     t.string   "street"
@@ -95,9 +95,10 @@ ActiveRecord::Schema.define(version: 20150805134318) do
     t.decimal  "vat_rate"
     t.boolean  "paid"
     t.date     "due_date"
-    t.datetime "created_at",      null: false
-    t.datetime "updated_at",      null: false
+    t.datetime "created_at",          null: false
+    t.datetime "updated_at",          null: false
     t.string   "tracking_id"
+    t.decimal  "commercial_discount"
   end
 
   add_index "dorsale_billing_machine_invoices", ["customer_id"], name: "index_dorsale_billing_machine_invoices_on_customer_id"
@@ -137,10 +138,11 @@ ActiveRecord::Schema.define(version: 20150805134318) do
     t.integer  "unique_index"
     t.decimal  "vat_rate"
     t.text     "comments"
-    t.datetime "created_at",      null: false
-    t.datetime "updated_at",      null: false
+    t.datetime "created_at",          null: false
+    t.datetime "updated_at",          null: false
     t.date     "expires_at"
     t.string   "tracking_id"
+    t.decimal  "commercial_discount"
   end
 
   add_index "dorsale_billing_machine_quotations", ["customer_id"], name: "index_dorsale_billing_machine_quotations_on_customer_id"

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

@@ -8,6 +8,8 @@ describe ::Dorsale::BillingMachine::Invoice, type: :model do
   it { is_expected.to validate_presence_of :id_card }
   it { is_expected.to validate_presence_of :date }
 
+  it { is_expected.to respond_to :commercial_discount }
+
   it "should have a valid factory" do
     expect(create(:billing_machine_invoice)).to be_valid
   end
@@ -85,23 +87,23 @@ describe ::Dorsale::BillingMachine::Invoice, type: :model do
 
   describe "totals" do
     it "should be calculated upon saving" do
-      invoice = create(:billing_machine_invoice, vat_rate: 20, total_duty: 0, vat_amount: 0, total_all_taxes: 0, advance: 40, balance: 0)
+      invoice = create(:billing_machine_invoice, vat_rate: 20, total_duty: 0, vat_amount: 0, total_all_taxes: 0, commercial_discount: 10, advance: 40, balance: 0)
       create(:billing_machine_invoice_line, quantity: 10, unit_price: 5, invoice: invoice)
       create(:billing_machine_invoice_line, quantity: 10, unit_price: 5, invoice: invoice)
-      expect(invoice.total_duty).to eq(100.0)
-      expect(invoice.vat_amount).to eq(20.0)
-      expect(invoice.total_all_taxes).to eq(120.0)
-      expect(invoice.balance).to eq(80.0)
+      expect(invoice.total_duty).to eq(90.0)
+      expect(invoice.vat_amount).to eq(18.0)
+      expect(invoice.total_all_taxes).to eq(108)
+      expect(invoice.balance).to eq(68.0)
     end
     it "should be calculated upon saving" do
-      invoice = create(:billing_machine_invoice, vat_rate: nil, total_duty: nil, vat_amount: nil, total_all_taxes: nil, advance: nil, balance: nil)
+      invoice = create(:billing_machine_invoice, vat_rate: nil, total_duty: nil, vat_amount: nil, total_all_taxes: nil, commercial_discount: 10.5, advance: nil, balance: nil)
       create(:billing_machine_invoice_line, quantity: 10, unit_price: 5, invoice: invoice)
       create(:billing_machine_invoice_line, quantity: 10, unit_price: 5, invoice: invoice)
 
-      expect(invoice.total_duty).to eq(100.0)
+      expect(invoice.total_duty).to eq(89.5)
       expect(invoice.vat_amount).to eq(0.0)
-      expect(invoice.total_all_taxes).to eq(100.0)
-      expect(invoice.balance).to eq(100.0)
+      expect(invoice.total_all_taxes).to eq(89.5)
+      expect(invoice.balance).to eq(89.5)
     end
 
     it "should work fine even with empty lines" do
@@ -126,31 +128,31 @@ describe ::Dorsale::BillingMachine::Invoice, type: :model do
       )
     }
 
-    let(:columns_names) {'"Date";"Numéro";"Objet";"Client";"Adresse 1";"Adresse 2";"Code postal";"Ville";"Pays";"Montant HT";"Taux TVA";"Montant TVA";"Montant TTC";"Acompte";"Solde à payer"'+"\n"}
+    let(:columns_names) {'"Date";"Numéro";"Objet";"Client";"Adresse 1";"Adresse 2";"Code postal";"Ville";"Pays";"Remise commerciale";"Montant HT";"Taux TVA";"Montant TVA";"Montant TTC";"Acompte";"Solde à payer"'+"\n"}
     it 'should return csv', ignore_semaphore: true do
-      invoice0 = create(:billing_machine_invoice, label: "invoiceLabel", date: "2014-07-31", unique_index: 1, total_duty: 9.99, vat_rate: 19.6, vat_amount: 23.2, total_all_taxes: 43.35, advance: 3.5, id_card: id_card, customer: customer)
+      invoice0 = create(:billing_machine_invoice, label: "invoiceLabel", date: "2014-07-31", unique_index: 1, commercial_discount:1, total_duty: 9.99, vat_rate: 19.6, vat_amount: 23.2, total_all_taxes: 43.35, advance: 3.5, id_card: id_card, customer: customer)
       invoice0.lines.create(quantity: 1, unit_price: 9.99)
       invoice1 = invoice0.dup
-      invoice1.update(label: 'çé"à;ç\";,@\\', date: "2014-08-01", unique_index: 2, advance: 3.0, vat_rate: 20)
+      invoice1.update(label: 'çé"à;ç\";,@\\', date: "2014-08-01", commercial_discount:0, unique_index: 2, advance: 3.0, vat_rate: 20)
       invoice1.lines.create(quantity: 1, unit_price: 13.0)
       csv_output = ::Dorsale::BillingMachine::Invoice.to_csv
 
       expect(csv_output).to be ==
         columns_names +
         '"2014-07-31";"2014-01";"invoiceLabel";"cutomerName";"address1";"address2";'\
-        '"13005";"Marseille";"country";"9,99";"19,60";"1,96";"11,95";"3,50";"8,45"' + "\n"\
+        '"13005";"Marseille";"country";"1,00";"8,99";"19,60";"1,76";"10,75";"3,50";"7,25"' + "\n"\
         '"2014-08-01";"2014-02";"çé""à;ç\"";,@\";"cutomerName";"address1";"address2";'\
-        '"13005";"Marseille";"country";"13,00";"20,00";"2,60";"15,60";"3,00";"12,60"' + "\n"
+        '"13005";"Marseille";"country";"0,00";"13,00";"20,00";"2,60";"15,60";"3,00";"12,60"' + "\n"
     end
     it 'should return expected csv with nil values' do
       invoice0 = create(:billing_machine_invoice, id_card: id_card, total_duty: nil,
         vat_rate: nil, vat_amount: nil, total_all_taxes: 0, advance: nil, label: nil,
-        customer: nil, payment_term: nil)
+        customer: nil, payment_term: nil, commercial_discount: nil)
       csv_output = ::Dorsale::BillingMachine::Invoice.to_csv
 
       expect(csv_output).to be ==
         columns_names +
-        '"2014-02-19";"2014-01";"";"";"";"";"";"";"";"0,00";"0,00";"0,00";"0,00";"0,00";"0,00"' + "\n"
+        '"2014-02-19";"2014-01";"";"";"";"";"";"";"";"0,00";"0,00";"0,00";"0,00";"0,00";"0,00";"0,00"' + "\n"
     end
   end
 end