lib/models/trip_leg.rb in fossil-0.5.41 vs lib/models/trip_leg.rb in fossil-0.5.42

@@ -956,14 +956,13 @@
     def fuel_data_by_fbo_keys trip_legs, fbo_keys
       data = Hash.new
       trip_legs.each do |leg|
         leg.fuel_expenses.each do |expense|
 
-          expense_type = expense_type_string( expense )
-          fbo_name = leg.send( "#{expense_type}_fbo__name" )
-          p fbo_name
+          fbo_name = leg.send( "#{expense.type_string}_fbo__name" )
+
           if fbo_keys.include?(fbo_name) then # is this an fbo we are looking for?
-            expense_hash = calculate_expense( expense, leg )
+            expense_hash = expense.fuel_passdown_hash
 
             if data.has_key?(fbo_name)
               data[fbo_name].push(expense_hash)
             else
               data[fbo_name] = [expense_hash]
\ No newline at end of file