Merge branch 'abcaregiveramount' of https://github.com/SirMalamute/policyengine-canada into abcaregiveramount

Author: SirMalamute

policyengine_canada/variables/gov/provinces/ab/tax/credits_return/ab_caregiver_amount.py

@@ -8,15 +8,14 @@ class ab_caregiver_amount(Variable):
     unit = CAD
     definition_period = YEAR
     reference = "https://www.canada.ca/content/dam/cra-arc/formspubs/pbg/td1ab/td1ab-23e.pdf"
-    defined_for = ProvinceCode.AB
+    defined_for = "ab_caregiver_amount_eligible_person"
 
     def formula(person, period, parameters):
         p = parameters(
             period
         ).gov.provinces.ab.tax.income.credits.credits_return
 
         # Whether the person is eligible or not (income based)
-        income_eligibility = person("ab_caregiver_amount_eligible", period)
 
         net_income = max_(
             0, p.upper_dependant_income_threshold - person("ab_dependant_net_income", period)

policyengine_canada/variables/gov/provinces/ab/tax/credits_return/ab_caregiver_amount_eligible.py

@@ -1,11 +1,10 @@
 from policyengine_canada.model_api import *
 
 
-class ab_caregiver_amount_eligible(Variable):
-    value_type = float
+class ab_caregiver_amount_eligible_person(Variable):
+    value_type = bool
     entity = Person
-    label = "Alberta caregiver amount income eligibility"
-    unit = CAD
+    label = "Eligible person for the Alberta caregiver amount"
     definition_period = YEAR
     reference = "https://www.canada.ca/content/dam/cra-arc/formspubs/pbg/td1ab/td1ab-23e.pdf"
     defined_for = ProvinceCode.AB
@@ -17,8 +16,7 @@ def formula(person, period, parameters):
 
         dependant_net_income = person("ab_dependant_net_income", period) * eligible_dependant
 
-        income_eligibility = (
+        return (
             dependant_net_income <= p.upper_dependant_income_threshold
         )
 
-        return income_eligibility