dorsale 3.14.10 → 3.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bed10bfd8955fa8dec1e5c01787b450201bfb08941099fbe6d2e413f8b679dd1
-  data.tar.gz: 7bdab067a557c8d7ceb4d660462be2452bb429cf6bdbd540c84b6b3dc5972446
+  metadata.gz: f967e032d9c4918a372978e3c92216d542751e9e29881843aa029c7d63be401f
+  data.tar.gz: 35fbc1b26a2dea2067f936674324804b8d02fd6a673adfd92354886060b56ced
 SHA512:
-  metadata.gz: 83a3b664703cae40e41a194157e4369474d461b29042e48e13b4d259dd02f3db99e2835c885b73d83e1bc254e1d1a3c51ef7b4a025db86d45ab3653bb7da4fb0
-  data.tar.gz: '03826fb01f8843a16685a23d319611d393f988376b59418d37cbfa60fcc7e0f3baf44f518ed9a581d682615cce7061e5c35e805087eacf7dac3803edb19506ca'
+  metadata.gz: b0bb3cf0a9cd7322cc3e6928101ba486c8dddd577fa9962f1c462612d3c876e2df525224acdc6a2a4902510943ca61c500986431a6b1e895313f246c60467826
+  data.tar.gz: 135ff2e5848baede200b8ab36ba6bed2078f1c56024a8a1e901bcad21b9ae3f0bb700a314d74582006ae9275d6779f082bbcd6d17577af38f9296291fa379c76

data/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 ## Next version
 
+# 3.18.0
+- Change uploaders `extension_whitelist` to `extension_allowlist`
+- Rails 6.1 compatibility
+
+## 3.17.0
+- Refactor CV models using stores
+- Fix redirect after task comment create
+- Add missing unique indexes on invoices and quotations
+
+## 3.16.0
+- Allow to reorder BM lines (require Sorting.js + reimport migrations)
+- Remove unused url.js
+
+## 3.15.0
+- Fix Ruby 2.7 warnings
+- Faker 2
+
+## 3.14.11
+- Fix BM missing PDFs
+
 ## 3.14.10
 - Change BillingMachine PDF filenames
 - Fix CustomerVault layout

data/app/assets/javascripts/dorsale/dependencies.coffee

@@ -4,11 +4,11 @@
 //= require bootstrap
 //= require cocoon
 //= require accounting
-//= require url.min
 //= require select2
 //= require select2_locale_fr
 //= require bootstrap-datepicker/core
 //= require bootstrap-datepicker/locales/bootstrap-datepicker.fr
 //= require Chart.bundle
 //= require chartkick
+//= require Sortable
 //= require agilibox/all

data/app/assets/javascripts/dorsale/engines/billing_machine.coffee.erb

@@ -77,6 +77,10 @@ BillingMachine.formatInputs = ->
     formatted_number = BillingMachine.num2str BillingMachine.str2num $(this).val()
     $(this).val formatted_number
 
+BillingMachine.updatePositions = ->
+  i = 0
+  $("#billing_machine-form input[name*=position]").map -> this.value = (i = i + 1)
+
 # Empty number inputs on focus if value is 0
 $(document).on "focus", "#billing_machine-form input.number", ->
   $(this).val("") if BillingMachine.str2num($(this).val()) == 0
@@ -96,6 +100,7 @@ $(document).on "click", "#billing_machine-form a.delete", (e) ->
 $(document).on "turbolinks:load cocoon:after-insert", ->
   BillingMachine.formatInputs()
   BillingMachine.updateTotals()
+  BillingMachine.updatePositions()
 
   # Fix Cocoon bug
   $("#billing_machine-form .line textarea").map ->
@@ -106,3 +111,12 @@ $(document).on "keyup", "#billing_machine-form input.number", ->
 
 $(document).on "blur", "#billing_machine-form input.number", ->
   BillingMachine.formatInputs()
+
+$(document).on "turbolinks:load", ->
+  $("#billing_machine-form tbody").map ->
+    container = this
+
+    new Sortable container,
+      handle: ".handle"
+      animation: 150
+      onSort: -> BillingMachine.updatePositions()

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

