Skip to content

Commit

Permalink
Release 2.59.2
Browse files Browse the repository at this point in the history
  • Loading branch information
piotaixr committed Jan 10, 2020
1 parent 5e0c99d commit f83efd8
Show file tree
Hide file tree
Showing 41 changed files with 43 additions and 46 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.59.1
2.59.2
4 changes: 0 additions & 4 deletions app/assets/javascripts/backend/purchase_invoices.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@
$('#new_purchase_invoice').on 'cocoon:after-remove', E.Purchases.compute_amount
$('.edit_purchase_invoice').on 'cocoon:after-remove', E.Purchases.compute_amount

$(document).on 'click', '.nested-fields .edit-item[data-edit="item-form"]', (event) ->
vatSelectedValue = $(event.target).closest('.nested-fields').find('.item-display .vat-rate').attr('data-selected-value')
$(event.target).closest('.nested-fields').find('.nested-item-form:visible .vat-total').val(vatSelectedValue)

$('#new_purchase_invoice table.list').bind 'cocoon:after-insert', (event, insertedItem) ->
return if !insertedItem?
new_id = insertedItem.html().match(new RegExp('\\[(\\d+)\\]'))[1] #HACK: Get id from inputs
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/backend/trade.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
else if input.val() is ""
input.val(0)

if data.tax_id?
item.find(options.tax or "*[data-trade-component='tax']").val(data.tax_id)
if data.tax_id?
item.find(options.tax or "*[data-trade-component='tax']").val(data.tax_id)

# Compute totals
if ['change', 'readystatechange'].includes event.type
Expand Down
2 changes: 1 addition & 1 deletion app/decorators/activity_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def multiply_costs(costs, multiplier)
end

def divider_costs(costs, divider)
costs.each { |key, value| costs[key] = value / divider unless value.zero? }
costs.each { |key, value| costs[key] = value / divider unless divider.zero? }
end

def human_costs(costs)
Expand Down
5 changes: 3 additions & 2 deletions app/views/backend/purchase_invoices/_item_fields.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
%label{ class: 'amount-including-taxes', data: { item_value: "input.invoice-total" } }= f.object.variant ? f.object.variant.name : 'ERROR'
%label= Nomen::Currency.find(f.object.currency).symbol
%label{ class: "invoice-second-row-label"}= :vat_rate.tl
%label{ class: 'vat-rate', data: { item_value: "select.vat-total option:selected", selected_value: f.object.tax_id } }= f.object.variant ? f.object.variant.name : 'ERROR'
%label{ class: 'vat-rate', data: { item_value: "select.vat-total option:selected" } }= f.object.variant ? f.object.variant.name : 'ERROR'
%tr.nested-item-form{data: {item_id: item.parcels_purchase_invoice_items.first&.id } }
%td.item-form{colspan: 20}
Expand All @@ -59,7 +59,8 @@
= '%'

.vat-total-controls
= f.input(:tax_id, label: :vat_rate.tl, collection: Tax.current.collect{|t| [t.short_label, t.id, {'data-rate' => ((100 + t.usable_amount)/100)}]}, selected: f.object.tax_id, input_html: { class: "vat-total", data: {value: 'rate', trade_component: "tax"}})
-#- byebug
= f.input(:tax_id, label: :vat_rate.tl, collection: Tax.current.collect{|t| [t.short_label, t.id, {'data-rate' => ((100 + t.usable_amount)/100)}]}, input_html: { class: "vat-total", data: {value: 'rate', trade_component: "tax"}})

.pta-controls.pre-tax-invoice-total-controls
= f.input :pretax_amount, wrapper: :append do
Expand Down
2 changes: 1 addition & 1 deletion public/404.arb.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>الصفحة التي تبحث عنها غير موجودة</h1>
<p>كنت قد أخطأت في كتابة عنوان أو الصفحة قد تحركت.</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/404.cmn.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>您正在寻找不存在的页面</h1>
<p>您可能输入了错误的地址或网页可能已移动。</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/404.deu.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/404.fra.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/404.ita.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/404.jpn.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>あなたが探していたページは存在しません。</h1>
<p>あなたは、アドレスが間違って入力されているか、ページが移動した可能性があります。</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/404.por.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/404.spa.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/422.arb.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>ورفض التغيير الذي أراد</h1>
<p>ربما حاولت تغيير شيء ما لم يكن لديك الوصول إليها.</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/422.cmn.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>你想改变被拒绝</h1>
<p>也许你想改变的东西你没有访问。</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/422.deu.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/422.fra.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/422.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/422.ita.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/422.jpn.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>あなたが望んでいた変更が拒否されました</h1>
<p>たぶん、あなたはあなたがアクセス権を持っていなかった何かを変更しようとしました。</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/422.por.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>As modificações foram rejeitadas</h1>
<p>Talvez você esteja tentando modificar algo ao qual não tem acesso</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/422.spa.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>El cambio que quería fue rechazada</h1>
<p>Tal vez ha intentado cambiar algo que no tiene acceso.</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/500.arb.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>نحن نعتذر، ولكن حدث خطأ ما</h1>
<p>واجه تطبيق المشاكل. تم إخطار المسؤولين عن هذه المشكلة.</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/500.cmn.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>我们很抱歉,但是出现了一些问题</h1>
<p>应用程序遇到问题。管理员已经被告知了这个问题。</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/500.deu.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>Es tut uns leid, aber etwas is schief gelaufen</h1>
<p>Die Anwendung begegnet Probleme. Administratoren wurden für dieses Problem informiert.</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/500.fra.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>Nous sommes désolés, mais quelque chose s’est mal passé</h1>
<p>L’application rencontre des problèmes. Les administrateurs ont été notifiés.</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/500.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>We're sorry, but something went wrong</h1>
<p>The application encounters problems. Administrators have been notified for this problem.</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/500.ita.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>Siamo spiacenti, ma qualcosa è andato storto</h1>
<p>L'applicazione incontra problemi. Gli amministratori sono stati notificati per questo problema.</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/500.jpn.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>申し訳ございません。不具合が発生しました</h1>
<p>アプリケーションでは、問題が発生しました。管理者は、この問題のために通知されています。</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/500.por.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>Nos desculpamos, mas alguma coisa aconteceu de errado</h1>
<p>A aplicação encontra problemas. Os administradores foram notificados para este problema.</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/500.spa.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>Lo lamentamos, pero algo salió mal</h1>
<p>La aplicación se encuentra con problemas. Los administradores han sido notificados para este problema.</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/maintenance.arb.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>الخدمة تحت الصيانة وغير متوفرة في الوقت ا
<p>يرجى العودة في وقت لاحق</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/maintenance.cmn.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>该服务是在维护和不可用现在</h1>
<p>请待会再过来</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/maintenance.deu.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>Der Service ist unter Wartung und ist jetzt nicht verfügbar</h1>
<p>Bitte komme später zurück</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/maintenance.fra.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>Le service est en maintenance et est indisponible pour le moment</h1>
<p>Merci de revenir plus tard</p>
</div>
</div>
<div class='dialog legals'>Ekylibre 2.59.1
<div class='dialog legals'>Ekylibre 2.59.2
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion public/maintenance.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1>The service is under maintenance and is unavailable for now</h1>