devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6269 from expsa/trezr 

[IMP] odex_benefit: IMP benefit
This commit is contained in:
kchyounes19 2026-01-20 13:21:07 +01:00 committed by GitHub
parent 566ad6f379 ad58f28047
commit cfb93c2262
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
odex25_benefit/odex_benefit/i18n/ar_001.po
View File

@ -18525,11 +18525,6 @@ msgstr "مكان سكن الأم البديلة غير مؤهل للاستفاد
msgid "Can Request Temporary Exception" msgid "Can Request Temporary Exception"
msgstr "يمكن طلب استثناء مؤقت" msgstr "يمكن طلب استثناء مؤقت"
#. module: odex_benefit
#: model_terms:ir.ui.view,arch_db:odex_benefit.family_member_form
msgid "Exception Family Services Manager Approve"
msgstr "اعتماد مديرة خدمات المستفيدين للاستثناء"
#. module: odex_benefit #. module: odex_benefit
#: model:ir.model.fields,field_description:odex_benefit.field_services_settings__allowed_country_ids #: model:ir.model.fields,field_description:odex_benefit.field_services_settings__allowed_country_ids
msgid "Allowed Countries" msgid "Allowed Countries"

6
odex25_benefit/odex_benefit/models/family_expense.py
View File

@ -278,8 +278,12 @@ class ConfirmBenefitExpense(models.Model):
base_domain.append(('branch_custom_id', 'in', rec.branch_custom_ids.ids)) base_domain.append(('branch_custom_id', 'in', rec.branch_custom_ids.ids))
min_income = validation_setting.benefit_category_ids.mapped('mini_income_amount') min_income = validation_setting.benefit_category_ids.mapped('mini_income_amount')
max_income = validation_setting.benefit_category_ids.mapped('max_income_amount') max_income = validation_setting.benefit_category_ids.mapped('max_income_amount')
benefit_category_ids = validation_setting.benefit_category_ids
base_domain.extend([('member_income', '>=', min(min_income)), ('member_income', '<=', max(max_income))]) base_domain.extend([('member_income', '>=', min(min_income)), ('member_income', '<=', max(max_income))])
base_domain.extend([('benefit_category_id', '!=', False)]) if benefit_category_ids:
base_domain.extend([('benefit_category_id', 'in', benefit_category_ids.ids)])
else:
base_domain.extend([('benefit_category_id', '!=', False)])
if rec.start_date and rec.end_date: if rec.start_date and rec.end_date:
conflicting_records = self.search([ conflicting_records = self.search([
('id', '!=', rec._origin.id), ('id', '!=', rec._origin.id),

7
odex25_benefit/odex_benefit/models/family_members.py
View File

@ -1048,15 +1048,10 @@ class FamilyMemberProfile(models.Model):
rec.state_a = 'first_approve' rec.state_a = 'first_approve'
def action_exception_second_accept(self): def action_exception_second_accept(self):
for rec in self:
rec.is_excluded_suspension = True
rec.state_a = 'family_services_manager'
# rec.is_member_workflow = False
def action_exception_third_accept(self):
for rec in self: for rec in self:
rec.is_excluded_suspension = True rec.is_excluded_suspension = True
rec.state_a = 'exception_second_approve' rec.state_a = 'exception_second_approve'
# rec.is_member_workflow = False
def action_exception_final_accept(self): def action_exception_final_accept(self):
for rec in self: for rec in self:

9
odex25_benefit/odex_benefit/views/family_members.xml
View File

@ -57,12 +57,12 @@
string="Temporarily Exception" class="oe_highlight" string="Temporarily Exception" class="oe_highlight"
confirm="Are you sure you want to move to Temporarily Exception ?" confirm="Are you sure you want to move to Temporarily Exception ?"
groups="!odex_benefit.group_benefit_supervisor" groups="!odex_benefit.group_benefit_supervisor"
attrs="{'invisible': ['|','|',('action_type','=','exception'),('member_status','=','benefit'),('can_request_temporary_exception','=',False)]}"/> attrs="{'invisible': ['|',('member_status','=','benefit'),('can_request_temporary_exception','=',False)]}"/>
<button name="action_exception" type="object" <button name="action_exception" type="object"
string="Temporarily Exception" class="oe_highlight" string="Temporarily Exception" class="oe_highlight"
confirm="Are you sure you want to move to Temporarily Exception ?" confirm="Are you sure you want to move to Temporarily Exception ?"
groups="odex_benefit.group_benefit_supervisor" groups="odex_benefit.group_benefit_supervisor"
attrs="{'invisible': ['|',('action_type','=','exception'),('member_status','=','benefit')]}"/> attrs="{'invisible': [('member_status','=','benefit')]}"/>
<button name="action_exception_first_accept" type="object" <button name="action_exception_first_accept" type="object"
string="Exception First Approve" class="oe_highlight" string="Exception First Approve" class="oe_highlight"
groups="odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_manager" groups="odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_manager"
@ -72,11 +72,6 @@
groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager" groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager"
attrs="{'invisible': ['|',('action_type','!=','exception'),('state', 'not in', ['first_approve'])]}" attrs="{'invisible': ['|',('action_type','!=','exception'),('state', 'not in', ['first_approve'])]}"
/> />
<button name="action_exception_third_accept" type="object"
string="Exception Family Services Manager Approve" class="oe_highlight"
groups="odex_benefit.group_benefit_manager"
attrs="{'invisible': ['|',('action_type','!=','exception'),('state', 'not in', ['family_services_manager'])]}"
/>
<button name="action_exception_final_accept" type="object" <button name="action_exception_final_accept" type="object"
string="Exception Final Approve" class="oe_highlight" string="Exception Final Approve" class="oe_highlight"
attrs="{'invisible': [('state','not in',['exception_second_approve'])]}" attrs="{'invisible': [('state','not in',['exception_second_approve'])]}"