@@ -103,11 +103,14 @@
 
     th.actions,
     td.actions,
+    th.position,
+    td.position,
       padding: 0
       width: 2.5em
       text-align: center
 
-    th.actions
+    th.actions,
+    th.position,
       border: none
 
     // disabled fields

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

@@ -157,15 +157,20 @@ class Dorsale::BillingMachine::InvoicesController < ::Dorsale::BillingMachine::A
       :advance,
       :due_date,
       :comments,
-      :lines_attributes => [
-        :_destroy,
-        :id,
-        :label,
-        :quantity,
-        :unit,
-        :unit_price,
-        :vat_rate,
-      ],
+      :lines_attributes => line_permitted_params,
+    ]
+  end
+
+  def line_permitted_params
+    [
+      :_destroy,
+      :id,
+      :label,
+      :quantity,
+      :unit,
+      :unit_price,
+      :vat_rate,
+      :position,
     ]
   end
 

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

@@ -165,15 +165,20 @@ class Dorsale::BillingMachine::QuotationsController < ::Dorsale::BillingMachine:
       :comments,
       :vat_rate,
       :commercial_discount,
-      :lines_attributes => [
-        :_destroy,
-        :id,
-        :label,
-        :quantity,
-        :unit,
-        :unit_price,
-        :vat_rate,
-      ],
+      :lines_attributes => line_permitted_params,
+    ]
+  end
+
+  def line_permitted_params
+    [
+      :_destroy,
+      :id,
+      :label,
+      :quantity,
+      :unit,
+      :unit_price,
+      :vat_rate,
+      :position,
     ]
   end
 

data/app/controllers/dorsale/flyboy/task_comments_controller.rb

@@ -19,9 +19,9 @@ class Dorsale::Flyboy::TaskCommentsController < ::Dorsale::Flyboy::ApplicationCo
 
   def back_url
     task_path = flyboy_task_path(@task)
-    back_url  = super
+    back_url  = super.to_s
 
-    if back_url.to_s.start_with?(task_path)
+    if back_url == task_path || back_url.start_with?(task_path + "?")
       back_url
     else
       task_path

data/app/mailers/dorsale/flyboy/task_mailer.rb

@@ -11,7 +11,7 @@ class Dorsale::Flyboy::TaskMailer < ::Dorsale::ApplicationMailer
 
     mail(
       :to      => task.owner.email,
-      :subject => t("task_mailer.new_task.subject", @locals),
+      :subject => t("task_mailer.new_task.subject", **@locals),
     )
   end
 
@@ -26,7 +26,7 @@ class Dorsale::Flyboy::TaskMailer < ::Dorsale::ApplicationMailer
 
     mail(
       :to      => task.owner.email,
-      :subject => t("task_mailer.term_email.subject", @locals),
+      :subject => t("task_mailer.term_email.subject", **@locals),
     )
   end
 end

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

@@ -55,7 +55,7 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
     lines.each(&:update_total)
     apply_vat_rate_to_lines
 
-    lines_sum = lines.map(&:total).sum.round(2)
+    lines_sum = lines.sum(&:total).round(2)
 
     self.total_excluding_taxes = lines_sum - commercial_discount
 
@@ -109,9 +109,7 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
   def payment_status
     if paid?
       :paid
-    elsif due_date.nil?
-      :on_alert
-    elsif Date.current >= due_date + 15
+    elsif due_date.nil? || Date.current >= due_date + 15
       :on_alert
     elsif Date.current > due_date
       :late

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

@@ -6,7 +6,7 @@ class Dorsale::BillingMachine::InvoiceLine < ::Dorsale::ApplicationRecord
   validates :invoice, presence: true
 
   default_scope -> {
-    order(created_at: :asc)
+    order(position: :asc, created_at: :asc, id: :asc)
   }
 
   before_validation :update_total

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

@@ -61,7 +61,7 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
     lines.each(&:update_total)
     apply_vat_rate_to_lines
 
-    lines_sum = lines.map(&:total).sum
+    lines_sum = lines.sum(&:total)
 
     self.total_excluding_taxes = lines_sum - commercial_discount
 

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

