Merge branch 'master' into followable

2017-07-11 11:30:49 +02:00
parent b0ee52556c 6285ad3b68
commit 204ea13c85
85 changed files with 1251 additions and 664 deletions
--- a/app/models/budget/investment.rb
+++ b/app/models/budget/investment.rb
@@ -205,7 +205,7 @@ class Budget
    end

    def recalculate_heading_winners
-      Budget::Result.new(budget, heading).calculate_winners if incompatible_changed? && winner? && incompatible?
+      Budget::Result.new(budget, heading).calculate_winners if incompatible_changed?
    end

    def set_responsible_name