From 7618f9d7f272fc2cc3eab2239dc8d820db9a1af7 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Sun, 14 Sep 2025 12:15:10 +0100
Subject: [PATCH] IMP benefit

---
 odex25_ensan/odex_benefit/i18n/ar_001.po      |   4 +-
 odex25_ensan/odex_benefit/models/benefit.py   |  16 +-
 .../odex_benefit/models/family_debits.py      |  14 +-
 .../odex_benefit/security/ir.model.access.csv |   4 +-
 .../odex_benefit/security/security_view.xml   | 213 ++++++++----------
 .../odex_benefit/views/benefit_view.xml       |  93 ++++----
 6 files changed, 153 insertions(+), 191 deletions(-)

diff --git a/odex25_ensan/odex_benefit/i18n/ar_001.po b/odex25_ensan/odex_benefit/i18n/ar_001.po
index 4c85b59a4..42f4bc306 100644
--- a/odex25_ensan/odex_benefit/i18n/ar_001.po
+++ b/odex25_ensan/odex_benefit/i18n/ar_001.po
@@ -15291,8 +15291,8 @@ msgstr "تم اعتماده"
 
 #. module: odex_benefit
 #: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form
-msgid "Expenses and Family Loans"
-msgstr "الديون والالتزامات"
+msgid "Expenses and Income"
+msgstr "الدخل والالتزامات"
 
 #. module: odex_benefit
 #: model:ir.model.fields,field_description:odex_benefit.field_expenses_line__deduct_from_family_income
diff --git a/odex25_ensan/odex_benefit/models/benefit.py b/odex25_ensan/odex_benefit/models/benefit.py
index 504c1d086..aa7b9a263 100644
--- a/odex25_ensan/odex_benefit/models/benefit.py
+++ b/odex25_ensan/odex_benefit/models/benefit.py
@@ -52,20 +52,6 @@ class GrantBenefitProfile(models.Model):
 
         return partners.name_get()
 
-    @api.model
-    def search(self, args, offset=0, limit=None, order=None, count=False):
-        if not self.env.user.has_group("base.public_user") and not self.env.user.has_group("base.group_portal") :
-            if not self.env.user.has_group("odex_benefit.group_benefit_show_draft_record"):
-                args += [('state', '!=', 'draft')]
-        if not self.env.user.has_group("odex_benefit.group_benefit_manager") and self.env.user and self.env.user.id:
-            if self.env.user.has_group("odex_benefit.group_benefit_branch_manager"):
-                args += [('branch_custom_id.branch.manager_id', '=', self.env.user.employee_id.id)]
-            elif self.env.user.has_group("odex_benefit.group_benefit_woman_commitee"):
-                args += [('branch_custom_id.branch.operation_manager_id', '=', self.env.user.employee_id.id)]
-            elif self.env.user and self.env.user.id and self.env.user.has_group("odex_benefit.group_benefit_researcher"):
-                args += [('researcher_id.employee_id', '=', self.env.user.employee_id.id)]
-        return super(GrantBenefitProfile, self).search(args, offset, limit, order, count)
-
     profile_step_count = fields.Integer()
     complete_registration_step = fields.Char(string="Complete Registration Step")
     complete_registration_done = fields.Boolean('Does Complete Registration Done ?')
@@ -1999,7 +1985,7 @@ class GrantBenefitProfile(models.Model):
                 'is_work': rec.is_mother_work,
                 'member_income': rec.mother_income,
                 'education_status': rec.education_status,
-                'member_education_status_ids': [(5, 0)] + [(4, replacement_education_id.id) for replacement_education_id in rec.replacement_education_status_ids],
+                'member_education_status_ids': [(5, 0)] + [(4, mother_education_id.id) for mother_education_id in rec.mother_education_status_ids],
                 'case_study': rec.case_study,
                 'education_entity': rec.education_entity,
                 'last_education_entity': rec.last_education_entity,
