Browse Source

Bug fixes with payperiod handling

Lily Carpenter 11 years ago
parent
commit
7ee96c0988
1 changed files with 4 additions and 3 deletions
  1. 4 3
      budget.py

+ 4 - 3
budget.py

52
             raise Error
52
             raise Error
53
 
53
 
54
     def current_pay_period(self):
54
     def current_pay_period(self):
55
+        if self.delta == None:
56
+            self.pay_period_delta()
55
         self.find_pay_period(datetime.date.today())
57
         self.find_pay_period(datetime.date.today())
56
 
58
 
57
     def next_pay_period(self):
59
     def next_pay_period(self):
59
             self.pay_period_delta()
61
             self.pay_period_delta()
60
 
62
 
61
         next_period = PayPeriod()
63
         next_period = PayPeriod()
62
-        next_period.find_pay_period(self.end + self.delta)
64
+        next_period.find_pay_period(self.end)
63
         next_period.calculate_budget()
65
         next_period.calculate_budget()
64
 
66
 
65
         return next_period
67
         return next_period
81
 
83
 
82
         beginning = pay_date
84
         beginning = pay_date
83
         end = pay_date
85
         end = pay_date
84
-
85
-        while date > end:
86
+        while date >= end:
86
             beginning = end
87
             beginning = end
87
             end += self.delta
88
             end += self.delta
88
 
89