fixed combined average price: if yearly = 0, combined = monthly average, if monthly = 0 combined = yearly average, if both = 0, combined = 0

Author: croolicjah

money/views.py

@@ -126,7 +126,12 @@ def get_subs_chart(self):
         if chart['monthly']:
             monthly = monthly_sum/sum([v for v in chart['monthly'].values()])
 
-        combined = (yearly/12 + monthly)/2
+        if yearly > 0 and monthly > 0:
+            combined = (yearly/12 + monthly)/2
+        elif monthly > 0:
+            combined = monthly
+        else:
+            combined = yearly
 
         chart['avg'] = {
             'yearly': yearly,