diff --git a/odex25_ensan/odex_benefit/models/family_debits.py b/odex25_ensan/odex_benefit/models/family_debits.py
index fa6d4686a..7cdaaf0ea 100644
--- a/odex25_ensan/odex_benefit/models/family_debits.py
+++ b/odex25_ensan/odex_benefit/models/family_debits.py
@@ -36,11 +36,11 @@ class FamilyDebits(models.Model):
         for rec in self:
             rec.loan_remaining = rec.loan_amount - rec.loan_total_paid
 
-    # @api.depends('loan_amount','number_of_installments')
-    # def get_monthly_installment(self):
-    #     for rec in self:
-    #         if rec.loan_amount and rec.number_of_installments > 0 :
-    #             rec.monthly_installment = rec.loan_amount / rec.number_of_installments
-    #         else:
-    #             rec.monthly_installment = 0
+    @api.onchange('loan_amount','number_of_installments')
+    def get_monthly_installment(self):
+        for rec in self:
+            if rec.loan_amount and rec.number_of_installments > 0 :
+                rec.monthly_installment = rec.loan_amount / rec.number_of_installments
+            else:
+                rec.monthly_installment = 0
 
diff --git a/odex25_ensan/odex_benefit/security/ir.model.access.csv b/odex25_ensan/odex_benefit/security/ir.model.access.csv
index b7cc2ef74..52ac8de10 100644
--- a/odex25_ensan/odex_benefit/security/ir.model.access.csv
+++ b/odex25_ensan/odex_benefit/security/ir.model.access.csv
@@ -160,4 +160,6 @@ access_grant_benefit_portal_user,access_grant_benefit_portal_user,model_grant_be
 access_visit_location_otp_wizard,access_visit_location_otp_wizard,model_visit_location_otp_wizard,,1,1,1,1
 access_visit_skip_otp_wizard,access_visit_skip_otp_wizard,model_visit_skip_otp_wizard,,1,1,1,1
 access_benefit_vehicle_model,access_benefit_vehicle_model,model_benefit_vehicle_model,,1,1,1,1
-access_visit_location_refusal_reason_wizard,access_visit_location_refusal_reason_wizard,model_visit_location_refusal_reason_wizard,,1,1,1,1
\ No newline at end of file
+access_visit_location_refusal_reason_wizard,access_visit_location_refusal_reason_wizard,model_visit_location_refusal_reason_wizard,,1,1,1,1
+access_survey_user_input_group_benefit_info,survey.user_input.group_benefit_info,survey.model_survey_user_input,odex_benefit.group_benefit_info,1,0,0,0
+access_survey_user_input_line_group_benefit_info,survey.user_input.line.group_benefit_info,survey.model_survey_user_input_line,odex_benefit.group_benefit_info,1,0,0,0
\ No newline at end of file
diff --git a/odex25_ensan/odex_benefit/security/security_view.xml b/odex25_ensan/odex_benefit/security/security_view.xml
index a2b128094..29341a540 100644
--- a/odex25_ensan/odex_benefit/security/security_view.xml
+++ b/odex25_ensan/odex_benefit/security/security_view.xml
@@ -1,5 +1,5 @@
 <odoo>
-    <data>
+    <data noupdate="0">
         <record model="ir.module.category" id="module_category_benefit">
             <field name="name">Beneficiaries Management</field>
             <field name="description">Helps you manage Beneficiaries Program</field>
@@ -113,116 +113,112 @@
             <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
 
