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 #4343 from expsa/youn_dev_odex25_ensan 

IMP benefit
This commit is contained in:
kchyounes19 2025-08-27 13:45:02 +01:00 committed by GitHub
parent 50636af14c 0cf5bb3573
commit 2d6006f7ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 96 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,7 +178,7 @@
<record model="ir.actions.act_window" id="visits_action">
<field name="name">Visits</field>
<field name="res_model">visit.location</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">tree,form,activity,calendar</field>
<field name="help" type="html">
<p class="oe_view_nocontent_create">Create the First Visit
</p>

111
odex25_ensan/odex_benefit/views/visit.xml
View File

@ -1,5 +1,71 @@
<odoo>
<data>
<record id="visits_form_kanban_view" model="ir.ui.view">
<field name="name">visit.location.kanban</field>
<field name="model">visit.location</field>
<!-- <field name="arch" type="xml">-->
<!-- <kanban default_group_by="state">-->
<!-- <field name="name"/>-->
<!-- <field name="visit_date"/>-->
<!-- <field name="benefit_id"/>-->
<!-- <field name="researcher_team"/>-->
<!-- <field name="state"/>-->
<!-- <templates>-->
<!-- <t t-name="kanban-box">-->
<!-- <div t-attf-class="oe_kanban_global_click">-->
<!-- <div class="oe_kanban_details">-->
<!-- <strong class="o_kanban_record_title">-->
<!-- <strong>رقم الزيارة:-->
<!-- <field name="name"/>-->
<!-- </strong>-->
<!-- </strong>-->
<!-- <div>-->
<!-- <strong>تاريخ الزيارة:-->
<!-- <field name="visit_date"/>-->
<!-- </strong>-->
<!-- </div>-->
<!-- <div>-->
<!-- <strong>الاسرة:-->
<!-- <field name="benefit_id"/>-->
<!-- </strong>-->
<!-- </div>-->
<!-- <div>-->
<!-- <strong>الاخصائي:-->
<!-- <field name="researcher_team"/>-->
<!-- </strong>-->
<!-- </div>-->
<!-- <div>-->
<!-- <strong>الحالة:-->
<!-- <field name="state" widget="badge"-->
<!-- decoration-success="state in ['done', 'close']"-->
<!-- decoration-muted="state in ['draft']"-->
<!-- decoration-danger="state in ['cancel']"-->
<!-- decoration-warning="state in ['schedule_a_visit']"-->
<!-- decoration-info="state not in ('contact')"/>-->
<!-- </strong>-->
<!-- </div>-->
<!-- <div>-->
<!-- <strong>نوع الاجراء:-->
<!-- <field name="action_type" widget="badge"-->
<!-- decoration-muted="action_type in ['new']"-->
<!-- decoration-info="action_type in ['edit_info']"-->
<!-- decoration-success="action_type in ['approved']"-->
<!-- decoration-danger="action_type in ['suspended']"-->
<!-- decoration-warning="action_type in ['exception']"/>-->
<!-- </strong>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="o_kanban_record_bottom">-->
<!-- <div class="oe_kanban_bottom_right">-->
<!-- <field name="activity_ids" widget="kanban_activity"/>-->
<!-- </div>-->
<!-- </div>-->
<!-- </t>-->
<!-- </templates>-->
<!-- </kanban>-->
<!-- </field>-->
</record>
<record id="visits_form" model="ir.ui.view">
<field name="name">visit.location.form</field>
<field name="model">visit.location</field>
@ -52,29 +118,40 @@
<field name="visit_date"/>
<field name="description" invisible="1"/>
<field name="visit_objective" invisible="1"/>
<field name="activity_ids" widget="list_activity"/>
<field name="visit_types"/>
<field name="contact_type"/>
<field name="state" widget="badge" decoration-muted="state in ['draft']" decoration-info="state in ['contact']" decoration-warning="state in ['schedule_a_visit']" decoration-success="state in ['done', 'close']" decoration-danger="state in ['cancel']"/>
</tree>
</field>
</record>
<!-- <record id="visit_location_activity_view" model="ir.ui.view">-->
<!-- <field name="name">visit.location.activity.view</field>-->
<!-- <field name="model">visit.location</field>-->
<!-- <field name="arch" type="xml">-->
<!-- <activity string="Activity">-->
<!-- <field name="id"/>-->
<!-- <templates>-->
<!-- <div t-name="activity-box">-->
<!-- <div>-->
<!-- <field name="name" display="full"/>-->
<!-- <field name="benefit_id" muted="1" display="full"/>-->
<!-- </div>-->
<!-- </div>-->
<!-- </templates>-->
<!-- </activity>-->
<!-- </field>-->
<!-- </record>-->
<record id="visit_location_activity_view" model="ir.ui.view">
<field name="name">visit.location.activity.view</field>
<field name="model">visit.location</field>
<field name="arch" type="xml">
<activity string="Activity">
<field name="id"/>
<templates>
<div t-name="activity-box">
<div>
<field name="name" display="full"/>
<field name="benefit_id" muted="1" display="full"/>
</div>
</div>
</templates>
</activity>
</field>
</record>
<record id="visit_location_calendar_view" model="ir.ui.view">
<field name="name">visit.location.calendar.view</field>
<field name="model">visit.location</field>
<field name="arch" type="xml">
<calendar string="visits" date_start="visit_date" mode="month" quick_add="True" color="researcher_team">
<field name="name"/>
<field name="visit_date"/>
</calendar>
</field>
</record>
<record model="ir.ui.view" id="visit_search">
<field name="name">visit.location.search</field>
<field name="model">visit.location</field>

2
odex25_ensan/odex_benefit/wizards/entity_refused_wizard.py
View File

@ -176,6 +176,6 @@ class EntityReturnReasonWizard(models.TransientModel):
rec.entity_id.sudo().write({"state": target_state})
if rec.entity_id.state == 'draft':
message = rec.entity_id.create_message(target_state)
rec.entity_id.user_id.send_sms_to_user(message, rec.entity_id.phone)
rec.entity_id.user_id.send_sms_to_user(message, rec.entity_id.sms_phone)
return {'type': 'ir.actions.act_window_close'}