From 04aa864f97a7d81a4d6faad6a5c9151db3e58fed Mon Sep 17 00:00:00 2001 From: younes Date: Tue, 26 Aug 2025 12:13:55 +0100 Subject: [PATCH] IMP benefit --- odex25_ensan/odex_benefit/i18n/ar_001.po | 47 ++++++- .../odex_benefit/models/benefit_config.py | 10 -- .../odex_benefit/views/benefit_view.xml | 115 +++++++++--------- .../odex_benefit/views/committees_view.xml | 1 - .../odex_benefit/views/family_members.xml | 3 +- 5 files changed, 104 insertions(+), 72 deletions(-) diff --git a/odex25_ensan/odex_benefit/i18n/ar_001.po b/odex25_ensan/odex_benefit/i18n/ar_001.po index e69c3c4b4..224963e9c 100644 --- a/odex25_ensan/odex_benefit/i18n/ar_001.po +++ b/odex25_ensan/odex_benefit/i18n/ar_001.po @@ -1141,6 +1141,7 @@ msgstr "نموذج الأنشطة" #. module: odex_benefit #: model:ir.model.fields,field_description:odex_benefit.field_benefits_representative__active +#: model:ir.model.fields,field_description:odex_benefit.field_committees_line__active #: model:ir.model.fields,field_description:odex_benefit.field_external_benefits__active #: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__active msgid "Active" @@ -1509,6 +1510,18 @@ msgstr "الموافقة على العائلة" msgid "Approved" msgstr "موافقة" +#. module: odex_benefit +#: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__action_type__approved +#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form +msgid "Approved" +msgstr "معتمد" + +#. module: odex_benefit +#: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__action_type__suspended +#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form +msgid "Suspended" +msgstr "ايقاف" + #. module: odex_benefit #: model_terms:ir.ui.view,arch_db:odex_benefit.changes_requests_form #: model_terms:ir.ui.view,arch_db:odex_benefit.view_benefit_category_form @@ -2384,11 +2397,13 @@ msgstr "لم يتم ايجاد المستفيد" #. module: odex_benefit #: code:addons/odex_benefit/models/benefit_config.py:0 +#: code:addons/odex_benefit/models/benefit_config.py:0 #: code:addons/odex_benefit/models/housing_config.py:0 #: model:ir.model.fields,field_description:odex_benefit.field_benefit_family__benefit_ids #: model:ir.model.fields,field_description:odex_benefit.field_benefit_housing__benefit_ids #: model:ir.model.fields,field_description:odex_benefit.field_benefit_housing__family_ids #: model:ir.model.fields,field_description:odex_benefit.field_benefit_need__benefit_ids +#: model_terms:ir.ui.view,arch_db:odex_benefit.committees_view_form #: model_terms:ir.ui.view,arch_db:odex_benefit.view_benefit_category_form #: model_terms:ir.ui.view,arch_db:odex_benefit.view_benefit_family_form #: model_terms:ir.ui.view,arch_db:odex_benefit.view_benefit_housing_form @@ -2397,6 +2412,11 @@ msgstr "لم يتم ايجاد المستفيد" msgid "Benefits" msgstr "المستفيدين" +#. module: odex_benefit +#: model_terms:ir.ui.view,arch_db:odex_benefit.committees_view_form +msgid "Employees" +msgstr "الموظفين" + #. module: odex_benefit #: model:ir.model,name:odex_benefit.model_res_country_city msgid "Benefits - City" @@ -4558,6 +4578,8 @@ msgstr "مسودة" #. module: odex_benefit #: model:ir.model.fields.selection,name:odex_benefit.selection__benefit_sms_configuration__state__edit_info +#: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__action_type__edit_info +#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form msgid "Edit Information" msgstr "تحرير البيانات" @@ -4847,6 +4869,11 @@ msgstr "ممتاز" msgid "Exception" msgstr "استثنائية" +#. module: odex_benefit +#: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__action_type__exception +msgid "Exception" +msgstr "استثناء" + #. module: odex_benefit #: model:ir.model.fields,field_description:odex_benefit.field_exception_wizard__exception_attachment #: model:ir.model.fields,field_description:odex_benefit.field_family_member__exception_attachment @@ -5333,6 +5360,7 @@ 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 "File content" msgstr "الملف المرفق" @@ -12169,6 +12197,13 @@ msgstr "مع الزوج" msgid "New" msgstr "اسناد الاخصائي" +#. module: odex_benefit +#: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__action_type__new +#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form +#, python-format +msgid "New" +msgstr "جديد" + #. module: odex_benefit #: model:ir.actions.server,name:odex_benefit.action_assign_visit_sequence msgid "Assign Visit Sequence" @@ -14739,4 +14774,14 @@ msgid "" "%s must contain only alphabetic characters and spaces. Numbers and special " "characters are not allowed." msgstr "" -"%s يجب أن يحتوي فقط على الأحرف الأبجدية والمسافات. الأرقام والرموز الخاصة غير مسموح بها." \ No newline at end of file +"%s يجب أن يحتوي فقط على الأحرف الأبجدية والمسافات. الأرقام والرموز الخاصة غير مسموح بها." + +#. module: odex_benefit +#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__action_type +msgid "Action Type" +msgstr "نوع الإجراء" + +#. module: odex_benefit +#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form +msgid "Father Name" +msgstr "اسم الأب" \ No newline at end of file diff --git a/odex25_ensan/odex_benefit/models/benefit_config.py b/odex25_ensan/odex_benefit/models/benefit_config.py index 0cdcc55a5..b183c7a94 100644 --- a/odex25_ensan/odex_benefit/models/benefit_config.py +++ b/odex25_ensan/odex_benefit/models/benefit_config.py @@ -613,7 +613,6 @@ class Committees(models.Model): name = fields.Char() employee_id = fields.Many2many('hr.employee') - # , domain = "[('gender', 'in', employee_gender_domain)]" benefit_ids = fields.Many2many('grant.benefit',compute="get_benefit_ids") type = fields.Selection( string='', @@ -625,15 +624,6 @@ class Committees(models.Model): branch_custom_id = fields.Many2one("branch.settings", string="Branch") active = fields.Boolean('Active', default=True) benefit_count = fields.Integer(compute="get_benefit_count") - # employee_gender_domain = fields.Char(compute='_compute_employee_gender_domain') - # - # @api.depends('type') - # def _compute_employee_gender_domain(self): - # for record in self: - # if record.type in ['male', 'female']: - # record.employee_gender_domain = [record.type] - # else: - # record.employee_gender_domain = ['male', 'female'] def get_benefit_ids(self): obj = self.env["grant.benefit"].search([]) diff --git a/odex25_ensan/odex_benefit/views/benefit_view.xml b/odex25_ensan/odex_benefit/views/benefit_view.xml index d41c629f8..1de1c487b 100644 --- a/odex25_ensan/odex_benefit/views/benefit_view.xml +++ b/odex25_ensan/odex_benefit/views/benefit_view.xml @@ -45,6 +45,7 @@ +
@@ -198,11 +199,6 @@ string="Set to Draft" class="oe_highlight" groups="odex_benefit.group_benefit_back_to_draft" attrs="{'invisible':[('state','in',['draft','first_approve','second_approve'])]}"/> - - - - -