Merge branch 'merge_les_pepettes' into develop : YIHOUUUUUUUUUUUU!

KOUKOU KAPORAL !!!!
(fais pas gaffe et génère pas d'avoir juste....)

.erdconfig

+attributes:
+  - content
+  - primary_keys
+  - foreign_keys
+  - inheritance
+  - timestamps
+disconnected: true
+filename: doc/ERD
+filetype: pdf
+indirect: true
+inheritance: true
+markup: true
+notation: bachman
+orientation: vertical
+polymorphism: false
+sort: true
+warn: true
+title: Ambre Entity-Relationship Diagram
+exclude: null
+only: null
+only_recursion_depth: null
+prepend_primary: false
+cluster: false
+splines: spline

.gitignore

@@ -33,6 +33,8 @@ db/*.sqlite3
 /config/settings.local.yml
 /coverage.data
 /coverage/
+/data/*/invoices/*.pdf
+/data/*/invoices/*.html
 /db/*.javadb/
 /db/*.sqlite3-journal
 /db/puppet_db_setup_holder
@@ -83,4 +85,8 @@ db/*.sqlite3
 
 # Aptana project file
 /.project
+.kdev4/
+Ambre.rubyproject
+ambre.kdev4
+
 

Gemfile

@@ -18,7 +18,6 @@ gem "database_cleaner", ">= 0.8.0", :group => :test
 gem "launchy", ">= 2.1.0", :group => :test
 gem "devise", ">= 2.1.0"
 gem "devise-i18n"
-gem "twitter-bootstrap-rails"
 gem "bootstrap-sass", "~> 3.1.1.0"
 gem "therubyracer", :platform => :ruby
 gem 'coffee-rails'
@@ -31,8 +30,18 @@ gem 'geckodriver-helper', '~> 0.21.0', group: :test
 gem 'ipaddress', '0.8.0'
 gem 'rubyzip', '~> 1.1.6'
 gem 'invoicing', '>= 1.0.1'
-gem 'prawn'
-gem 'prawn-table'
 gem 'rspec-temp_dir', group: :test
 gem 'transpec', require: false # Used for update rspec
 gem 'best_in_place'
+gem 'wkhtmltopdf-binary'
+gem 'wicked_pdf'
+gem 'rubocop-rspec'
+group :test do
+  gem "i18n-tasks"
+end
+gem 'activerecord-session_store'
+gem 'pagy'
+gem "font_awesome5_rails"
+gem "cocoon"
+gem 'rails-erd', group: :development
+gem 'maildown'

Gemfile.lock

 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
+    actionmailer (4.2.11)
+      actionpack (= 4.2.11)
+      actionview (= 4.2.11)
+      activejob (= 4.2.11)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.10)
-      actionview (= 4.2.10)
-      activesupport (= 4.2.10)
+    actionpack (4.2.11)
+      actionview (= 4.2.11)
+      activesupport (= 4.2.11)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.10)
-      activesupport (= 4.2.10)
+    actionview (4.2.11)
+      activesupport (= 4.2.11)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.10)
-      activesupport (= 4.2.10)
+    activejob (4.2.11)
+      activesupport (= 4.2.11)
       globalid (>= 0.3.0)
-    activemodel (4.2.10)
-      activesupport (= 4.2.10)
+    activemodel (4.2.11)
+      activesupport (= 4.2.11)
       builder (~> 3.1)
-    activerecord (4.2.10)
-      activemodel (= 4.2.10)
-      activesupport (= 4.2.10)
+    activerecord (4.2.11)
+      activemodel (= 4.2.11)
+      activesupport (= 4.2.11)
       arel (~> 6.0)
     activerecord-postgresql-adapter (0.0.1)
       pg
-    activesupport (4.2.10)
+    activerecord-session_store (1.1.1)
+      actionpack (>= 4.0)
+      activerecord (>= 4.0)
+      multi_json (~> 1.11, >= 1.11.2)
+      rack (>= 1.5.2, < 3)
+      railties (>= 4.0)
+    activesupport (4.2.11)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -42,11 +48,11 @@ GEM
     archive-zip (0.11.0)
       io-like (~> 0.3.0)
     arel (6.0.4)
-    ast (2.3.0)
+    ast (2.4.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
-    backports (3.11.0)
-    bcrypt (3.1.11)
+    backports (3.11.4)
+    bcrypt (3.1.12)
     best_in_place (3.1.1)
       actionpack (>= 3.2)
       railties (>= 3.2)
@@ -54,15 +60,18 @@ GEM
       sass (~> 3.2)
     builder (3.2.3)
     cancancan (1.17.0)
-    capybara (2.17.0)
+    capybara (3.12.0)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
+    choice (0.2.0)
+    cocoon (1.2.14)
     coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0)
@@ -70,163 +79,168 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    commonjs (0.2.7)
-    concurrent-ruby (1.0.5)
-    config (1.6.1)
+    concurrent-ruby (1.1.4)
+    config (1.7.0)
       activesupport (>= 3.0)
-      deep_merge (~> 1.1.1)
+      deep_merge (~> 1.2.1)
       dry-validation (>= 0.10.4)
-    crass (1.0.3)
-    cucumber (3.1.0)
+    crass (1.0.4)
+    cucumber (3.1.2)
       builder (>= 2.1.2)
-      cucumber-core (~> 3.1.0)
-      cucumber-expressions (~> 5.0.4)
+      cucumber-core (~> 3.2.0)
+      cucumber-expressions (~> 6.0.1)
       cucumber-wire (~> 0.0.1)
       diff-lcs (~> 1.3)
-      gherkin (~> 5.0)
+      gherkin (~> 5.1.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    cucumber-core (3.1.0)
+    cucumber-core (3.2.1)
       backports (>= 3.8.0)
       cucumber-tag_expressions (~> 1.1.0)
-      gherkin (>= 5.0.0)
-    cucumber-expressions (5.0.7)
-    cucumber-rails (1.5.0)
-      capybara (>= 1.1.2, < 3)
-      cucumber (>= 1.3.8, < 4)
+      gherkin (~> 5.0)
+    cucumber-expressions (6.0.1)
+    cucumber-rails (1.6.0)
+      capybara (>= 1.1.2, < 4)
+      cucumber (>= 3.0.2, < 4)
       mime-types (>= 1.17, < 4)
-      nokogiri (~> 1.5)
-      railties (>= 4, < 5.2)
+      nokogiri (~> 1.8)
+      railties (>= 4, < 6)
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
-    database_cleaner (1.6.2)
-    deep_merge (1.1.1)
-    devise (4.4.0)
+    database_cleaner (1.7.0)
+    deep_merge (1.2.1)
+    devise (4.5.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.2)
+      railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
-    devise-i18n (1.5.0)
-      devise (>= 3.4)
+    devise-i18n (1.7.0)
+      devise (>= 4.5)
     diff-lcs (1.3)
     dry-configurable (0.7.0)
       concurrent-ruby (~> 1.0)
     dry-container (0.6.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.2)
+    dry-core (0.4.7)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.2.0)
+    dry-equalizer (0.2.1)
+    dry-inflector (0.1.2)
     dry-logic (0.4.2)
       dry-container (~> 0.2, >= 0.2.6)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-types (0.12.2)
+    dry-types (0.13.4)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1)
       dry-container (~> 0.3)
-      dry-core (~> 0.2, >= 0.2.1)
+      dry-core (~> 0.4, >= 0.4.4)
       dry-equalizer (~> 0.2)
+      dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 0.4, >= 0.4.2)
-      inflecto (~> 0.0.0, >= 0.0.2)
-    dry-validation (0.11.1)
+    dry-validation (0.12.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
       dry-core (~> 0.2, >= 0.2.1)
       dry-equalizer (~> 0.2)
       dry-logic (~> 0.4, >= 0.4.0)
-      dry-types (~> 0.12.0)
-    email_spec (2.1.1)
+      dry-types (~> 0.13.1)
+    email_spec (2.2.0)
       htmlentities (~> 4.3.3)
       launchy (~> 2.1)
-      mail (~> 2.6)
+      mail (~> 2.7)
+    erubi (1.8.0)
     erubis (2.7.0)
     execjs (2.7.0)
-    factory_bot (4.8.2)
+    factory_bot (4.11.1)
       activesupport (>= 3.0.0)
-    factory_bot_rails (4.8.2)
-      factory_bot (~> 4.8.2)
+    factory_bot_rails (4.11.1)
+      factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
     ffi (1.9.25)
+    font_awesome5_rails (0.9.0)
+      railties (>= 4.2)
     geckodriver-helper (0.21.0)
       archive-zip (~> 0.7)
-    gherkin (5.0.0)
+    gherkin (5.1.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    grease (0.3.1)
+    highline (2.0.0)
     htmlentities (4.3.4)
-    i18n (0.9.1)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    inflecto (0.0.2)
+    i18n-tasks (0.9.28)
+      activesupport (>= 4.0.2)
+      ast (>= 2.1.0)
+      erubi
+      highline (>= 2.0.0)
+      i18n
+      parser (>= 2.2.3.0)
+      rails-i18n
+      rainbow (>= 2.2.2, < 4.0)
+      terminal-table (>= 1.5.1)
     invoicing (1.0.1)
       rails (>= 3.2.13)
     io-like (0.3.0)
     ipaddress (0.8.0)
-    jquery-rails (4.3.1)
+    jaro_winkler (1.5.1)
+    jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.1.0)
+    kramdown (2.1.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    less (2.6.0)
-      commonjs (~> 0.2.7)
-    less-rails (3.0.0)
-      actionpack (>= 4.0)
-      grease
-      less (~> 2.6.0)
-      sprockets (> 2, < 4)
-      tilt
     libv8 (3.16.14.19)
-    loofah (2.1.1)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    mime-types (3.1)
+    maildown (3.1.0)
+      actionmailer (>= 4.0.0)
+      kramdown
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
-    minitest (5.11.1)
-    monetize (1.7.0)
-      money (~> 6.9)
-    money (6.10.1)
-      i18n (>= 0.6.4, < 1.0)
-    money-rails (1.10.0)
+    mime-types-data (3.2018.0812)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    monetize (1.9.0)
+      money (~> 6.12)
+    money (6.13.1)
+      i18n (>= 0.6.4, <= 2)
+    money-rails (1.13.0)
       activesupport (>= 3.0)
-      monetize (~> 1.7.0)
-      money (~> 6.10.0)
+      monetize (~> 1.9.0)
+      money (~> 6.13.0)
       railties (>= 3.0)
     multi_json (1.13.1)
     multi_test (0.1.2)
-    nokogiri (1.8.1)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.9.1)
+      mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
-    parser (2.4.0.2)
-      ast (~> 2.3)
-    pdf-core (0.7.0)
+    pagy (3.4.0)
+    parallel (1.12.1)
+    parser (2.5.3.0)
+      ast (~> 2.4.0)
     pg (0.18.4)
-    prawn (2.2.2)
-      pdf-core (~> 0.7.0)
-      ttfunk (~> 1.5)
-    prawn-table (0.2.2)
-      prawn (>= 1.3.0, < 3.0.0)
-    public_suffix (3.0.1)
-    rack (1.6.8)
+    powerpack (0.1.2)
+    public_suffix (3.0.3)
+    rack (1.6.11)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.10)
-      actionmailer (= 4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
-      activemodel (= 4.2.10)
-      activerecord (= 4.2.10)
-      activesupport (= 4.2.10)
+    rails (4.2.11)
+      actionmailer (= 4.2.11)
+      actionpack (= 4.2.11)
+      actionview (= 4.2.11)
+      activejob (= 4.2.11)
+      activemodel (= 4.2.11)
+      activerecord (= 4.2.11)
+      activesupport (= 4.2.11)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.10)
+      railties (= 4.2.11)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -234,55 +248,73 @@ GEM
       activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-erd (1.5.2)
+      activerecord (>= 3.2)
+      activesupport (>= 3.2)
+      choice (~> 0.2.0)
+      ruby-graphviz (~> 1.2)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     rails-i18n (4.0.9)
       i18n (~> 0.7)
       railties (~> 4.0)
-    railties (4.2.10)
-      actionpack (= 4.2.10)
-      activesupport (= 4.2.10)
+    railties (4.2.11)
+      actionpack (= 4.2.11)
+      activesupport (= 4.2.11)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
-    rake (12.3.0)
-    rb-fsevent (0.10.2)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rake (12.3.2)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     ref (2.0.0)
+    regexp_parser (1.3.0)
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-activemodel-mocks (1.0.3)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-activemodel-mocks (1.1.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    rspec-temp_dir (1.0.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rspec-temp_dir (1.1.0)
       rspec (>= 3.0)
+    rubocop (0.61.1)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.4.0)
+    rubocop-rspec (1.30.1)
+      rubocop (>= 0.60.0)
+    ruby-graphviz (1.2.3)
+    ruby-progressbar (1.10.0)
     rubyzip (1.1.7)
-    sass (3.5.5)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -290,14 +322,14 @@ GEM
     selenium-webdriver (3.8.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
-    simple_form (3.5.0)
-      actionpack (> 4, < 5.2)
-      activemodel (> 4, < 5.2)
+    simple_form (4.0.0)
+      actionpack (> 4)
+      activemodel (> 4)
     spork (1.0.0rc4)
     spork-rails (4.0.0)
       rails (>= 3.0.0, < 5)
       spork (>= 1.0rc0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -305,30 +337,28 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.8)
-    transpec (3.3.0)
+    transpec (3.4.0)
       activesupport (>= 3.0, < 6.0)
       astrolabe (~> 1.2)
       bundler (~> 1.3)
       json (>= 1.8, < 3.0)
-      parser (>= 2.3.0.7)
+      parser (>= 2.5.0.0)
       rainbow (>= 1.99.1, < 3.0)
-    ttfunk (1.5.1)
-    twitter-bootstrap-rails (3.2.2)
-      actionpack (>= 3.1)
-      execjs (>= 2.2.2, >= 2.2)
-      less-rails (>= 2.5.0)
-      railties (>= 3.1)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    unicode-display_width (1.4.1)
     warden (1.2.7)
       rack (>= 1.0)
-    xpath (3.0.0)
+    wicked_pdf (1.1.0)
+    wkhtmltopdf-binary (0.12.4)
+    xpath (3.2.0)
       nokogiri (~> 1.8)
 
 PLATFORMS
@@ -336,11 +366,13 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-postgresql-adapter
+  activerecord-session_store
   arel
   best_in_place
   bootstrap-sass (~> 3.1.1.0)
   cancancan (~> 1.10)
   capybara (>= 1.1.2)
+  cocoon
   coffee-rails
   config
   cucumber-rails (>= 1.3.0)
@@ -349,20 +381,24 @@ DEPENDENCIES
   devise-i18n
   email_spec (>= 1.2.1)
   factory_bot_rails (>= 3.3.0)
+  font_awesome5_rails
   geckodriver-helper (~> 0.21.0)
+  i18n-tasks
   invoicing (>= 1.0.1)
   ipaddress (= 0.8.0)
   jquery-rails
   launchy (>= 2.1.0)
+  maildown
   money-rails
+  pagy
   pg (~> 0.18.4)
-  prawn
-  prawn-table
   rails (~> 4.2)
+  rails-erd
   rails-i18n
   rspec-activemodel-mocks
   rspec-rails (>= 2.10.1)
   rspec-temp_dir
+  rubocop-rspec
   rubyzip (~> 1.1.6)
   sass
   selenium-webdriver
@@ -371,7 +407,8 @@ DEPENDENCIES
   sqlite3 (>= 1.3.11)
   therubyracer
   transpec
-  twitter-bootstrap-rails
+  wicked_pdf
+  wkhtmltopdf-binary
 
 BUNDLED WITH
-   1.16.3
+   1.17.3

README.md

@@ -11,11 +11,11 @@ Développement
 
 0. Sous Debian Strech, il faut installer les paquets suivants :
 
-       bundler ruby-dev libpq-dev libxslt1-dev sqlite3 libsqlite3-dev ruby-sqlite3 ruby-nokogiri zlib1g-dev
+       bundler ruby-dev libpq-dev libxslt1-dev sqlite3 libsqlite3-dev ruby-sqlite3 ruby-nokogiri zlib1g-dev wkhtmltopdf
 
    Sous Archlinux, il faut installer :
 
-       sqlite libpqxx zlib libxslt
+       sqlite libpqxx zlib libxslt wkhtmltopdf
 
    puis installer RVM et la gem bundler (voir le fichier use_RVM.md).
    Aussi, les versions recentes de firefox ne sont pas compatibles avec les tests cucumber. 
@@ -23,7 +23,7 @@ Développement
 
        $ export USE_CHROME_BROWSER=true
 
-1. Installer les dépendances Ruby :
+1. Installer les dépendances Ruby :
 
        $ bundle install --path vendor/bundle
 
@@ -50,18 +50,36 @@ Ensuite, on peut lancer l'application avec le serveur web intégré :
 
        $ bin/rails server