Merge branch 'master' into debug/2053-DB_version_not_present_in_dump_…

…archive_manifest

Merged master to run accurate tests

.travis.yml

@@ -3,12 +3,11 @@ bundler_args: "--full-index --without development"
 cache: bundler
 rvm:
 - 2.2.7
-- 2.3.4
 env:
 - TEST_SUITE=libs
 - TEST_SUITE=models
 - TEST_SUITE=controllers
-- TEST_SUITE=frontend
+#- TEST_SUITE=frontend
 before_install: test/ci/before_install
 before_script: test/ci/before_script
 script: xvfb-run bundle exec rake test:$TEST_SUITE DRIVER=webkit
@@ -19,7 +18,3 @@ notifications:
   email: false
   slack:
     secure: v1/ya/fyroy3BmW9FDMmKi3lwamnzY6ktQAU/vEJCg4AgvauY0QJthMsLXOBb3RnhFWao2Kj2H40XjI7VtH3z46VEq6DPLURBqmAc24c30ZMi/XIM9YqauYeEPHPhM0nDQY+s0ovU2uX/1w7uv/atNjy0n643An61Em+qPwIW5U=
-addons:
-  apt:
-    packages:
-    - libqtwebkit-dev

Gemfile.lock

@@ -120,7 +120,7 @@ GEM
     cocoon (1.2.10)
     codacy-coverage (1.1.6)
       simplecov
-    code_analyzer (0.4.7)
+    code_analyzer (0.4.8)
       sexp_processor
     code_string (0.0.1)
     coderay (1.1.1)
@@ -168,7 +168,7 @@ GEM
     erubis (2.7.0)
     et-orbi (1.0.5)
       tzinfo
-    eventmachine (1.2.3)
+    eventmachine (1.2.5)
     exception_notification (4.2.1)
       actionmailer (>= 4.0, < 6)
       activesupport (>= 4.0, < 6)
@@ -177,7 +177,7 @@ GEM
       activesupport (>= 3.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.11.0.1)
+    faraday_middleware (0.12.0)
       faraday (>= 0.7.4, < 1.0)
     feedjira (2.1.2)
       faraday (>= 0.9)
@@ -198,7 +198,7 @@ GEM
       activesupport (>= 4.2.0)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    haml (5.0.1)
+    haml (5.0.2)
       temple (>= 0.8.0)
       tilt
     hashie (3.5.6)
@@ -313,7 +313,7 @@ GEM
     paperclip-document (0.0.10)
       burisu-docsplit (>= 0.7.9)
       paperclip (>= 3.1, < 5.2)
-    parallel (1.11.2)
+    parallel (1.12.0)
     parallel_tests (2.14.2)
       parallel
     parser (2.4.0.0)
@@ -363,9 +363,9 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rails_best_practices (1.18.1)
+    rails_best_practices (1.19.0)
       activesupport
-      code_analyzer (>= 0.4.3)
+      code_analyzer (>= 0.4.8)
       erubis
       i18n
       json
@@ -456,7 +456,7 @@ GEM
     selenium-webdriver (3.4.4)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
-    sentry-raven (2.6.0)
+    sentry-raven (2.6.1)
       faraday (>= 0.7.6, < 1.0)
     sepa_king (0.9.0)
       activemodel (>= 3.0.0)

VERSION

@@ -1 +1 @@
-2.48.1
+2.48.2

app/views/layouts/zen.html.haml

@@ -17,6 +17,7 @@
           = heading_tag
           = yield :help_zone if content_for? :help_zone
         #content
+          = extensions_tag(:content_top)
           = subheading_tag
           = notifications_tag
           = view_toolbar_tag

config/locales/arb/action.yml

@@ -516,7 +516,7 @@ arb:
       new: "دفعة دفع جديدة"
       # show: "Payslip payment: %{number}"
     backend/payslips:
-      # edit: "Edit payslip: %{name}"
+      # edit: "Edit payslip: %{number}"
       index: "كشوف"
       new: "جديد قسيمة الدفع"
       # show: "Payslip: %{number}"
@@ -2943,7 +2943,7 @@ arb:
     # backend/entity_links: "%{started_at}"
     # backend/events: "%{name}"
     # backend/incoming_payments: "%{number}. %{mode_name} from %{payer_full_name} of %{amount} %{currency}"
-    # backend/interventions: "%{number}. %{name}"
+    # backend/interventions: "%{number}"
     # backend/journal_entry_items: "%{entry_number} %{name} %{account_number} D%{real_debit} C%{real_credit} %{currency}"
     # backend/matters: "%{name} ‒ %{work_number}"
     # backend/observations: "%{content}"

