From e5ff39cfc891296c4dee597dcfe808c8fb26c867 Mon Sep 17 00:00:00 2001 From: younes Date: Thu, 25 Dec 2025 12:09:32 +0100 Subject: [PATCH] [IMP] odex_benefit: IMP benefit --- odex25_benefit/odex_benefit/i18n/ar_001.po | 27 ++++----------- odex25_benefit/odex_benefit/models/benefit.py | 10 +++--- .../odex_benefit/models/benefit_config.py | 7 ++-- .../odex_benefit/models/family_members.py | 5 +++ .../odex_benefit/security/ir.model.access.csv | 1 - .../odex_benefit/security/security_view.xml | 34 +------------------ .../odex_benefit/views/actions_and_menus.xml | 11 ++---- .../views/benefit_config_view.xml | 8 +++-- .../odex_benefit/views/benefit_view.xml | 5 ++- .../odex_benefit/views/committees_view.xml | 1 + .../odex_benefit/views/family_members.xml | 12 +++++-- .../views/seasonal_service_view.xml | 2 -- .../odex_benefit/views/service_request.xml | 11 +++--- .../security/ir.model.access.csv | 1 - 14 files changed, 47 insertions(+), 88 deletions(-) diff --git a/odex25_benefit/odex_benefit/i18n/ar_001.po b/odex25_benefit/odex_benefit/i18n/ar_001.po index 06eb1f874..47b37031e 100644 --- a/odex25_benefit/odex_benefit/i18n/ar_001.po +++ b/odex25_benefit/odex_benefit/i18n/ar_001.po @@ -1016,11 +1016,6 @@ msgstr "مرفق التسجيل الأكاديمي" msgid "Accept" msgstr "قبول" -#. module: odex_benefit -#: model:res.groups,name:odex_benefit.group_accept_income_and_expenses -msgid "Accept income and expenses" -msgstr "الموافقة على الدخل والمصاريف" - #. module: odex_benefit #: model:ir.model.fields.selection,name:odex_benefit.selection__expenses_line__state__accepted #: model:ir.model.fields.selection,name:odex_benefit.selection__family_debits__state__accepted @@ -1754,7 +1749,6 @@ msgstr "" #. module: odex_benefit #: model_terms:ir.ui.view,arch_db:odex_benefit.family_member_form -#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form msgid "Attachment Name" msgstr "اسم المرفق" @@ -1940,7 +1934,6 @@ msgid "Bank" msgstr "بنك" #. module: odex_benefit -#: model:res.groups,name:odex_benefit.group_benefit_bank_info #: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form msgid "Bank Account Information" msgstr "معلومات الحساب البنكي" @@ -2005,11 +1998,6 @@ msgstr "ملفات في القائمة السوداء" msgid "Beneficiaries Category" msgstr "فئات الأسر" -#. module: odex_benefit -#: model:res.groups,name:odex_benefit.group_benefit_edit -msgid "Beneficiaries Edit User" -msgstr "تعديل المستفيدين" - #. module: odex_benefit #: model:res.groups,name:odex_benefit.group_benefit_info msgid "Beneficiaries Inforamtion" @@ -8423,7 +8411,6 @@ msgstr "نهاية الوقت المعين للنشاط" #: model:ir.model.fields,field_description:odex_benefit.field_education_exam_type__name #: model_terms:ir.ui.view,arch_db:odex_benefit.view_property_type_settings_form #: model:ir.model.fields,field_description:odex_benefit.field_education_period__name -#: model_terms:ir.ui.view,arch_db:odex_benefit.view_rent_contract_form msgid "Name" msgstr "الاسم" @@ -9836,11 +9823,15 @@ msgstr "إيجار" #. module: odex_benefit #: model:ir.model.fields,field_description:odex_benefit.field_benefit_housing__rent_amount #: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__rent_amount -#: model:ir.model.fields,field_description:odex_benefit.field_rent_contract__rent_amount #: model:ir.model.fields,field_description:odex_benefit.field_service_request__rent_amount msgid "Rent Amount" msgstr "قيمة الإيجار" +#. module: odex_benefit +#: model:ir.model.fields,field_description:odex_benefit.field_rent_contract__rent_amount +msgid "Rent Amount" +msgstr "قيمة الإيجار الشهري" + #. module: odex_benefit #: model:ir.model.fields,field_description:odex_benefit.field_services_settings__rent_amount_for_alternative_housing msgid "Rent Amount For Alternative Housing" @@ -10996,7 +10987,6 @@ msgstr "" #. module: odex_benefit #: model:ir.actions.act_window,name:odex_benefit.survey_setting_action -#: model:ir.ui.menu,name:odex_benefit.menu_survey_setting msgid "Survey Setting" msgstr "إعدادات الاستبيان" @@ -14212,11 +14202,6 @@ msgstr "سبب إعادة الطلب" msgid "Reason For Return Wizard" msgstr "سبب إعادة الطلب" -#. module: odex_benefit -#: model:res.groups,name:odex_benefit.group_approval_of_beneficiary_services -msgid "Approval Of Beneficiary Services" -msgstr "اعتماد خدمات المستفيدين" - #. module: odex_benefit #: model:ir.model.fields,field_description:odex_benefit.field_service_request__exception_or_steal_attach msgid "Exception or steal Attachment" @@ -17997,7 +17982,7 @@ msgstr "عدد الأيام التي يظل فيها الفرد مؤهلاً ل #: model:ir.model.fields.selection,name:odex_benefit.selection__attachments_settings__attach_type__expense_attach #, python-format msgid "Expense Attach" -msgstr "مرفق المصروفات" +msgstr "مرفق الالتزام" #. module: odex_benefit #: code:addons/odex_benefit/models/service_request.py:0 diff --git a/odex25_benefit/odex_benefit/models/benefit.py b/odex25_benefit/odex_benefit/models/benefit.py index d8172dc9d..c245ea4bc 100644 --- a/odex25_benefit/odex_benefit/models/benefit.py +++ b/odex25_benefit/odex_benefit/models/benefit.py @@ -825,7 +825,7 @@ class GrantBenefitProfile(models.Model): else: estimated_rent_amount = self.env['rent.lines'].search( [('benefit_count', '=', rec.benefit_member_count)], order="estimated_rent_governorate desc",limit=1).estimated_rent_governorate - rec.estimated_rent_amount = min(estimated_rent_amount, rec.rent_amount) / 12.0 + rec.estimated_rent_amount = min(estimated_rent_amount / 12.0, rec.rent_amount) def assign_sequence_to_all(self): sequence = self.env['ir.sequence'].search([('code', '=', 'benefit.sequence')], limit=1) @@ -1736,9 +1736,9 @@ class GrantBenefitProfile(models.Model): user.write({'active': True}) else: user = self.create_user() - group_e = self.env.ref('odex_benefit.group_benefit_edit', False) + #group_e = self.env.ref('odex_benefit.group_benefit_edit', False) try: - group_e.sudo().write({'users': [(4, user.id)]}) + #group_e.sudo().write({'users': [(4, user.id)]}) self.old_stage = self.state template = self.env.ref('odex_benefit.edit_benefit_email', False) except: @@ -2366,8 +2366,8 @@ class GrantBenefitProfile(models.Model): def action_finish_edit(self): for rec in self: - group_e = self.env.ref('odex_benefit.group_benefit_edit', False) - group_e.write({'users': [(3, self.user_id.id)]}) + #group_e = self.env.ref('odex_benefit.group_benefit_edit', False) + #group_e.write({'users': [(3, self.user_id.id)]}) rec.state = rec.old_stage # @api.multi diff --git a/odex25_benefit/odex_benefit/models/benefit_config.py b/odex25_benefit/odex_benefit/models/benefit_config.py index 6c3127092..b8d022b9f 100644 --- a/odex25_benefit/odex_benefit/models/benefit_config.py +++ b/odex25_benefit/odex_benefit/models/benefit_config.py @@ -478,7 +478,7 @@ class ExpensesLine(models.Model): currency_id = fields.Many2one('res.currency', related='benefit_id.currency_id') #expenses_type_custom = fields.Many2one('expenses.type') expenses_type_custom = fields.Many2one('attachments.settings', string='Expenses Type Custom', - domain="[('attach_type','=','expenses_attach')]") + domain="[('attach_type','=','expense_attach')]") expenses_type = fields.Selection( string='', selection=[('governmental', 'Governmental Expenses'), @@ -640,7 +640,7 @@ class Committees(models.Model): _inherit = ['mail.thread', 'mail.activity.mixin'] name = fields.Char() - employee_id = fields.Many2many('hr.employee') + employee_id = fields.Many2many('hr.employee',domain="[('branch_name','=',branch_id)]", string="Employee") type = fields.Selection( string='', selection=[('male', 'Men'), @@ -649,6 +649,7 @@ class Committees(models.Model): ], required=False, ) branch_custom_id = fields.Many2one("branch.settings", string="Branch") + branch_id = fields.Many2one('hr.department',string='Branch',related='branch_custom_id.branch',store=True) active = fields.Boolean('Active', default=True) benefit_count = fields.Integer(compute="get_benefit_count") mobile = fields.Char(string="Mobile Number") @@ -765,6 +766,8 @@ class BranchSettings(models.Model): name = fields.Char(related='branch.name') branch = fields.Many2one('hr.department',string='Branch',domain =[('is_branch', '=', True)]) + manager_id = fields.Many2one('hr.employee', related='branch.manager_id') + operation_manager_id = fields.Many2one('hr.employee', related='branch.operation_manager_id') branch_type = fields.Selection( selection=[ ('branches', 'Branches'), diff --git a/odex25_benefit/odex_benefit/models/family_members.py b/odex25_benefit/odex_benefit/models/family_members.py index 4f964614d..0ebbcbd15 100644 --- a/odex25_benefit/odex_benefit/models/family_members.py +++ b/odex25_benefit/odex_benefit/models/family_members.py @@ -281,6 +281,7 @@ class FamilyMemberProfile(models.Model): resume_reason_id = fields.Many2one('suspend.reason', string='Return Reason') resume_date = fields.Date(string="Return Date") resume_notes = fields.Text(string="Return Notes") + exit_benefit_date = fields.Date(string="Exit Benefit Date") # def create(self, vals): # for line_vals in vals: @@ -689,6 +690,10 @@ class FamilyMemberProfile(models.Model): if rec.member_status == 'non_benefit': reasons = [str(r) for r in reasons if r] rec.non_benefit_reason = "\n".join(reasons) + if not rec.exit_benefit_date: + rec.exit_benefit_date = fields.Date.today() + elif rec.member_status == 'benefit': + rec.exit_benefit_date = False # @api.depends('relationn','birth_date', 'is_scientific_specialty', 'is_medical_specialty', 'has_disabilities', 'is_married', # 'minor_siblings','member_income','is_married','member_location_conf','education_status','case_study','state','is_dead') diff --git a/odex25_benefit/odex_benefit/security/ir.model.access.csv b/odex25_benefit/odex_benefit/security/ir.model.access.csv index 8628c1164..f4771e11d 100644 --- a/odex25_benefit/odex_benefit/security/ir.model.access.csv +++ b/odex25_benefit/odex_benefit/security/ir.model.access.csv @@ -3,7 +3,6 @@ access_benefit_researcher_record,access_benefit_researcher_record,model_grant_be access_benefit_woman_commitee_record,access_benefit_record,model_grant_benefit,odex_benefit.group_benefit_woman_commitee,1,1,1,1 access_benefit_branch_manager_record,access_benefit_branch_manager_record,model_grant_benefit,odex_benefit.group_benefit_branch_manager,1,1,1,1 access_benefit_manager_record,access_benefit_manager_record,model_grant_benefit,odex_benefit.group_benefit_manager,1,1,1,1 -access_benefit_edit_record,access_benefit_edit_record,model_grant_benefit,odex_benefit.group_benefit_edit,1,1,1,1 access_education_status_all,education_status,model_education_status,odex_benefit.group_benefit_info,1,1,1,1 access_education_status_all_users,education_status_all_users,model_education_status,,1,0,0,0 access_weak_course_all,weak_course,model_weak_course,odex_benefit.group_benefit_info,1,1,1,1 diff --git a/odex25_benefit/odex_benefit/security/security_view.xml b/odex25_benefit/odex_benefit/security/security_view.xml index 14dda0ae2..c15f02b0f 100644 --- a/odex25_benefit/odex_benefit/security/security_view.xml +++ b/odex25_benefit/odex_benefit/security/security_view.xml @@ -40,13 +40,6 @@ - - - Beneficiaries Edit User - - - - @@ -60,12 +53,6 @@ the user will be able to approve Beneficiaries requests. - - Approval Of Beneficiary Services - - - the user will be able to approve Beneficiaries Services. - Beneficiaries Researcher @@ -93,21 +80,6 @@ - - Requests Manager - - - - - Accounting Accept - - - - - Bank Account Information - - - Service Request Accountant Accept @@ -118,10 +90,6 @@ - - Accept income and expenses - - OTP Manager @@ -279,7 +247,7 @@ Show All Service Requests [(1, '=', 1)] - + diff --git a/odex25_benefit/odex_benefit/views/actions_and_menus.xml b/odex25_benefit/odex_benefit/views/actions_and_menus.xml index 346ec0b36..517efc202 100644 --- a/odex25_benefit/odex_benefit/views/actions_and_menus.xml +++ b/odex25_benefit/odex_benefit/views/actions_and_menus.xml @@ -774,7 +774,7 @@ + web_icon="odex_benefit,static/description/icon1.png" groups="odex_benefit.group_benefit_info,odex_benefit.group_benefit_manager,odex_benefit.group_benefit_researcher,odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_branch_manager"/> - + parent="menu_benefits_config_others" action="loan_reason_action" sequence="10"/> diff --git a/odex25_benefit/odex_benefit/views/benefit_config_view.xml b/odex25_benefit/odex_benefit/views/benefit_config_view.xml index 3826d5c3e..5b80deab7 100644 --- a/odex25_benefit/odex_benefit/views/benefit_config_view.xml +++ b/odex25_benefit/odex_benefit/views/benefit_config_view.xml @@ -990,6 +990,8 @@ + + @@ -1092,7 +1094,7 @@ - + @@ -1526,13 +1528,13 @@

- +

- + diff --git a/odex25_benefit/odex_benefit/views/benefit_view.xml b/odex25_benefit/odex_benefit/views/benefit_view.xml index deb66528e..8b19eb8ac 100644 --- a/odex25_benefit/odex_benefit/views/benefit_view.xml +++ b/odex25_benefit/odex_benefit/views/benefit_view.xml @@ -483,7 +483,7 @@ />