@@ -6,7 +6,7 @@ class Dorsale::BillingMachine::QuotationLine < ::Dorsale::ApplicationRecord
   validates :quotation, presence: true
 
   default_scope -> {
-    order(:created_at => :asc)
+    order(position: :asc, created_at: :asc, id: :asc)
   }
 
   before_validation :update_total

data/app/models/dorsale/customer_vault/corporation.rb

@@ -1,6 +1,15 @@
 class Dorsale::CustomerVault::Corporation < Dorsale::CustomerVault::Person
-  serialize      :data,  Dorsale::CustomerVault::CorporationData
-  def_delegators :data, *Dorsale::CustomerVault::CorporationData.methods_to_delegate
+  data_attributes = %i(
+    legal_form
+    immatriculation_number
+    naf
+    european_union_vat_number
+    societe_com
+    capital
+    revenue
+    number_of_employees
+  )
+  store :data, accessors: data_attributes, coder: JSON
 
   validates :corporation_name, presence: true
   has_many :individuals, dependent: :nullify

data/app/models/dorsale/customer_vault/individual.rb

@@ -1,6 +1,8 @@
 class Dorsale::CustomerVault::Individual < Dorsale::CustomerVault::Person
-  serialize      :data,  Dorsale::CustomerVault::IndividualData
-  def_delegators :data, *Dorsale::CustomerVault::IndividualData.methods_to_delegate
+  data_attributes = %i(
+    title
+  )
+  store :data, accessors: data_attributes, coder: JSON
 
   validates :first_name, presence: true
   validates :last_name,  presence: true

data/app/models/dorsale/customer_vault/person.rb

@@ -10,7 +10,7 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
   end
 
   def verify_class
-    if self.class == ::Dorsale::CustomerVault::Person
+    if instance_of?(Dorsale::CustomerVault::Person)
       # self.abstract_class does not work with STI
       raise "Cannot directly instantiate Person class"
     end

data/app/models/dorsale/expense_gun/expense.rb

@@ -29,17 +29,17 @@ class Dorsale::ExpenseGun::Expense < ::Dorsale::ApplicationRecord
 
   # Sum of line amounts
   def total_all_taxes
-    expense_lines.map(&:total_all_taxes).sum
+    expense_lines.sum(&:total_all_taxes)
   end
 
   # Sum of line emplee payback
   def total_employee_payback
-    expense_lines.map(&:employee_payback).sum
+    expense_lines.sum(&:employee_payback)
   end
 
   # Sum of deductible deductible vat
   def total_vat_deductible
-    expense_lines.map(&:total_vat_deductible).sum
+    expense_lines.sum(&:total_vat_deductible)
   end
 
   delegate :current_state, to: :aasm

data/app/services/dorsale/billing_machine/pdf_file_generator.rb

@@ -4,13 +4,6 @@ class Dorsale::BillingMachine::PdfFileGenerator < Dorsale::Service
   def initialize(document)
     super()
     @document = document
-
-    # I have no idea why I need to do that,
-    # if I don't do that, CarrierWare do not stores the file.
-    # The reload() method don't work either.
-    # The problem appears only on server, not in console.
-    # I think CarrierWave do not work anymore after first save.
-    @document = document.class.find(document.id) if document.persisted?
   end
 
   def call

data/app/services/dorsale/flyboy/task/snoozer.rb

@@ -29,7 +29,7 @@ class Dorsale::Flyboy::Task::Snoozer < ::Dorsale::Service
       task.reminder_date <= current_date
     elsif task.term
       task.term <= current_date
-    else
+    else # rubocop:disable Lint/DuplicateBranch
       false
     end
   end

data/app/uploaders/dorsale/image_uploader.rb

@@ -1,5 +1,5 @@
 class Dorsale::ImageUploader < ::Dorsale::ApplicationUploader
-  def extension_whitelist
+  def extension_allowlist
     %w(jpg jpeg gif png)
   end
 end

data/app/uploaders/dorsale/pdf_uploader.rb

@@ -1,5 +1,5 @@
 class Dorsale::PdfUploader < ::Dorsale::ApplicationUploader
