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 #6335 from expsa/tyop 

[IMP] odex_benefit: IMP benefit
This commit is contained in:
kchyounes19 2026-01-25 10:15:57 +01:00 committed by GitHub
parent 992dd16364 0ad6a5f6cb
commit e99af09efe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
odex25_benefit/odex_benefit/models/account_move_line.py
View File

@ -50,3 +50,14 @@ class AccountMove(models.Model):
'context': ctx, 'context': ctx,
'target': 'current', 'target': 'current',
} }
def _get_name_invoice_report(self):
self.ensure_one()
has_benefit_family = any(
line.benefit_family_id or line.family_confirm_id
for line in self.invoice_line_ids
)
if has_benefit_family or self.benefit_family_ids or self.family_confirm_id:
return 'account.report_invoice_document'
return super()._get_name_invoice_report()

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

@ -273,7 +273,7 @@ class ConfirmBenefitExpense(models.Model):
# Define base domain for family selection # Define base domain for family selection
base_domain = ['|', ('state', '=', 'second_approve'), '&', base_domain = ['|', ('state', '=', 'second_approve'), '&',
('state', 'in', ('waiting_approve', 'first_approve')), ('action_type', '=', 'suspended')] ('state', 'not in', ('temporary_suspended', 'suspended_second_approve')), ('action_type', '=', 'suspended')]
if rec.branch_custom_ids: if rec.branch_custom_ids:
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')

6
odex25_benefit/odex_benefit/views/benefit_view.xml
View File

@ -1251,7 +1251,8 @@
attrs="{'invisible':[('is_mother','=',False)],'required':[('is_mother','=',True)]}"/> attrs="{'invisible':[('is_mother','=',False)],'required':[('is_mother','=',True)]}"/>
<field name="mother_family_name" force_save="1" <field name="mother_family_name" force_save="1"
attrs="{'invisible':[('is_mother','=',False)],'required':[('is_mother','=',True)]}"/> attrs="{'invisible':[('is_mother','=',False)],'required':[('is_mother','=',True)]}"/>
<field name="age" required="1"/> <field name="age" invisible="1"/>
<field name="full_age" force_save="1"/>
<field name="age_status" <field name="age_status"
attrs="{'invisible':[('relationn_type','not in',('son','daughter'))]}"/> attrs="{'invisible':[('relationn_type','not in',('son','daughter'))]}"/>
<field name="member_id_number" required="1"/> <field name="member_id_number" required="1"/>
@ -1428,7 +1429,8 @@
<tree string="Family Members"> <tree string="Family Members">
<field name="name" force_save="1"/> <field name="name" force_save="1"/>
<field name="relationn"/> <field name="relationn"/>
<field name="age"/> <field name="age" optional="hide"/>
<field name="full_age"/>
<field name="member_location_conf"/> <field name="member_location_conf"/>
<field name="education_status"/> <field name="education_status"/>
<field name="last_education_levels" optional="hide"/> <field name="last_education_levels" optional="hide"/>

6
odex25_benefit/odex_benefit/views/service_request.xml
View File

@ -152,16 +152,16 @@
string="Beneficiary Approve" class="oe_highlight" string="Beneficiary Approve" class="oe_highlight"
confirm="Are you sure you want to approve ?" confirm="Are you sure you want to approve ?"
states="gm_assistant" states="gm_assistant"
groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"/> groups="odex_benefit.group_benefit_manager"/>
<button name="action_first_refuse" type="object" <button name="action_first_refuse" type="object"
string="Return the request to the specialist" class="btn btn-warning" string="Return the request to the specialist" class="btn btn-warning"
states="gm_assistant" states="gm_assistant"
groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager" groups="odex_benefit.group_benefit_manager"
/> />
<button name="action_refuse" type="object" <button name="action_refuse" type="object"
string="Refuse" class="btn btn-danger" string="Refuse" class="btn btn-danger"
states="gm_assistant" states="gm_assistant"
groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager" groups="odex_benefit.group_benefit_manager"
/> />
<field name="state" widget="statusbar" <field name="state" widget="statusbar"
statusbar_visible="draft,researcher,waiting_approve,first_approve,accounting_approve,send_request_to_supplier,family_received_device,refused"/> statusbar_visible="draft,researcher,waiting_approve,first_approve,accounting_approve,send_request_to_supplier,family_received_device,refused"/>