config/locales/cmn/action.yml

@@ -423,7 +423,7 @@ cmn:
       new: "新的支付费用"
       # show: "Payslip payment: %{number}"
     backend/payslips:
-      # edit: "Edit payslip: %{name}"
+      # edit: "Edit payslip: %{number}"
       index: "工资单"
       new: "新工资单"
       # show: "Payslip: %{number}"
@@ -2166,7 +2166,7 @@ cmn:
     # backend/entity_links: "%{started_at}"
     # backend/events: "%{name}"
     # backend/incoming_payments: "%{number}. %{mode_name} from %{payer_full_name} of %{amount} %{currency}"
-    # backend/interventions: "%{number}. %{name}"
+    # backend/interventions: "%{number}"
     # backend/journal_entry_items: "%{entry_number} %{name} %{account_number} D%{real_debit} C%{real_credit} %{currency}"
     # backend/matters: "%{name} ‒ %{work_number}"
     # backend/observations: "%{content}"

config/locales/deu/action.yml

@@ -423,7 +423,7 @@ deu:
       new: "Neue payslip Zahlung"
       # show: "Payslip payment: %{number}"
     backend/payslips:
-      # edit: "Edit payslip: %{name}"
+      # edit: "Edit payslip: %{number}"
       # index: "Payslips"
       new: "Neue Payslip"
       # show: "Payslip: %{number}"
@@ -2164,7 +2164,7 @@ deu:
     # backend/entity_links: "%{started_at}"
     # backend/events: "%{name}"
     # backend/incoming_payments: "%{number}. %{mode_name} from %{payer_full_name} of %{amount} %{currency}"
-    # backend/interventions: "%{number}. %{name}"
+    # backend/interventions: "%{number}"
     # backend/journal_entry_items: "%{entry_number} %{name} %{account_number} D%{real_debit} C%{real_credit} %{currency}"
     # backend/matters: "%{name} ‒ %{work_number}"
     # backend/observations: "%{content}"

config/locales/eng/action.yml

@@ -541,7 +541,7 @@ eng:
       show: "Payslip payment: %{number}"
     backend/payslips:
       # correct: "Correct payslip: %{name}"
-      edit: "Edit payslip: %{name}"
+      edit: "Edit payslip: %{number}"
       index: "Payslips"
       # invoice: "Invoice payslip: %{name}"
       new: "New payslip"
@@ -2432,7 +2432,7 @@ eng:
     backend/entity_links: "%{started_at}"
     backend/events: "%{name}"
     backend/incoming_payments: "%{number}. %{mode_name} from %{payer_full_name} of %{amount} %{currency}"
-    backend/interventions: "%{number}. %{name}"
+    backend/interventions: "%{number}"
     backend/journal_entry_items: "%{entry_number} %{name} %{account_number} D%{real_debit} C%{real_credit} %{currency}"
     backend/matters: "%{name} ‒ %{work_number}"
     backend/observations: "%{content}"

config/locales/fra/action.yml

@@ -2807,7 +2807,7 @@ fra:
     backend/entity_links: "%{started_at}"
     backend/events: "%{name}"
     backend/incoming_payments: "%{number}. %{mode_name} de %{payer_full_name} de %{amount} %{currency}"
-    backend/interventions: "%{number}. %{name}"
+    backend/interventions: "%{number}"
     backend/journal_entry_items: "[%{entry_number}] %{name} (%{account_number}) D%{real_debit}/C%{real_credit} %{currency}"
     backend/matters: "%{name} ‒ %{work_number}"
     backend/observations: "%{content}"

config/locales/ita/action.yml

@@ -423,7 +423,7 @@ ita:
       new: "Nuovo pagamento payslip"
       # show: "Payslip payment: %{number}"
     backend/payslips:
-      # edit: "Edit payslip: %{name}"
+      # edit: "Edit payslip: %{number}"
       index: "Buste paga"
       new: "Nuovo payslip"
       # show: "Payslip: %{number}"
@@ -2231,7 +2231,7 @@ ita:
     # backend/entity_links: "%{started_at}"
     # backend/events: "%{name}"
     # backend/incoming_payments: "%{number}. %{mode_name} from %{payer_full_name} of %{amount} %{currency}"
-    # backend/interventions: "%{number}. %{name}"
+    # backend/interventions: "%{number}"
     # backend/journal_entry_items: "%{entry_number} %{name} %{account_number} D%{real_debit} C%{real_credit} %{currency}"
     # backend/matters: "%{name} ‒ %{work_number}"
     # backend/observations: "%{content}"

config/locales/jpn/action.yml