-  def extension_whitelist
+  def extension_allowlist
     %w(pdf)
   end
 end

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

@@ -21,6 +21,7 @@
     table#lines-table
       thead
         tr
+          th.position
           th.actions
           th.line-label      = Dorsale::BillingMachine::InvoiceLine.t(:label)
           th.line-quantity   = Dorsale::BillingMachine::InvoiceLine.t(:quantity)
@@ -32,7 +33,7 @@
 
       tbody
         = f.simple_fields_for :lines do |lf|
-          = render "dorsale/billing_machine/invoices/line_fields", f: lf
+          = render "dorsale/billing_machine/#{document.document_type}s/line_fields", f: lf
 
     .row
       .col-sm-6

data/app/views/dorsale/billing_machine/commons/_line_fields.html.slim

@@ -1,4 +1,8 @@
 tr.line
+  td.position
+    = icon(:arrows_alt, class: "handle")
+    = f.hidden_field :position
+
   td.actions
     a.delete href="#"
       span.fa.fa-fw.fa-trash

data/app/views/dorsale/flyboy/task_mailer/new_task.html.slim

@@ -1 +1 @@
-p == lf2br t("task_mailer.new_task.body", @locals)
+p == lf2br t("task_mailer.new_task.body", **@locals)

data/app/views/dorsale/flyboy/task_mailer/term_email.html.slim

@@ -1 +1 @@
-p == lf2br t("task_mailer.term_email.body", @locals)
+p == lf2br t("task_mailer.term_email.body", **@locals)

data/config/locales/billing_machine.fr.yml

@@ -25,6 +25,7 @@ fr:
     expires_at: "Date d'expiration"
     balance: "Reste à payer"
     pdf_file: "Fichier PDF"
+    position: "Position"
 
   activerecord:
     models:

data/db/migrate/20210202100529_billing_machine_add_positions.rb

@@ -0,0 +1,6 @@
+class BillingMachineAddPositions < ActiveRecord::Migration[6.0]
+  def change
+    add_column :dorsale_billing_machine_invoice_lines, :position, :integer, null: false, default: 0
+    add_column :dorsale_billing_machine_quotation_lines, :position, :integer, null: false, default: 0
+  end
+end

data/db/migrate/20210311131928_billing_machine_add_missing_unique_indexes.rb

@@ -0,0 +1,6 @@
+class BillingMachineAddMissingUniqueIndexes < ActiveRecord::Migration[6.0]
+  def change
+    add_index :dorsale_billing_machine_invoices, :unique_index, unique: true
+    add_index :dorsale_billing_machine_quotations, :unique_index, unique: true
+  end
+end

data/features/step_definitions/customer_vault_people_steps.rb

@@ -7,7 +7,7 @@ Then(/^the file is downloaded$/) do
 end
 
 Given(/^a very long comment on this person$/) do
-  text = Faker::Lorem.paragraph(30)
+  text = Faker::Lorem.paragraph(sentence_count: 30)
   @comment = create(:customer_vault_event_comment, person: @person, text: text)
 end
 

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.14.10"
+  VERSION = "3.18.0"
 end

data/spec/controllers/dorsale/flyboy/task_comments_controller_spec.rb

@@ -18,7 +18,7 @@ describe Dorsale::Flyboy::TaskCommentsController, type: :controller do
       expect(assigns(:task_comment).persisted?).to be true
     end
 
-    it "should redirect to referrer if referrer is task" do
+    it "should redirect to referrer if referrer is task show" do
       url = flyboy_task_path(task) + "?sort=xxx"
       request.env["HTTP_REFERER"] = url
       post :create, params: valid_params
@@ -26,7 +26,7 @@ describe Dorsale::Flyboy::TaskCommentsController, type: :controller do
     end
 
     it "should redirect to task if referrer is not task" do
-      url = "/anywhere"
+      url = flyboy_task_path(task) + "/some-action"
       request.env["HTTP_REFERER"] = url
       post :create, params: valid_params
       expect(response).to redirect_to flyboy_task_path(task)

data/spec/factories/customer_vault_individuals.rb

