Permalink
Browse files

Merge remote-tracking branch 'ekylibre/master' into stable-2

  • Loading branch information...
Brice TEXIER
Brice TEXIER committed Mar 30, 2018
2 parents 0b4920b + a4c4232 commit eade68d651596531f57655f00893a9996567e559
Showing with 75 additions and 129 deletions.
  1. +69 −68 Gemfile.lock
  2. +0 −1 app/helpers/backend/accounts_helper.rb
  3. +1 −1 app/helpers/backend/base_helper.rb
  4. +0 −1 app/helpers/backend/theme_helper.rb
  5. +0 −1 app/mailers/mailman.rb
  6. +1 −1 app/models/entity.rb
  7. +0 −1 config/locales/arb/i18n.rb
  8. +2 −2 config/locales/deu/nomenclatures.yml
  9. +0 −1 config/locales/fra/i18n.rb
  10. +0 −1 config/locales/jpn/i18n.rb
  11. +0 −1 config/locales/spa/i18n.rb
  12. +0 −1 lib/aggeratio/document_fragment.rb
  13. +0 −1 lib/delay.rb
  14. +0 −1 lib/ekylibre/export/accountancy_spreadsheet.rb
  15. +1 −1 lib/procedo/xml.rb
  16. +0 −1 test/controllers/backend/accounts_controller_test.rb
  17. +0 −1 test/controllers/backend/buildings_controller_test.rb
  18. +0 −1 test/controllers/backend/cash_transfers_controller_test.rb
  19. +0 −1 test/controllers/backend/cashes_controller_test.rb
  20. +0 −1 test/controllers/backend/catalogs_controller_test.rb
  21. +0 −1 test/controllers/backend/custom_field_choices_controller_test.rb
  22. +0 −1 test/controllers/backend/custom_fields_controller_test.rb
  23. +0 −1 test/controllers/backend/deposits_controller_test.rb
  24. +0 −1 test/controllers/backend/districts_controller_test.rb
  25. +0 −1 test/controllers/backend/document_templates_controller_test.rb
  26. +0 −1 test/controllers/backend/documents_controller_test.rb
  27. +0 −1 test/controllers/backend/entities_controller_test.rb
  28. +0 −1 test/controllers/backend/entity_addresses_controller_test.rb
  29. +0 −1 test/controllers/backend/entity_links_controller_test.rb
  30. +0 −1 test/controllers/backend/equipments_controller_test.rb
  31. +0 −1 test/controllers/backend/events_controller_test.rb
  32. +0 −1 test/controllers/backend/financial_years_controller_test.rb
  33. +0 −1 test/controllers/backend/fixed_assets_controller_test.rb
  34. +0 −1 test/controllers/backend/incoming_payment_modes_controller_test.rb
  35. +0 −1 test/controllers/backend/incoming_payments_controller_test.rb
  36. +0 −1 test/controllers/backend/inventories_controller_test.rb
  37. +0 −1 test/controllers/backend/inventory_items_controller_test.rb
  38. +0 −1 test/controllers/backend/journal_entry_items_controller_test.rb
  39. +0 −1 test/controllers/backend/journals_controller_test.rb
  40. +0 −1 test/controllers/backend/land_parcels_controller_test.rb
  41. +0 −1 test/controllers/backend/listing_node_items_controller_test.rb
  42. +0 −1 test/controllers/backend/listing_nodes_controller_test.rb
  43. +0 −1 test/controllers/backend/listings_controller_test.rb
  44. +0 −1 test/controllers/backend/observations_controller_test.rb
  45. +0 −1 test/controllers/backend/outgoing_payment_modes_controller_test.rb
  46. +0 −1 test/controllers/backend/postal_zones_controller_test.rb
  47. +0 −1 test/controllers/backend/purchase_natures_controller_test.rb
  48. +0 −1 test/controllers/backend/purchase_payments_controller_test.rb
  49. +0 −1 test/controllers/backend/purchases_controller_test.rb
  50. +0 −1 test/controllers/backend/registrations_controller_test.rb
  51. +0 −1 test/controllers/backend/roles_controller_test.rb
  52. +0 −1 test/controllers/backend/sale_natures_controller_test.rb
  53. +0 −1 test/controllers/backend/sales_controller_test.rb
  54. +0 −1 test/controllers/backend/sequences_controller_test.rb
  55. +0 −1 test/controllers/backend/settings_controller_test.rb
  56. +0 −1 test/controllers/backend/subscription_natures_controller_test.rb
  57. +0 −1 test/controllers/backend/subscriptions_controller_test.rb
  58. +0 −1 test/controllers/backend/taxes_controller_test.rb
  59. +0 −1 test/controllers/backend/teams_controller_test.rb
  60. +0 −1 test/controllers/backend/users_controller_test.rb
  61. +1 −1 test/models/fixed_asset_test.rb