-<!--        &lt;!&ndash; Add rules for grant.benefit &ndash;&gt;-->
-<!--        <record id="grant_benefit_show_all_rule" model="ir.rule">-->
-<!--            <field name="name">Show All Benefits Profiles</field>-->
-<!--            <field name="model_id" ref="model_grant_benefit"/>-->
-<!--            <field name="domain_force">[(1, '=', 1)]</field>-->
-<!--            <field name="groups" eval="[(4, ref('group_benefit_manager'))]"/>-->
-<!--            <field name="active" eval="True" />-->
-<!--        </record>-->
+        <!-- Add rules for grant.benefit -->
+        <record id="grant_benefit_show_all_rule" model="ir.rule">
+            <field name="name">Show All Benefits Profiles</field>
+            <field name="model_id" ref="model_grant_benefit"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+            <field name="groups" eval="[(4, ref('group_benefit_manager'))]"/>
+            <field name="active" eval="True" />
+        </record>
 
-<!--        <record id="grant_benefit_rule_branch_manager" model="ir.rule">-->
-<!--            <field name="name">Show Benefits Profiles of Own Branch</field>-->
-<!--            <field name="model_id" ref="model_grant_benefit"/>-->
-<!--            <field name="domain_force">[('branch_custom_id.branch.manager_id', '=', user.employee_id.id)]</field>-->
-<!--            <field name="groups" eval="[(4, ref('group_benefit_branch_manager'))]"/>-->
-<!--            <field name="active" eval="True" />-->
-<!--        </record>-->
+        <record id="grant_benefit_rule_branch_manager" model="ir.rule">
+            <field name="name">Show Benefits Profiles of Own Branch</field>
+            <field name="model_id" ref="model_grant_benefit"/>
+            <field name="domain_force">[('branch_custom_id.branch.manager_id', '=', user.employee_id.id)]</field>
+            <field name="groups" eval="[(4, ref('group_benefit_branch_manager'))]"/>
+            <field name="active" eval="True" />
+        </record>
 
-<!--        <record id="grant_benefit_rule_operation_manager" model="ir.rule">-->
-<!--            <field name="name">Show Benefits Profiles of Assigned Branch (Operation Manager)</field>-->
-<!--            <field name="model_id" ref="model_grant_benefit"/>-->
-<!--            <field name="domain_force">['|',('branch_custom_id.branch.operation_manager_id', '=', user.employee_id.id),('state', '=','new')]</field>-->
-<!--            <field name="groups" eval="[(4, ref('group_benefit_woman_commitee'))]"/>-->
-<!--            <field name="active" eval="True" />-->
-<!--        </record>-->
+        <record id="grant_benefit_rule_operation_manager" model="ir.rule">
+            <field name="name">Show Benefits Profiles of Assigned Branch (Operation Manager)</field>
+            <field name="model_id" ref="model_grant_benefit"/>
+            <field name="domain_force">[('branch_custom_id.branch.operation_manager_id', '=', user.employee_id.id)]</field>
+            <field name="groups" eval="[(4, ref('group_benefit_woman_commitee'))]"/>
+            <field name="active" eval="True" />
+        </record>
 
-<!--        <record id="grant_benefit_rule_researcher" model="ir.rule">-->
-<!--            <field name="name">Show Benefits Profiles Created or Assigned (Researcher)</field>-->
-<!--            <field name="model_id" ref="model_grant_benefit"/>-->
-<!--            <field name="domain_force">[-->
-<!--                '|',-->
-<!--                    ('create_uid','=',user.id),-->
-<!--                    ('researcher_id.employee_id', 'in', user.employee_id.ids)-->
-<!--            ]</field>-->
-<!--            <field name="groups" eval="[(4, ref('group_benefit_researcher'))]"/>-->
-<!--            <field name="active" eval="True" />-->
-<!--        </record>-->
+        <record id="grant_benefit_rule_researcher" model="ir.rule">
+            <field name="name">Show Benefits Profiles Created or Assigned (Researcher)</field>
+            <field name="model_id" ref="model_grant_benefit"/>
+            <field name="domain_force">['|', ('create_uid','=',user.id),('researcher_id.employee_id', 'in', user.employee_id.ids)]</field>
+            <field name="groups" eval="[(4, ref('group_benefit_researcher'))]"/>
+            <field name="active" eval="True" />
+        </record>
 