@@ -1,17 +1,17 @@
 FactoryBot.define do
   factory :customer_vault_individual, class: ::Dorsale::CustomerVault::Individual do
-    origin     { create(:customer_vault_origin)                      }
-    first_name { Faker::Name.first_name                              }
-    last_name  { Faker::Name.last_name                               }
-    short_name { "SN"                                                }
-    email      { Faker::Internet.email("#{first_name} #{last_name}") }
-    title      { "Individual-Title"                                  }
-    twitter    { "#{first_name}#{last_name}"                         }
-    www        { Faker::Internet.url                                 }
-    context    { "Individual-Context"                                }
-    phone      { "01 23 xx xx xx"                                    }
-    fax        { "09 xx xx xx xx"                                    }
-    mobile     { "06 xx xx xx xx"                                    }
-    address    { build(:dorsale_address)                             }
+    origin     { create(:customer_vault_origin)    }
+    first_name { Faker::Name.first_name            }
+    last_name  { Faker::Name.last_name             }
+    short_name { "SN"                              }
+    email      { Faker::Internet.email(name: name) }
+    title      { "Individual-Title"                }
+    twitter    { "#{first_name}#{last_name}"       }
+    www        { Faker::Internet.url               }
+    context    { "Individual-Context"              }
+    phone      { "01 23 xx xx xx"                  }
+    fax        { "09 xx xx xx xx"                  }
+    mobile     { "06 xx xx xx xx"                  }
+    address    { build(:dorsale_address)           }
   end
 end

data/spec/factories/expense_gun_categories.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :expense_gun_category, class: ::Dorsale::ExpenseGun::Category do
-    name           { Faker::Lorem.word       }
-    code           { Faker::Number.number(4) }
-    vat_deductible { [true, false].sample    }
+    name           { Faker::Lorem.word               }
+    code           { Faker::Number.number(digits: 4) }
+    vat_deductible { [true, false].sample            }
   end
 end

data/spec/factories/expense_gun_expense_lines.rb

@@ -1,11 +1,11 @@
 FactoryBot.define do
   factory :expense_gun_expense_line, class: ::Dorsale::ExpenseGun::ExpenseLine do
-    expense         { build(:expense_gun_expense)   }
-    name            { Faker::Lorem.sentence(3)      }
-    category        { build(:expense_gun_category) }
-    date            { Faker::Date.backward(30)      }
-    total_all_taxes { rand(100..1000)               }
-    vat             { rand(1..(total_all_taxes/5))  }
-    company_part    { [25, 50, 75, 100].sample      }
+    expense         { build(:expense_gun_expense)          }
+    name            { Faker::Lorem.sentence(word_count: 3) }
+    category        { build(:expense_gun_category)         }
+    date            { Faker::Date.backward(days: 30)       }
+    total_all_taxes { rand(100..1000)                      }
+    vat             { rand(1..(total_all_taxes/5))         }
+    company_part    { [25, 50, 75, 100].sample             }
   end
 end

data/spec/factories/expense_gun_expenses.rb

@@ -1,8 +1,8 @@
 FactoryBot.define do
   factory :expense_gun_expense, class: ::Dorsale::ExpenseGun::Expense do
