dashboard: lease form fix year inaccuracy

circle/dashboard/forms.py

@@ -321,7 +321,7 @@ class LeaseForm(forms.ModelForm):
             if count != 0:
             if count != 0:
                 break
                 break
         re = {'%s' % name: count}
         re = {'%s' % name: count}
-        if i + 1 < len(chunks):
+        if i + 1 < len(chunks) and i > 0:
             seconds2, name2 = chunks[i + 1]
             seconds2, name2 = chunks[i + 1]
             count2 = (delta_seconds - (seconds * count)) // seconds2
             count2 = (delta_seconds - (seconds * count)) // seconds2
             if count2 != 0:
             if count2 != 0:
@@ -348,25 +348,17 @@ class LeaseForm(forms.ModelForm):
 
 
     def save(self, commit=True):
     def save(self, commit=True):
         data = self.cleaned_data
         data = self.cleaned_data
-        # 12 months are only 360 days and not 365
-        data['suspend_years'] = data['delete_years'] = 0
-        while data['suspend_months'] >= 12:
-            data['suspend_years'] += 1
-            data['suspend_months'] -= 12
-        while data['delete_months'] >= 12:
-            data['delete_years'] += 1
-            data['delete_months'] -= 12
 
 
         suspend_seconds = timedelta(
         suspend_seconds = timedelta(
             hours=data['suspend_hours'],
             hours=data['suspend_hours'],
-            days=(data['suspend_days'] + data['suspend_months'] * 30 +
-                  data['suspend_years'] * 365),
+            days=(data['suspend_days'] + data['suspend_months'] % 12 * 30 +
+                  data['suspend_months'] / 12 * 365),
             weeks=data['suspend_weeks'],
             weeks=data['suspend_weeks'],
         )
         )
         delete_seconds = timedelta(
         delete_seconds = timedelta(
             hours=data['delete_hours'],
             hours=data['delete_hours'],
-            days=(data['delete_days'] + data['delete_months'] * 30 +
-                  data['delete_years'] * 365),
+            days=(data['delete_days'] + data['delete_months'] % 12 * 30 +
+                  data['delete_months'] / 12 * 365),
             weeks=data['delete_weeks'],
             weeks=data['delete_weeks'],
         )
         )
         self.instance.delete_interval = delete_seconds
         self.instance.delete_interval = delete_seconds