[UPD] odex_benefit

This commit is contained in:
Samir Ladoui 2025-08-31 12:42:06 +01:00
parent 06449d22c3
commit 97af5d0bc6
7 changed files with 41 additions and 9 deletions

View File

@ -49,6 +49,7 @@
'views/benefit_config_view.xml',
'views/generate_reports.xml',
'views/service_refuse_reason.xml',
'views/res_city.xml',
'views/res_country.xml',
'templates/benefit_email.xml',

View File

@ -8729,6 +8729,12 @@ msgstr "البريد الإلكتروني العادي"
msgid "Not Benefit"
msgstr "غير مستفيد"
#. module: odex_benefit
#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__father_dead_res_city_id_not_defined
#: model:ir.model.fields,field_description:odex_benefit.field_res_city__not_defined
msgid "Not Defined"
msgstr "غير محدد"
#. module: odex_benefit
#: code:addons/odex_benefit/controllers/benefit.py:0
#, python-format

View File

@ -179,8 +179,10 @@ class GrantBenefitProfile(models.Model):
father_dead_reason = fields.Char(string='Dead Reason', required=False)
father_dead_date = fields.Date(string="Father Dead Date")
father_dead_country_id = fields.Many2one('res.country', string='Father Dead Country', tracking=True)
father_dead_country_id_code = fields.Char(related='father_dead_country_id.code')
father_dead_city_id = fields.Many2one('res.country.city', string='Father Dead City',domain="[('country_id', '=', father_dead_country_id)]")
father_dead_res_city_id = fields.Many2one('res.city', string='Father Dead City',domain="[('country_id', '=', father_dead_country_id)]")
father_dead_res_city_id = fields.Many2one('res.city', string='Father Dead City',domain="['|', ('country_id', '=', father_dead_country_id), ('country_id', '=', False)]")
father_dead_res_city_id_not_defined = fields.Boolean(related="father_dead_res_city_id.not_defined")
father_dead_city = fields.Char(string='Father Dead City')
father_dead_certificate = fields.Many2many('ir.attachment', 'rel_father_dead_attachment','benefit_id','attachment_id',string='Father Dead Certificate')
# Mother's case and her data # Birth Date # Address # dead data

View File

@ -10,3 +10,5 @@ class ResCity(models.Model):
name = fields.Char(required=True)
country_id = fields.Many2one('res.country')
country_city_id = fields.Many2one('res.country.city', domain="[('country_id', '=', country_id)]")
not_defined = fields.Boolean(default=False)
active = fields.Boolean(default=True)

View File

@ -719,6 +719,11 @@
<field name="name">Country Cities</field>
<field name="res_model">res.city</field>
<field name="view_mode">tree,form</field>
<field name="view_ids" eval="[
(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('odex_benefit.res_city_view_tree')}),
(0, 0, {'view_mode': 'form', 'view_id': ref('odex_benefit.res_city_view_form')}),
]"/>
<field name="help" type="html">
<p class="oe_view_nocontent_create">Create New City
</p>
@ -901,8 +906,8 @@
parent="menu_benefits_config_addresses" action="action_country_state_benefit"/>
<menuitem id="res_city_menu" name="Cities" sequence="2"
parent="menu_benefits_config_addresses" action="res_city_list_action"/>
<!-- <menuitem id="city_menu" name="Country Cities" sequence="3"
parent="menu_benefits_config_addresses" action="res_city_action"/> -->
<menuitem id="city_menu" name="Country Cities" sequence="3"
parent="menu_benefits_config_addresses" action="res_city_action"/>
<menuitem id="res_branch_menu" name="Branch Settings" sequence="4"
parent="menu_benefits_config_addresses" action="res_branch_action"/>
<menuitem id="res_district_menu" name="Districts" sequence="5"

View File

@ -373,8 +373,17 @@
options="{'no_create': True, 'no_create_edit': True}"
groups="!odex_benefit.group_benefit_manager"/>
<field name="father_dead_city_id" invisible="1"/>
<field name="father_dead_res_city_id" invisible="1"/>
<field name="father_dead_city"/>
<field name="father_dead_res_city_id" attrs="{
'invisible': [('father_dead_country_id_code', '!=', 'SA')]
}"/>
<field name="father_dead_country_id_code" invisible="1" />
<field name="father_dead_res_city_id_not_defined" invisible="1" />
<field name="father_dead_city" attrs="{
'invisible': [
('father_dead_country_id_code', '=', 'SA'),
('father_dead_res_city_id_not_defined', '=', False)
]
}"/>
<field name="father_dead_certificate"
attrs="{'readonly':[('state','not in',['draft','new','complete_info'])]}"
widget="many2many_attachment_preview"/>
@ -1333,8 +1342,13 @@
attrs="{'readonly':[('state','not in',['draft','new','complete_info'])]}"/>
</xpath> -->
<xpath expr="//field[@name='father_dead_city']" position="replace">
<field name="father_dead_city"
attrs="{'readonly':[('state','not in',['draft','new','complete_info'])]}"/>
<field name="father_dead_city" attrs="{
'readonly': [('state','not in',('draft','new','complete_info'))],
'invisible': [
('father_dead_country_id_code', '=', 'SA'),
('father_dead_res_city_id_not_defined', '=', False)
]
}"/>
</xpath>
<xpath expr="//field[@name='father_country_id']" position="replace">

View File

@ -11,8 +11,9 @@
<group>
<group>
<field name="name"/>
<field name="not_defined"/>
</group>
<group>
<group attrs="{'invisible': [('not_defined', '=', True)]}">
<field name="country_id"/>
<field name="country_city_id"/>
</group>
@ -23,12 +24,13 @@
</record>
<record id="res_city_view_form" model="ir.ui.view">
<record id="res_city_view_tree" model="ir.ui.view">
<field name="name">inherit.res.city.form</field>
<field name="model">res.city</field>
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="not_defined"/>
<field name="country_id"/>
<field name="country_city_id"/>
</tree>