-<!--         &lt;!&ndash; Add rules for visit.location &ndash;&gt;-->
-<!--        <record id="visit_location_show_all_rule" model="ir.rule">-->
-<!--            <field name="name">Show All Visit Location</field>-->
-<!--            <field name="model_id" ref="model_visit_location"/>-->
-<!--            <field name="domain_force">[(1, '=', 1)]</field>-->
-<!--            <field name="groups" eval="[(4, ref('group_benefit_manager'))]"/>-->
-<!--            <field name="active" eval="True" />-->
-<!--        </record>-->
+         <!-- Add rules for visit.location -->
+        <record id="visit_location_show_all_rule" model="ir.rule">
+            <field name="name">Show All Visit Location</field>
+            <field name="model_id" ref="model_visit_location"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+            <field name="groups" eval="[(4, ref('group_benefit_manager'))]"/>
+            <field name="active" eval="True" />
+        </record>
 
-<!--        <record id="visit_location_rule_branch_manager" model="ir.rule">-->
-<!--            <field name="name">Show Visit Location of Own Branch</field>-->
-<!--            <field name="model_id" ref="model_visit_location"/>-->
-<!--            <field name="domain_force">[('benefit_id.branch_custom_id.branch.manager_id', '=', user.employee_id.id)]</field>-->
-<!--            <field name="groups" eval="[(4, ref('group_benefit_branch_manager'))]"/>-->
-<!--            <field name="active" eval="True" />-->
-<!--        </record>-->
+        <record id="visit_location_rule_branch_manager" model="ir.rule">
+            <field name="name">Show Visit Location of Own Branch</field>
+            <field name="model_id" ref="model_visit_location"/>
+            <field name="domain_force">[('benefit_id.branch_custom_id.branch.manager_id', '=', user.employee_id.id)]</field>
+            <field name="groups" eval="[(4, ref('group_benefit_branch_manager'))]"/>
+            <field name="active" eval="True" />
+        </record>
 
-<!--        <record id="visit_location_rule_operation_manager" model="ir.rule">-->
-<!--            <field name="name">Show Visit Location of Assigned Branch (Operation Manager)</field>-->
-<!--            <field name="model_id" ref="model_visit_location"/>-->
-<!--            <field name="domain_force">[('benefit_id.branch_custom_id.branch.operation_manager_id', '=', user.employee_id.id)]</field>-->
-<!--            <field name="groups" eval="[(4, ref('group_benefit_woman_commitee'))]"/>-->
-<!--            <field name="active" eval="True" />-->
-<!--        </record>-->
+        <record id="visit_location_rule_operation_manager" model="ir.rule">
+            <field name="name">Show Visit Location of Assigned Branch (Operation Manager)</field>
+            <field name="model_id" ref="model_visit_location"/>
+            <field name="domain_force">[('benefit_id.branch_custom_id.branch.operation_manager_id', '=', user.employee_id.id)]</field>
+            <field name="groups" eval="[(4, ref('group_benefit_woman_commitee'))]"/>
+            <field name="active" eval="True" />
+        </record>
 
-<!--        <record id="visit_location_rule_researcher" model="ir.rule">-->
-<!--            <field name="name">Show Visit Location Created or Assigned (Researcher)</field>-->
-<!--            <field name="model_id" ref="model_visit_location"/>-->
-<!--            <field name="domain_force">[-->
-<!--                '|',-->
-<!--                    ('create_uid','=',user.id),-->
-<!--                    ('researcher_team.employee_id', 'in', user.employee_id.ids)-->
-<!--            ]</field>-->
-<!--            <field name="groups" eval="[(4, ref('group_benefit_researcher'))]"/>-->
-<!--            <field name="active" eval="True" />-->
-<!--        </record>-->
+        <record id="visit_location_rule_researcher" model="ir.rule">
+            <field name="name">Show Visit Location Created or Assigned (Researcher)</field>
+            <field name="model_id" ref="model_visit_location"/>
+            <field name="domain_force">[
+                '|',
+                    ('create_uid','=',user.id),
+                    ('researcher_team.employee_id', 'in', user.employee_id.ids)
+            ]</field>
+            <field name="groups" eval="[(4, ref('group_benefit_researcher'))]"/>
+            <field name="active" eval="True" />
+        </record>
 
