diff --git a/odex25_ensan/odex_benefit/models/family_expense.py b/odex25_ensan/odex_benefit/models/family_expense.py index 25ffee136..052bfce6f 100644 --- a/odex25_ensan/odex_benefit/models/family_expense.py +++ b/odex25_ensan/odex_benefit/models/family_expense.py @@ -121,7 +121,7 @@ class ConfirmBenefitExpense(models.Model): self.ensure_one() for line in self.benefit_expense_line_ids: family = line.family_id - income, meals, clotting = 0, 0, 0 + income, meals, clotting, othaim = 0, 0, 0 if not family: continue monthly_meals = 0.0 if family.meal_card else family.family_monthly_meals @@ -130,6 +130,7 @@ class ConfirmBenefitExpense(models.Model): income = family.family_monthly_income if self.meal_expense: meals = monthly_meals + othaim = othaime if self.cloth_expense: clotting = family.family_monthly_clotting vals = { @@ -142,7 +143,7 @@ class ConfirmBenefitExpense(models.Model): 'family_monthly_income': income, 'family_monthly_meals': meals, 'family_monthly_clotting': clotting, - 'family_monthly_othaime': othaime, + 'family_monthly_othaime': othaim, } line.write(vals) diff --git a/odex25_ensan/odex_benefit/views/family_expense_view.xml b/odex25_ensan/odex_benefit/views/family_expense_view.xml index 2b13c7ff4..85f527ba1 100644 --- a/odex25_ensan/odex_benefit/views/family_expense_view.xml +++ b/odex25_ensan/odex_benefit/views/family_expense_view.xml @@ -173,68 +173,66 @@
-
-
-
-
- - Total Monthly Income - - - - -
+
+
+
+ + Total Monthly Income + + + +
+
- -
-
- - Total Monthly Meals - - - - -
+ +
+
+ + Total Monthly Meals + + + +
+
- -
-
- - Total Monthly Clothing - - - - -
+ +
+
+ + Total Monthly Clothing + + + +
+
- -
-
- - Total - - - -
+ +
+
+ + Total + + +
@@ -260,7 +258,8 @@ - +