@@ -423,7 +423,7 @@ jpn:
       new: "新しいペイチップの支払い"
       # show: "Payslip payment: %{number}"
     backend/payslips:
-      # edit: "Edit payslip: %{name}"
+      # edit: "Edit payslip: %{number}"
       index: "ペイスリップス"
       new: "新しいペイプルップ"
       # show: "Payslip: %{number}"
@@ -2241,7 +2241,7 @@ jpn:
     # backend/entity_links: "%{started_at}"
     # backend/events: "%{name}"
     # backend/incoming_payments: "%{number}. %{mode_name} from %{payer_full_name} of %{amount} %{currency}"
-    # backend/interventions: "%{number}. %{name}"
+    # backend/interventions: "%{number}"
     # backend/journal_entry_items: "%{entry_number} %{name} %{account_number} D%{real_debit} C%{real_credit} %{currency}"
     # backend/matters: "%{name} ‒ %{work_number}"
     # backend/observations: "%{content}"

config/locales/por/action.yml

@@ -428,7 +428,7 @@ por:
       new: "Novo pagamento de salário"
       # show: "Payslip payment: %{number}"
     backend/payslips:
-      # edit: "Edit payslip: %{name}"
+      # edit: "Edit payslip: %{number}"
       index: "Listas de pagamento"
       new: "Novo salário"
       # show: "Payslip: %{number}"
@@ -2170,7 +2170,7 @@ por:
     backend/entity_links: "%{started_at}"
     backend/events: "%{name}"
     backend/incoming_payments: "%{number}. %{mode_name} from %{payer_full_name} %{amount} %{currency}"
-    backend/interventions: "%{number}. %{name}"
+    backend/interventions: "%{number}"
     backend/journal_entry_items: "%{entry_number} %{name} %{account_number} D%{real_debit} C%{real_credit} %{currency}"
     backend/matters: "%{name} ‒ %{work_number}"
     backend/observations: "%{content}"

config/locales/spa/action.yml

@@ -460,7 +460,7 @@ spa:
       new: "Nuevo pago de la nómina"
       # show: "Payslip payment: %{number}"
     backend/payslips:
-      # edit: "Edit payslip: %{name}"
+      # edit: "Edit payslip: %{number}"
       index: "Papeletas"
       new: "Nuevo salario"
       # show: "Payslip: %{number}"
@@ -2458,7 +2458,7 @@ spa:
     # backend/entity_links: "%{started_at}"
     # backend/events: "%{name}"
     # backend/incoming_payments: "%{number}. %{mode_name} from %{payer_full_name} of %{amount} %{currency}"
-    # backend/interventions: "%{number}. %{name}"
+    # backend/interventions: "%{number}"
     # backend/journal_entry_items: "%{entry_number} %{name} %{account_number} D%{real_debit} C%{real_credit} %{currency}"
     # backend/matters: "%{name} ‒ %{work_number}"
     # backend/observations: "%{content}"

public/404.arb.html

@@ -52,7 +52,7 @@ <h1>الصفحة التي تبحث عنها غير موجودة</h1>
 <p>كنت قد أخطأت في كتابة عنوان أو الصفحة قد تحركت.</p>
 </div>
 </div>
-<div class='dialog legals'>Ekylibre 2.48.1
+<div class='dialog legals'>Ekylibre 2.48.2
 </div>
 </body>
 </html>

public/404.cmn.html

@@ -52,7 +52,7 @@ <h1>您正在寻找不存在的页面</h1>
 <p>您可能输入了错误的地址或网页可能已移动。</p>
 </div>
 </div>
-<div class='dialog legals'>Ekylibre 2.48.1
+<div class='dialog legals'>Ekylibre 2.48.2
 </div>
 </body>
 </html>

public/404.deu.html

@@ -52,7 +52,7 @@ <h1>Die Seite, die Sie suchen ist nicht vorhanden</h1>
 <p>Sie können die Adresse falsch eingegeben oder die Seite verschoben haben.</p>
 </div>
 </div>
-<div class='dialog legals'>Ekylibre 2.48.1
+<div class='dialog legals'>Ekylibre 2.48.2
 </div>
 </body>
 </html>

public/404.fra.html

@@ -52,7 +52,7 @@ <h1>La page que vous voulez n’existe pas</h1>
 <p>Vous pouvez avoir mal saisi l’adresse ou la page peut avoir été déplacée.</p>
 </div>
 </div>
-<div class='dialog legals'>Ekylibre 2.48.1
+<div class='dialog legals'>Ekylibre 2.48.2
 </div>
 </body>
 </html>

public/404.html

@@ -52,7 +52,7 @@ <h1>The page you were looking for doesn't exist</h1>
 <p>You may have mistyped the address or the page may have moved.</p>
 </div>
 </div>