-<!--        &lt;!&ndash; Add rules for family.complaints &ndash;&gt;-->
-<!--        <record id="family_complaints_show_all_rule" model="ir.rule">-->
-<!--            <field name="name">Show All Family Complaints</field>-->
-<!--            <field name="model_id" ref="model_family_complaints"/>-->
-<!--            <field name="domain_force">[(1, '=', 1)]</field>-->
-<!--            <field name="groups" eval="[(4, ref('group_benefit_manager'))]"/>-->
-<!--            <field name="active" eval="True" />-->
-<!--        </record>-->
+        <!-- Add rules for family.complaints -->
+        <record id="family_complaints_show_all_rule" model="ir.rule">
+            <field name="name">Show All Family Complaints</field>
+            <field name="model_id" ref="model_family_complaints"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+            <field name="groups" eval="[(4, ref('group_benefit_manager'))]"/>
+            <field name="active" eval="True" />
+        </record>
 
-<!--        <record id="family_complaints_rule_branch_manager" model="ir.rule">-->
-<!--            <field name="name">Show Family Complaints of Own Branch</field>-->
-<!--            <field name="model_id" ref="model_family_complaints"/>-->
-<!--            <field name="domain_force">[('branch_custom_id.branch.manager_id', '=', user.employee_id.id)]</field>-->
-<!--            <field name="groups" eval="[(4, ref('group_benefit_branch_manager'))]"/>-->
-<!--            <field name="active" eval="True" />-->
-<!--        </record>-->
+        <record id="family_complaints_rule_branch_manager" model="ir.rule">
+            <field name="name">Show Family Complaints of Own Branch</field>
+            <field name="model_id" ref="model_family_complaints"/>
+            <field name="domain_force">[('branch_custom_id.branch.manager_id', '=', user.employee_id.id)]</field>
+            <field name="groups" eval="[(4, ref('group_benefit_branch_manager'))]"/>
+            <field name="active" eval="True" />
+        </record>
 
-<!--        <record id="family_complaints_rule_operation_manager" model="ir.rule">-->
-<!--            <field name="name">Show Family Complaints of Assigned Branch (Operation Manager)</field>-->
-<!--            <field name="model_id" ref="model_family_complaints"/>-->
-<!--            <field name="domain_force">[('branch_custom_id.branch.operation_manager_id', '=', user.employee_id.id)]</field>-->
-<!--            <field name="groups" eval="[(4, ref('group_benefit_woman_commitee'))]"/>-->
-<!--            <field name="active" eval="True" />-->
-<!--        </record>-->
+        <record id="family_complaints_rule_operation_manager" model="ir.rule">
+            <field name="name">Show Family Complaints of Assigned Branch (Operation Manager)</field>
+            <field name="model_id" ref="model_family_complaints"/>
+            <field name="domain_force">[('branch_custom_id.branch.operation_manager_id', '=', user.employee_id.id)]</field>
+            <field name="groups" eval="[(4, ref('group_benefit_woman_commitee'))]"/>
+            <field name="active" eval="True" />
+        </record>
 
