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 #5311 from expsa/test_dev_odex25_ensan 

[IMP] odex_benefit: IMP benefit
This commit is contained in:
kchyounes19 2025-11-10 11:49:56 +01:00 committed by GitHub
parent 2649c2947c 2f2c349770
commit ac7f615c47
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
odex25_ensan/odex_benefit/i18n/ar_001.po
View File

@ -2172,7 +2172,6 @@ msgstr "عدد أفراد الأسرة/المستفيدين"
#. module: odex_benefit
#: model:ir.ui.menu,name:odex_benefit.menu_confirm_benefit_expense
#: model:ir.ui.menu,name:odex_benefit.menu_confirm_benefit_expense_duplicate
msgid "Benefit Expense Flow"
msgstr "اجراءت مصاريف الاسر"

1
odex25_ensan/odex_benefit/models/service_request.py
View File

@ -7,6 +7,7 @@ from dateutil.relativedelta import relativedelta
class ServiceRequest(models.Model):
_name = 'service.request'
_inherit = ['mail.thread', 'mail.activity.mixin']
_order = "date desc"
name = fields.Char(string='Reference', required=True, copy=False, readonly=True, index=True,
default=lambda self: _('New'))

17
odex25_ensan/odex_benefit/views/actions_and_menus.xml
View File

@ -545,17 +545,6 @@
<p class="oe_view_nocontent_create">Create the Service Request
</p>
</field>
</record>
<record model="ir.actions.act_window" id="service_request_accounting_action">
<field name="name">Services Requests</field>
<field name="res_model">service.request</field>
<field name="view_mode">tree,form</field>
<field name="domain">['|','|','|','|',('state','=','second_approve'),('state','=','accounting_approve'),('state','=','refused'),
('state','=','send_request_to_supplier'), ('state','=','family_received_device')]</field>
<field name="help" type="html">
<p class="oe_view_nocontent_create">Create the Service Request
</p>
</field>
</record>
<record model="ir.actions.act_window" id="benefit_need_action">
<field name="name">Benefit Need</field>
@ -1004,10 +993,6 @@
parent="odex_benefit.benefit_tools_services_settings_menu" action="services_settings_action" groups="odex_benefit.group_benefit_manager"/>
<menuitem id="services_requests_menu" name="Services Requests" sequence="2"
parent="odex_benefit.benefit_services" action="service_request_action"/>
<menuitem id="menu_confirm_benefit_expense_duplicate" name="Benefit Expense Flow" parent="odex_benefit.benefit_services"
action="action_confirm_benefit_expense" sequence="100"/>
<menuitem id="menu_service_request_accounting_accept" name="Services Requests" parent="account.menu_finance_payables"
action="service_request_accounting_action" sequence="9"/>
<!-- <menuitem id="family_member_main_menu" name="Family Members"-->
<!-- parent="benefits_root_menu" sequence="2"/>-->
@ -1038,7 +1023,7 @@
parent="education_main_menu" action="education_delay_reason_action" sequence="8"/>
<menuitem id="education_exam_type_menu" name="Exams Type"
parent="education_main_menu" action="education_exam_type_action" sequence="9"/>
<menuitem id="menu_confirm_benefit_expense" name="Benefit Expense Flow" parent="account.menu_finance_payables"
<menuitem id="menu_confirm_benefit_expense" name="Benefit Expense Flow" parent="odex_benefit.benefit_services"
action="action_confirm_benefit_expense" sequence="11"/>
<menuitem id="menu_family_bank_report_root"
name="Family Bank Report"

23
odex25_ensan/odex_benefit/views/payment_order.xml
View File

@ -79,12 +79,20 @@
readonly="1">
<tree>
<field name="family_id"/>
<field name="member_id"/>
<field name="branch_custom_id"/>
<field name="account_id"/>
<field name="name" string="Service Number"/>
<field name="description" string="Service Description"/>
<field name="aid_amount" string="Service Amount"/>
<field name="benefit_type" optional="hidden"/>
<field name="member_id" optional="hidden"/>
<field name="branch_custom_id" optional="hidden"/>
<field name="researcher_id" optional="hidden"/>
<field name="family_category"/>
<field name="benefit_member_count"/>
<field name="service_benefit_count"/>
<field name="requested_service_amount"/>
<field name="state" widget="badge"
decoration-success="state in ['gm_assistant']"
decoration-muted="state == 'draft'"
decoration-danger="state in ['refused']"
decoration-info="state in ['first_approve','waiting_approve']"
decoration-warning="state in ['researcher']"/>
</tree>
</field>
</page>
@ -139,8 +147,9 @@
<tree string="Payment Orders">
<field name="name" readonly="1"/>
<field name="payment_order_date"/>
<field name="accountant_id"/>
<field name="accountant_id" widget="many2one_avatar_user"/>
<field name="payment_order_description"/>
<field name="type"/>
<field name="state"/>
</tree>
</field>