Release 2.59.2

Author: piotaixr

VERSION

@@ -1 +1 @@
-2.59.1
+2.59.2

app/assets/javascripts/backend/purchase_invoices.js.coffee

@@ -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

app/assets/javascripts/backend/trade.js.coffee

@@ -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

app/decorators/activity_decorator.rb

@@ -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)

app/views/backend/purchase_invoices/_item_fields.html.haml

@@ -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}
@@ -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

public/404.arb.html

@@ -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>

public/404.cmn.html

@@ -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>

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.59.1
+<div class='dialog legals'>Ekylibre 2.59.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.59.1
+<div class='dialog legals'>Ekylibre 2.59.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.59.1
+<div class='dialog legals'>Ekylibre 2.59.2
 </div>
 </body>
 </html>