-<!--        <record id="family_complaints_rule_researcher" model="ir.rule">-->
-<!--            <field name="name">Show Family Complaints Created or Assigned (Researcher)</field>-->
-<!--            <field name="model_id" ref="model_family_complaints"/>-->
-<!--            <field name="domain_force">[-->
-<!--                '|',-->
-<!--                    ('create_uid','=',user.id),-->
-<!--                    ('researcher_id.employee_id', 'in', user.employee_id.ids)-->
-<!--            ]</field>-->
-<!--            <field name="groups" eval="[(4, ref('group_benefit_researcher'))]"/>-->
-<!--            <field name="active" eval="True" />-->
-<!--        </record>-->
+        <record id="family_complaints_rule_researcher" model="ir.rule">
+            <field name="name">Show Family Complaints Created or Assigned (Researcher)</field>
+            <field name="model_id" ref="model_family_complaints"/>
+            <field name="domain_force">[
+                '|',
+                    ('create_uid','=',user.id),
+                    ('researcher_id.employee_id', 'in', user.employee_id.ids)
+            ]</field>
+            <field name="groups" eval="[(4, ref('group_benefit_researcher'))]"/>
+            <field name="active" eval="True" />
+        </record>
 
         <!-- Add rules for service.request -->
         <record id="service_request_restrict_all_requests_by_rule" model="ir.rule">
@@ -256,22 +252,5 @@
             <field name="groups" eval="[(4, ref('group_benefit_branch_manager')), (4, ref('group_benefit_woman_commitee'))]"/>
             <field name="active" eval="True" />
         </record>
-
-<!--        &lt;!&ndash; Add rules for  grant benefit draft state&ndash;&gt;-->
-<!--        <record id="grant_benefit_no_draft_rule" model="ir.rule">-->
-<!--            <field name="name">Hide Draft Benefits</field>-->
-<!--            <field name="model_id" ref="model_grant_benefit"/>-->
-<!--            <field name="domain_force">[('state', '!=', 'draft')]</field>-->
-<!--            <field name="global" eval="True"/>-->
-<!--            <field name="active" eval="True"/>-->
-<!--        </record>-->
-
-<!--        <record id="grant_benefit_show_draft_rule" model="ir.rule">-->
-<!--            <field name="name">Show Draft Benefits (Special Group)</field>-->
-<!--            <field name="model_id" ref="model_grant_benefit"/>-->
-<!--            <field name="domain_force">[(1, '=', 1)]</field>-->
-<!--            <field name="groups" eval="[(4, ref('odex_benefit.group_benefit_show_draft_record')),(4, ref('base.public_user')),(4, ref('base.group_portal'))]"/>-->
-<!--            <field name="active" eval="True"/>-->
-<!--        </record>-->
     </data>
 </odoo>
diff --git a/odex25_ensan/odex_benefit/views/benefit_view.xml b/odex25_ensan/odex_benefit/views/benefit_view.xml
index ab23f7d45..f783ba3a4 100644
--- a/odex25_ensan/odex_benefit/views/benefit_view.xml
+++ b/odex25_ensan/odex_benefit/views/benefit_view.xml
@@ -213,10 +213,10 @@
                         <field name="state" widget="statusbar"
                                statusbar_visible="draft,new,complete_info,waiting_approve,first_approve,second_approve"/>
                     </header>
-<!--                    <div class="alert alert-danger" role="alert" style="margin-bottom:0px;"-->
-<!--                         attrs="{'invisible':['|',('status', 'not in', ('close')),('close_reason', '=', False)]}">-->
-<!--                        <field name="close_reason" attrs="{'readonly': True}"/>-->
-<!--                    </div>-->
+                    <!--                    <div class="alert alert-danger" role="alert" style="margin-bottom:0px;"-->
+                    <!--                         attrs="{'invisible':['|',('status', 'not in', ('close')),('close_reason', '=', False)]}">-->
+                    <!--                        <field name="close_reason" attrs="{'readonly': True}"/>-->
+                    <!--                    </div>-->
                     <sheet>
                         <div class="oe_button_box" name="button_box"
                              attrs="{'invisible':[('state','in',['draft','new'])]}">
@@ -230,13 +230,6 @@
                             <button icon="fa-users">
                                 <field string="Non Benfit Members Count" name="non_member_count" widget="statinfo"/>
                             </button>