-    name { Faker::Lorem.sentence(3) }
-    date { Date.current             }
-    user { create(:user)            }
+    name { Faker::Lorem.sentence(word_count: 3) }
+    date { Date.current }
+    user { create(:user) }
 
     after(:create) { |expense|
       rand(2..5).times {

data/spec/pdfs/dorsale/billing_machine/invoice_multiple_vat_pdf_spec.rb

@@ -23,7 +23,7 @@ describe ::Dorsale::BillingMachine::InvoiceMultipleVatPdf, pdfs: true do
 
   let(:content) {
     generate!
-    Yomu.new(invoice.pdf_file.path).text
+    PDF::Reader.new(invoice.pdf_file.path).pages.map(&:text).join("\n")
   }
 
   it "should not display global vat rate" do

data/spec/pdfs/dorsale/billing_machine/invoice_single_vat_pdf_spec.rb

@@ -23,7 +23,7 @@ describe ::Dorsale::BillingMachine::InvoiceSingleVatPdf, pdfs: true do
 
   let(:content) {
     generate!
-    Yomu.new(invoice.pdf_file.path).text
+    PDF::Reader.new(invoice.pdf_file.path).pages.map(&:text).join("\n")
   }
 
   it "should display global vat rate" do

data/spec/pdfs/dorsale/billing_machine/quotation_multiple_vat_pdf_spec.rb

@@ -23,7 +23,7 @@ describe ::Dorsale::BillingMachine::QuotationMultipleVatPdf, pdfs: true do
 
   let(:content) {
     generate!
-    Yomu.new(quotation.pdf_file.path).text
+    PDF::Reader.new(quotation.pdf_file.path).pages.map(&:text).join("\n")
   }
 
   it "should not display global vat rate" do

data/spec/pdfs/dorsale/billing_machine/quotation_single_vat_pdf_spec.rb

@@ -23,7 +23,7 @@ describe ::Dorsale::BillingMachine::QuotationSingleVatPdf, pdfs: true do
 
   let(:content) {
     generate!
-    Yomu.new(quotation.pdf_file.path).text
+    PDF::Reader.new(quotation.pdf_file.path).pages.map(&:text).join("\n")
   }
 
   it "should display global vat rate" do

data/spec/rails_helper.rb

@@ -4,7 +4,6 @@ require 'spec_helper'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
 require "agilibox/rspec"
-require "yomu"
 # Add additional requires below this line. Rails is not loaded until this point!
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.14.10
+  version: 3.18.0
 platform: ruby
 authors:
 - agilidée
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,20 +50,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '99'
-- !ruby/object:Gem::Dependency
-  name: virtus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '99'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '99'
 - !ruby/object:Gem::Dependency
   name: slim-rails
   requirement: !ruby/object:Gem::Requirement
@@ -468,7 +454,6 @@ files:
 - 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
 - app/assets/stylesheets/dorsale/all.sass
 - app/assets/stylesheets/dorsale/common.sass
 - app/assets/stylesheets/dorsale/common/comments.sass
@@ -550,14 +535,11 @@ files:
 - app/models/dorsale/customer_vault.rb
 - app/models/dorsale/customer_vault/activity_type.rb
 - app/models/dorsale/customer_vault/corporation.rb
-- app/models/dorsale/customer_vault/corporation_data.rb
 - app/models/dorsale/customer_vault/event.rb
 - app/models/dorsale/customer_vault/individual.rb
-- app/models/dorsale/customer_vault/individual_data.rb
 - app/models/dorsale/customer_vault/link.rb
 - app/models/dorsale/customer_vault/origin.rb
 - app/models/dorsale/customer_vault/person.rb
-- app/models/dorsale/customer_vault/person_data.rb
 - app/models/dorsale/email.rb
 - app/models/dorsale/expense_gun.rb
 - app/models/dorsale/expense_gun/category.rb
@@ -835,6 +817,8 @@ files:
 - db/migrate/20171023133219_customer_vault_events_add_contact_type.rb
 - db/migrate/20171024075514_customer_vault_contact_type_default_value.rb
 - db/migrate/20171115171425_dorsale_customer_vault_people_add_secondary_emails.rb
+- db/migrate/20210202100529_billing_machine_add_positions.rb
+- db/migrate/20210311131928_billing_machine_add_missing_unique_indexes.rb
 - features/access.feature
 - features/billing_machine_invoices.feature
 - features/billing_machine_multiple_vat.feature
@@ -989,7 +973,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Modular ERP made with Ruby on Rails

data/app/assets/javascripts/url.min.js

@@ -1 +0,0 @@
-/*! js-url - v2.3.0 - 2016-03-10 */window.url=function(){function a(){}function b(a){return decodeURIComponent(a.replace(/\+/g," "))}function c(a,b){var c=a.charAt(0),d=b.split(c);return c===a?d:(a=parseInt(a.substring(1),10),d[0>a?d.length+a:a-1])}function d(a,c){for(var d=a.charAt(0),e=c.split("&"),f=[],g={},h=[],i=a.substring(1),j=0,k=e.length;k>j;j++)if(f=e[j].match(/(.*?)=(.*)/),f||(f=[e[j],e[j],""]),""!==f[1].replace(/\s/g,"")){if(f[2]=b(f[2]||""),i===f[1])return f[2];h=f[1].match(/(.*)\[([0-9]+)\]/),h?(g[h[1]]=g[h[1]]||[],g[h[1]][h[2]]=f[2]):g[f[1]]=f[2]}return d===a?g:g[i]}return function(b,e){var f,g={};if("tld?"===b)return a();if(e=e||window.location.toString(),!b)return e;if(b=b.toString(),f=e.match(/^mailto:([^\/].+)/))g.protocol="mailto",g.email=f[1];else{if((f=e.match(/(.*?)\/#\!(.*)/))&&(e=f[1]+f[2]),(f=e.match(/(.*?)#(.*)/))&&(g.hash=f[2],e=f[1]),g.hash&&b.match(/^#/))return d(b,g.hash);if((f=e.match(/(.*?)\?(.*)/))&&(g.query=f[2],e=f[1]),g.query&&b.match(/^\?/))return d(b,g.query);if((f=e.match(/(.*?)\:?\/\/(.*)/))&&(g.protocol=f[1].toLowerCase(),e=f[2]),(f=e.match(/(.*?)(\/.*)/))&&(g.path=f[2],e=f[1]),g.path=(g.path||"").replace(/^([^\/])/,"/$1").replace(/\/$/,""),b.match(/^[\-0-9]+$/)&&(b=b.replace(/^([^\/])/,"/$1")),b.match(/^\//))return c(b,g.path.substring(1));if(f=c("/-1",g.path.substring(1)),f&&(f=f.match(/(.*?)\.(.*)/))&&(g.file=f[0],g.filename=f[1],g.fileext=f[2]),(f=e.match(/(.*)\:([0-9]+)$/))&&(g.port=f[2],e=f[1]),(f=e.match(/(.*?)@(.*)/))&&(g.auth=f[1],e=f[2]),g.auth&&(f=g.auth.match(/(.*)\:(.*)/),g.user=f?f[1]:g.auth,g.pass=f?f[2]:void 0),g.hostname=e.toLowerCase(),"."===b.charAt(0))return c(b,g.hostname);a()&&(f=g.hostname.match(a()),f&&(g.tld=f[3],g.domain=f[2]?f[2]+"."+f[3]:void 0,g.sub=f[1]||void 0)),g.port=g.port||("https"===g.protocol?"443":"80"),g.protocol=g.protocol||("443"===g.port?"https":"http")}return b in g?g[b]:"{}"===b?g:void 0}}(),"undefined"!=typeof jQuery&&jQuery.extend({url:function(a,b){return window.url(a,b)}});

data/app/models/dorsale/customer_vault/corporation_data.rb

@@ -1,10 +0,0 @@
-class Dorsale::CustomerVault::CorporationData < Dorsale::CustomerVault::PersonData
-  attribute :legal_form,                String
-  attribute :immatriculation_number,    String
-  attribute :naf,                       String
-  attribute :european_union_vat_number, String
-  attribute :societe_com,               String
-  attribute :capital,                   Integer
-  attribute :revenue,                   Integer
-  attribute :number_of_employees,       Integer
-end

data/app/models/dorsale/customer_vault/individual_data.rb

@@ -1,3 +0,0 @@
-class Dorsale::CustomerVault::IndividualData < Dorsale::CustomerVault::PersonData
-  attribute :title, String
-end

data/app/models/dorsale/customer_vault/person_data.rb

@@ -1,17 +0,0 @@
-require "virtus"
-
-class Dorsale::CustomerVault::PersonData
-  include Virtus.model
-
-  def self.dump(obj)
-    JSON.dump(obj.attributes)
-  end
-
-  def self.load(json_string)
-    new JSON.parse(json_string.presence || "{}")
-  end
-
-  def self.methods_to_delegate
-    instance_methods - Dorsale::CustomerVault::PersonData.instance_methods
-  end
-end