-<div class='dialog legals'>Ekylibre 2.48.1
+<div class='dialog legals'>Ekylibre 2.48.2
 </div>
 </body>
 </html>

public/404.ita.html

@@ -52,7 +52,7 @@ <h1>La pagina che stavi cercando non esiste</h1>
 <p>Potreste aver digitato in modo errato l'indirizzo o la pagina potrebbe essere spostato.</p>
 </div>
 </div>
-<div class='dialog legals'>Ekylibre 2.48.1
+<div class='dialog legals'>Ekylibre 2.48.2
 </div>
 </body>
 </html>

public/404.jpn.html

@@ -52,7 +52,7 @@ <h1>あなたが探していたページは存在しません。</h1>
 <p>あなたは、アドレスが間違って入力されているか、ページが移動した可能性があります。</p>
 </div>
 </div>
-<div class='dialog legals'>Ekylibre 2.48.1
+<div class='dialog legals'>Ekylibre 2.48.2
 </div>
 </body>
 </html>

public/404.por.html

@@ -52,7 +52,7 @@ <h1>A página que está procurando não existe</h1>
 <p>Você deve ter digitado alguma valor errado ou a página não existe mais.</p>
 </div>
 </div>
-<div class='dialog legals'>Ekylibre 2.48.1
+<div class='dialog legals'>Ekylibre 2.48.2
 </div>
 </body>
 </html>

public/404.spa.html

@@ -52,7 +52,7 @@ <h1>La página que estás buscando no existe</h1>
 <p>Es posible que haya escrito mal la dirección o la página puede haber movido.</p>
 </div>
 </div>
-<div class='dialog legals'>Ekylibre 2.48.1
+<div class='dialog legals'>Ekylibre 2.48.2
 </div>
 </body>
 </html>

public/422.arb.html

@@ -52,7 +52,7 @@ <h1>ورفض التغيير الذي أراد</h1>
 <p>ربما حاولت تغيير شيء ما لم يكن لديك الوصول إليها.</p>
 </div>
 </div>
-<div class='dialog legals'>Ekylibre 2.48.1
+<div class='dialog legals'>Ekylibre 2.48.2
 </div>
 </body>
 </html>

public/422.cmn.html

@@ -52,7 +52,7 @@ <h1>你想改变被拒绝</h1>
 <p>也许你想改变的东西你没有访问。</p>
 </div>
 </div>
-<div class='dialog legals'>Ekylibre 2.48.1
+<div class='dialog legals'>Ekylibre 2.48.2
 </div>
 </body>
 </html>

public/422.deu.html

@@ -52,7 +52,7 @@ <h1>Die Änderung, die Sie wollte, wurde abgelehnt</h1>
 <p>Vielleicht versucht, etwas zu ändern, die Sie keinen Zugang zu haben.</p>
 </div>
 </div>
-<div class='dialog legals'>Ekylibre 2.48.1
+<div class='dialog legals'>Ekylibre 2.48.2
 </div>
 </body>
 </html>

public/422.fra.html

@@ -52,7 +52,7 @@ <h1>Le changement que vous avez demandé a été rejeté</h1>
 <p>Peut-être que vous avez essayé de changer quelque chose auquel vous n’avez pas accès.</p>
 </div>
 </div>
-<div class='dialog legals'>Ekylibre 2.48.1
+<div class='dialog legals'>Ekylibre 2.48.2
 </div>
 </body>
 </html>

public/422.html

@@ -52,7 +52,7 @@ <h1>The change you wanted was rejected</h1>
 <p>Maybe you tried to change something you didn't have access to.</p>
 </div>
 </div>
-<div class='dialog legals'>Ekylibre 2.48.1
+<div class='dialog legals'>Ekylibre 2.48.2
 </div>
 </body>
 </html>

public/422.ita.html

@@ -52,7 +52,7 @@ <h1>Il cambiamento si voleva è stata respinta</h1>
 <p>Forse si è tentato di cambiare qualcosa che non ha accesso.</p>
 </div>
 </div>
-<div class='dialog legals'>Ekylibre 2.48.1
+<div class='dialog legals'>Ekylibre 2.48.2
 </div>
 </body>
 </html>

public/422.jpn.html

@@ -52,7 +52,7 @@ <h1>あなたが望んでいた変更が拒否されました</h1>
 <p>たぶん、あなたはあなたがアクセス権を持っていなかった何かを変更しようとしました。</p>
 </div>
 </div>
-<div class='dialog legals'>Ekylibre 2.48.1
+<div class='dialog legals'>Ekylibre 2.48.2
 </div>
 </body>
 </html>