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