-                            <button icon="fa-usd">
-                                <field name="total_expenses" string="Total Expenses" widget="statinfo"/>
-                            </button>
-
-                            <button icon="fa-usd">
-                                <field name="total_income" string="Total Income" widget="statinfo"/>
-                            </button>
                             <button icon="fa-usd" name="action_open_related_move_line_records" type="object">
                                 <field name="total_move_lines" string="Move Lines" widget="statinfo"/>
                             </button>
@@ -314,9 +307,6 @@
                                        groups="!odex_benefit.group_benefit_manager"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                                 <field name="currency_id" groups="base.group_multi_currency"/>
-                                <field name="member_income" widget="monetary"
-                                       options="{'currency_field': 'currency_id'}" readonly="1" force_save="1"/>
-                                <field name="benefit_category_id" readonly="1" force_save="1"/>
                                 <field name="mother_family_member_id" invisible="1" readonly="1"/>
                                 <field name="replacement_mother_family_member_id" invisible="1" readonly="1"/>
                                 <field string="Expenses" name="expenses_total" invisible="1"/>
@@ -867,7 +857,7 @@
                                                             <button name="action_preview_attachment"
                                                                     type="object" icon="fa-search-plus"
                                                                     attrs="{'invisible': [('file_size', '=', 0)]}"/>
-<!--                                                            <field name="attach_status"/>-->
+                                                            <!--                                                            <field name="attach_status"/>-->
                                                             <field name="member_id" invisible="1"/>
                                                             <field name="file_size" invisible="1"/>
                                                         </tree>
@@ -1091,7 +1081,32 @@
                                     </sheet>
                                 </form>
                             </page>
-                            <page string="Expenses and Family Loans">
+                            <page string="Expenses and Income">
+                                <separator string="Income and salary"/>
+                                <field name="salary_ids" context="{'default_state': 'accepted'}" mode="tree"
+                                       options="{'no_open': True}"
+                                       attrs="{'readonly':[('state','not in',['draft','new','complete_info'])]}">
+                                    <tree editable="bottom" delete="0">
+                                        <field name="benefit_id" invisible="1"/>
+                                        <field name="income_type"
+                                               options="{'no_create': True, 'no_create_edit': True,'no_quick_create': True, 'no_open': True}"/>
+                                        <field name="is_mother_salary" invisible="1"/>
+                                        <field name="salary_amount" widget="monetary"
+                                               options="{'currency_field': 'currency_id'}" sum="Total Income"/>
+                                        <field name="currency_id" invisible="1"/>
+                                        <field name="salary_attach" widget="many2many_attachment_preview"/>
+                                        <field name="attach_start_date"/>
+                                        <field name="attach_end_date"/>
+                                        <field name="is_required" invisible="1"/>
+                                        <field name="is_default" invisible="1"/>
+                                        <field name="state" invisible="1"/>
+                                        <field name="approved" widget="boolean_toggle"/>
+                                    </tree>
+                                </field>
+                                <group>
+                                    <field name="income_required_attach" invisible="1"/>
+                                </group>
+
                                 <separator string="Expenses"/>
                                 <field name="expenses_ids" context="{'default_state': 'accepted'}"
                                        attrs="{'readonly':[('state','not in',['draft','new','complete_info'])]}">
@@ -1100,10 +1115,10 @@
                                         <field name="expenses_type" invisible="1"/>
                                         <field name="expenses_type_custom"
                                                options="{'no_create': True, 'no_create_edit': True,'no_quick_create': True, 'no_open': True}"/>
-                                        <field name="expense_attachments" widget="many2many_attachment_preview"/>
-                                        <field name="note"/>
                                         <field name="amount" widget="monetary"
                                                options="{'currency_field': 'currency_id'}" sum="amount"/>
