Enhances code style

ekylibre · Aug 28, 2017 · c9f5d2d · c9f5d2d
1 parent 395a576
commit c9f5d2d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/app/models/product_nature_variant.rb b/app/models/product_nature_variant.rb
@@ -434,8 +434,8 @@ def current_stock
 
   # Return current quantity of all products link to the variant currently ordered or invoiced but not delivered
   def current_outgoing_stock_ordered_not_delivered
-    quantity_ordered = self.sale_items.includes(:sale).where(sales: { state: %w[order invoice] }).sum(:quantity)
-    quantity_delivered = self.parcel_items.includes(:parcel).where(parcels: { state: 'given', nature: 'outgoing' }).sum(:population)
+    quantity_ordered = sale_items.includes(:sale).where(sales: { state: %w[order invoice] }).sum(:quantity)
+    quantity_delivered = parcel_items.includes(:parcel).where(parcels: { state: 'given', nature: 'outgoing' }).sum(:population)
     (quantity_ordered - quantity_delivered).to_f
   end
 

diff --git a/test/models/product_nature_variant_test.rb b/test/models/product_nature_variant_test.rb
@@ -82,7 +82,6 @@ class ProductNatureVariantTest < ActiveSupport::TestCase
     variant = create(:product_nature_variant)
     sale = create(:sale)
     sale.update(state: 'order')
-    sale_item = create(:sale_item, sale: sale, variant: variant, quantity: 50.to_d)
     parcel = create(:parcel, sale: sale)
     parcel.update(state: 'prepared')
     assert_equal 50.0, variant.current_outgoing_stock_ordered_not_delivered