@@ -46,7 +46,7 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
acts_as_list (0.9.10)
acts_as_list (0.9.11)
activerecord (>= 3.0)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
@@ -64,11 +64,11 @@ GEM
apartment (>= 1.0)
sidekiq (>= 2.11)
arel (6.0.4)
ast (2.3.0)
autoprefixer-rails (7.2.5)
ast (2.4.0)
autoprefixer-rails (8.2.0)
execjs
awesome_nested_set (3.1.3)
activerecord (>= 4.0.0, < 5.2)
awesome_nested_set (3.1.4)
activerecord (>= 4.0.0, < 5.3)
bcrypt (3.1.11)
beardley (1.4.2)
rjb (>= 1.4.8)
@@ -94,34 +94,32 @@ GEM
railties (>= 3.2, < 6.0)
bootstrap3-datetimepicker-rails (4.17.47)
momentjs-rails (>= 2.8.1)
browser (2.5.2)
browser (2.5.3)
builder (3.2.3)
bullet (5.5.1)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.10.0)
burisu-docsplit (0.7.9)
byebug (9.1.0)
capybara (2.13.0)
byebug (10.0.2)
capybara (2.18.0)
addressable
mime-types (>= 1.16)
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-webkit (1.14.0)
capybara (>= 2.3.0, < 2.14.0)
xpath (>= 2.0, < 4.0)
capybara-webkit (1.15.0)
capybara (>= 2.3, < 4.0)
json
charlock_holmes (0.7.5)
charlock_holmes (0.7.6)
charta (0.1.9)
json (>= 1.8.0)
nokogiri (>= 1.7.0)
rgeo (~> 0.6.0)
rgeo-geojson (~> 0.4.3)
childprocess (0.8.0)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
climate_control (0.2.0)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
cocoon (1.2.11)
codacy-coverage (1.1.8)
simplecov
@@ -150,27 +148,27 @@ GEM
debug_inspector (0.0.3)
deep_cloneable (2.2.2)
activerecord (>= 3.1.0, < 5.2.0)
devise (4.4.1)
devise (4.4.3)
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-views (0.3.7)
devise_invitable (1.7.2)
devise_invitable (1.7.3)
actionmailer (>= 4.1.0)
devise (>= 4.0.0)
did_you_mean (0.10.0)
interception
docile (1.1.5)
docile (1.3.0)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
ekylibre-ofx-parser (1.2.2)
hpricot (>= 0.6)
enumerize (2.1.2)
enumerize (2.2.2)
activesupport (>= 3.2)
erubis (2.7.0)
et-orbi (1.0.9)
et-orbi (1.1.0)
tzinfo
eventmachine (1.2.5)
exception_notification (4.2.2)
@@ -183,13 +181,13 @@ GEM
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
feedjira (2.1.3)
feedjira (2.1.4)
faraday (>= 0.9)
faraday_middleware (>= 0.9)
loofah (>= 2.0)
sax-machine (>= 1.0)
ffaker (2.8.1)
ffi (1.9.18)
ffi (1.9.23)
figaro (1.1.1)
thor (~> 0.14)
foreman (0.84.0)
@@ -210,16 +208,16 @@ GEM
http-cookie (1.0.3)
domain_name (~> 0.5)
http_accept_language (2.1.1)
httpi (2.4.2)
httpi (2.4.3)
rack
socksify
humanize (1.7.0)
i18n (0.9.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
i18n-complements (1.1.0)
i18n (>= 0.6)
i18n-js (3.0.3)
i18n (~> 0.6, >= 0.6.6)
i18n-js (3.0.5)
i18n (>= 0.6.6, < 2)
iban-tools (1.1.0)
interception (0.5)
jbuilder (2.7.0)
@@ -252,13 +250,13 @@ GEM
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
kgio (2.11.1)
kgio (2.11.2)
launchy (2.4.3)
addressable (~> 2.3)
letter_opener (1.6.0)
launchy (~> 2.2)
libv8 (3.16.14.19)
loofah (2.1.1)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
luhn (1.0.2)
@@ -278,22 +276,23 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mimemagic (0.3.2)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.1)
minitest-reporters (1.1.19)
minitest (5.11.3)
minitest-reporters (1.2.0)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
momentjs-rails (2.17.1)
momentjs-rails (2.20.1)
railties (>= 3.1)
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
net-http-digest_auth (1.4.1)
net-http-persistent (2.9.4)
netrc (0.11.0)
nokogiri (1.8.1)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
nori (2.6.0)
ntlm-http (0.1.1)
@@ -310,39 +309,39 @@ GEM
oauth2 (~> 1.1)
omniauth (~> 1.2)
orm_adapter (0.5.0)
paperclip (5.1.0)
paperclip (5.3.0)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
cocaine (~> 0.5.5)
mime-types
mimemagic (~> 0.3.0)
paperclip-document (0.0.10)
terrapin (~> 0.6.0)
paperclip-document (0.0.11)
burisu-docsplit (>= 0.7.9)
paperclip (>= 3.1, < 5.2)
paperclip (>= 3.1, < 6.0)
parallel (1.12.1)
parallel_tests (2.21.0)
parallel_tests (2.21.3)
parallel
parser (2.4.0.2)
ast (~> 2.3)
parser (2.5.0.5)
ast (~> 2.4.0)
pg (0.20.0)
polyglot (0.3.5)
possibly (1.0.1)
powerpack (0.1.1)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-byebug (3.5.1)
byebug (~> 9.1)
pry-byebug (3.6.0)
byebug (~> 10.0)
pry (~> 0.10)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.1)
public_suffix (3.0.2)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.8)
rack (1.6.9)
rack-accept (0.4.5)
rack (>= 0.4)
rack-protection (2.0.0)
rack-protection (2.0.1)
rack
rack-test (0.6.3)
rack (>= 1.0)
@@ -363,15 +362,15 @@ 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_best_practices (1.19.0)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails_best_practices (1.19.1)
activesupport
code_analyzer (>= 0.4.8)
erubis
i18n
json
require_all
require_all (~> 1.5.0)
ruby-progressbar
railties (4.2.10)
actionpack (= 4.2.10)
@@ -381,8 +380,8 @@ GEM
rainbow (2.2.2)
rake
raindrops (0.19.0)
rake (12.3.0)
rb-fsevent (0.10.2)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rdoc (4.3.0)
@@ -432,7 +431,7 @@ GEM
rubyzip (1.2.1)
rufus-scheduler (3.4.2)
et-orbi (~> 1.0)
sass (3.5.5)
sass (3.5.6)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -455,16 +454,16 @@ GEM
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
selenium-webdriver (3.8.0)
selenium-webdriver (3.11.0)
childprocess (~> 0.5)
rubyzip (~> 1.0)
sentry-raven (2.7.1)
rubyzip (~> 1.2)
sentry-raven (2.7.2)
faraday (>= 0.7.6, < 1.0)
sepa_king (0.10.1)
activemodel (>= 3.0.0)
builder
iban-tools
sexp_processor (4.10.0)
sexp_processor (4.10.1)
shoulda-context (1.2.2)
sidekiq (4.2.10)
concurrent-ruby (~> 1.0)
@@ -482,15 +481,15 @@ GEM
thor
simple_calendar (2.2.7)
rails (>= 3.0)
simple_form (3.5.0)
simple_form (3.5.1)
actionpack (> 4, < 5.2)
activemodel (> 4, < 5.2)
simplecov (0.15.1)
docile (~> 1.1.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
skylight (1.5.0)
skylight (1.6.0)
activesupport (>= 3.0.0)
socksify (1.7.1)
spring (2.0.2)
@@ -508,6 +507,8 @@ GEM
teaspoon-jasmine (2.3.4)
teaspoon (>= 1.0.0)
temple (0.8.0)
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
@@ -523,7 +524,7 @@ GEM
i18n
timecop (0.9.1)
timeliness (0.3.8)
treetop (1.6.9)
treetop (1.6.10)
polyglot (~> 0.3)
turbolinks (2.5.4)
coffee-rails
@@ -536,21 +537,21 @@ GEM
actionpack (>= 3.1)
jquery-rails
railties (>= 3.1)
tzinfo (1.2.4)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.4)
uglifier (4.1.8)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)
unf_ext (0.0.7.5)
unicode-display_width (1.3.0)
unicorn (5.4.0)
kgio (~> 2.6)
raindrops (~> 0.7)
uniform_notifier (1.10.0)
url (0.3.2)
uuidtools (2.1.5)
wannabe_bool (0.7.0)
wannabe_bool (0.7.1)
warden (1.2.7)
rack (>= 1.0)
wasabi (3.5.0)
@@ -561,8 +562,8 @@ GEM
debug_inspector
railties (>= 4.2)
webrobots (0.1.2)
xpath (2.1.0)
nokogiri (~> 1.3)
xpath (3.0.0)
nokogiri (~> 1.8)
PLATFORMS
ruby
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# == License
# Ekylibre - Simple agricultural ERP
# Copyright (C) 2008-2013 Brice Texier
@@ -78,7 +78,7 @@ def start_date
def basic_calendar(all_records, options = {}, &block)
# options[:events] = all_records
options[:param_name] ||= :started_on
BasicCalendar.new(self, options).render do |event_on, records|
BasicCalendar.new(self, options).render do |event_on, _records|
records = all_records.select do |event|
event_on == event.started_at.to_date
end
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# == License
# Ekylibre - Simple agricultural ERP
# Copyright (C) 2014 Brice Texier
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
class Mailman < ActionMailer::Base
def mailing(expedier, recipient, subject, text, piece = nil)
# from expedier
Oops, something went wrong.

0 comments on commit eade68d

Please sign in to comment.