+                                        <field name="expense_attachments" widget="many2many_attachment_preview"/>
+                                        <field name="note"/>
                                         <field name="currency_id" invisible="1"/>
                                         <field name="state" invisible="1"/>
                                         <field name="deduct_from_family_income" widget="boolean_toggle"/>
@@ -1154,46 +1169,26 @@
                                                options="{'currency_field': 'currency_id'}" sum="Total"/>
                                         <field name="currency_id" invisible="1"/>
                                         <field name="state" invisible="1"/>
+                                        <field name="loan_attach" widget="binary"/>
                                         <field name="deduct_from_family_income" widget="boolean_toggle"/>
                                     </tree>
                                 </field>
 
                                 <group class="oe_subtotal_footer oe_right">
+                                    <label for="total_income"/>
+                                    <field name="total_income" widget="monetary" nolabel="1"
+                                           options="{'currency_field': 'currency_id'}"/>
+                                    <label for="total_expenses"/>
+                                    <field name="total_expenses" nolabel="1" widget="monetary"
+                                           options="{'currency_field': 'currency_id'}"/>
                                     <label for="estimated_rent_amount"
                                            attrs="{'invisible':[('property_type','!=','rent'),('property_type','!=','rent_shared')]}"/>
                                     <field name="estimated_rent_amount" nolabel="1" widget="monetary"
                                            options="{'currency_field': 'currency_id'}" readonly="1" force_save="1"
                                            attrs="{'invisible':[('property_type','!=','rent'),('property_type','!=','rent_shared')]}"/>
-                                    <label for="total_expenses"/>
-                                    <field name="total_expenses" nolabel="1" widget="monetary"
-                                           options="{'currency_field': 'currency_id'}"/>
-                                </group>
-                            </page>
-                            <page string="Income and salary">
-                                <field name="salary_ids" context="{'default_state': 'accepted'}" mode="tree"
-                                       options="{'no_open': True}"
-                                       attrs="{'readonly':[('state','not in',['draft','new','complete_info'])]}">
-                                    <tree editable="bottom" delete="0">
-                                        <field name="benefit_id" invisible="1"/>
-                                        <field name="income_type"
-                                               options="{'no_create': True, 'no_create_edit': True,'no_quick_create': True, 'no_open': True}"/>
-                                        <field name="is_mother_salary" invisible="1"/>
-                                        <field name="salary_amount" widget="monetary"
-                                               options="{'currency_field': 'currency_id'}" sum="Total Income"/>
-                                        <field name="currency_id" invisible="1"/>
-                                        <field name="salary_attach" widget="many2many_attachment_preview"/>
-                                        <field name="attach_start_date"/>
-                                        <field name="attach_end_date"/>
-                                        <field name="is_required" invisible="1"/>
-                                        <field name="is_default" invisible="1"/>
-                                        <field name="state" invisible="1"/>
-                                        <field name="approved" widget="boolean_toggle"/>
-                                    </tree>
-                                </field>
-                                <field name="total_income" widget="monetary"
-                                       options="{'currency_field': 'currency_id'}" invisible="0"/>
-                                <group>
-                                    <field name="income_required_attach" invisible="1"/>
+                                    <field name="member_income" widget="monetary"
+                                           options="{'currency_field': 'currency_id'}" readonly="1" force_save="1"/>
+                                    <field name="benefit_category_id" readonly="1" force_save="1"/>
                                 </group>
                             </page>
                             <!--                            <page string="Craft Skills" attrs="{'invisible': [('is_craft', '=', False)]}">-->
@@ -1613,7 +1608,7 @@
             <field name="arch" type="xml">
                 <tree string=" Benefit" create="0">
                     <field name="code" decoration-bf="1"/>
-                    <field name="name"/>
+                    <field name="name" force_save="1"/>
                     <field name="benefit_category_id"/>
                     <field name="create_date" optional="hide"/>
                     <field name="meal_card" optional="hide"/>