UPDATE odex_benefit

This commit is contained in:
manar 2025-02-20 11:49:47 +02:00
parent c2682531f4
commit 1b5a779b33
10 changed files with 105 additions and 11 deletions

View File

@ -3205,6 +3205,7 @@ msgstr "عدد الرسائل المرتدة لجهة الاتصال هذه"
#: model:ir.model.fields,field_description:odex_benefit.field_external_request__country_id
#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__country_id
#: model:ir.model.fields,field_description:odex_benefit.field_res_country_city__country_id
#: model:ir.model.fields,field_description:odex_benefit.field_res_city__country_id
msgid "Country"
msgstr "الدولة"
@ -3928,11 +3929,11 @@ msgid "Dead"
msgstr "متوفية"
#. module: odex_benefit
#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__father_dead_city_id
#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__mother_dead_city_id
#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__father_dead_res_city_id
#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__mother_dead_res_city_id
#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__replacement_mother_dead_city_id
msgid "Dead City"
msgstr "مكان الوفاة"
msgstr "مدينة الوفاة"
#. module: odex_benefit
#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__father_dead_reason
@ -8163,6 +8164,7 @@ msgstr "نهاية الوقت المعين للنشاط"
#: model:ir.model.fields,field_description:odex_benefit.field_receive_benefit_zkat__name
#: model:ir.model.fields,field_description:odex_benefit.field_receive_food_basket__name
#: model:ir.model.fields,field_description:odex_benefit.field_receive_food_surplus__name
#: model:ir.model.fields,field_description:odex_benefit.field_res_city__name
#: model:ir.model.fields,field_description:odex_benefit.field_res_country_city__name
#: model:ir.model.fields,field_description:odex_benefit.field_res_districts__name
#: model:ir.model.fields,field_description:odex_benefit.field_rooms_categories__name
@ -13915,3 +13917,20 @@ msgstr ".مرفق إقرار أفراد الأسرة بالتحويل مطلوب
msgid "Father Dead Certificate is required."
msgstr ".مرفق شهادة وفاة الأب مطلوب"
#. module: odex_benefit
#: model:ir.model.fields,field_description:odex_benefit.field_res_city__country_city_id
#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form
msgid "Country City"
msgstr "المحافظة"
#. module: odex_benefit
#: model:ir.model,name:odex_benefit.model_res_city
#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__res_city_id
msgid "Res City"
msgstr "المدينة"
#. module: odex_benefit
#: model:ir.ui.menu,name:odex_benefit.city_menu
#: model:ir.actions.act_window,name:odex_benefit.res_city_action
msgid "Country Cities"
msgstr "المدن"

View File

@ -30,4 +30,5 @@ from . import service_request
from . import payment_order
from . import family_complaints
from . import service_refuse_reason
from . import res_city
# from . import res_config_settings

View File

@ -169,6 +169,7 @@ class GrantBenefitProfile(models.Model):
father_dead_date = fields.Date(string="Father Dead Date")
father_dead_country_id = fields.Many2one('res.country', string='Father Dead Country', tracking=True, required=True)
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_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
mother_relation = fields.Selection(
@ -192,6 +193,7 @@ class GrantBenefitProfile(models.Model):
mother_is_dead = fields.Boolean(string='Mother Is Dead?',related='mother_marital_conf.is_dead')
mother_dead_country_id = fields.Many2one('res.country', string='Mother Dead Country', tracking=True)
mother_dead_city_id = fields.Many2one('res.country.city', string='Mother Dead City',domain="[('country_id', '=', mother_dead_country_id)]")
mother_dead_res_city_id = fields.Many2one('res.city', string='Mother Dead City',domain="[('country_id', '=', mother_dead_country_id)]")
mother_location = fields.Selection(
[('with_husband_and_children', _('With Husband And Children')), ('with_children', _('With Children')),
('not_live_with_children', _('Not live with children'))], string='Mother Location')
@ -421,6 +423,7 @@ class GrantBenefitProfile(models.Model):
}
)
zip = fields.Char('Zip', change_default=True, readonly=False, store=True)
res_city_id = fields.Many2one('res.city', domain="[('country_city_id', '=', city_id)]")
url = fields.Char()
url_html = fields.Html(
sanitize=False,

View File

@ -15,7 +15,7 @@ class City(models.Model):
name = fields.Char(string='Name')
state_id = fields.Many2one('res.country.state', string='State')
country_id = fields.Many2one('res.country', string='Country', compute='_load_country_id', store=True)
country_id = fields.Many2one('res.country', string='Country', compute='_load_country_id', store=True, readonly=False)
class housing(models.Model):

View File

@ -0,0 +1,12 @@
# -*- coding: utf-8 -*-
from odoo import models, fields, api, _
class ResCity(models.Model):
_name= 'res.city'
_description = 'Res City'
name = fields.Char(required=True)
country_id = fields.Many2one('res.country')
country_city_id = fields.Many2one('res.country.city', domain="[('country_id', '=', country_id)]")

View File

@ -146,3 +146,5 @@ access_service_refuse_reason,access_service_refuse_reason,model_service_refuse_r
access_service_refuse_reason_wizard,access_service_refuse_reason_wizard,model_service_refuse_reason_wizard,base.group_user,1,1,1,1
access_reason_for_return_wizard,access_reason_for_return_wizard,model_reason_for_return_wizard,base.group_user,1,1,1,1
access_transportation_insurance,access_transportation_insurance,model_transportation_insurance,base.group_user,1,1,1,1
access_res_city,access_res_city,model_res_city,base.group_user,1,0,0,0
access_res_city,access_res_city,model_res_city,odex_benefit.group_benefit_manager,1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
146 access_service_refuse_reason_wizard access_service_refuse_reason_wizard model_service_refuse_reason_wizard base.group_user 1 1 1 1
147 access_reason_for_return_wizard access_reason_for_return_wizard model_reason_for_return_wizard base.group_user 1 1 1 1
148 access_transportation_insurance access_transportation_insurance model_transportation_insurance base.group_user 1 1 1 1
149 access_res_city access_res_city model_res_city base.group_user 1 0 0 0
150 access_res_city access_res_city model_res_city odex_benefit.group_benefit_manager 1 1 1 1

View File

@ -742,6 +742,16 @@
</field>
</record>
<record model="ir.actions.act_window" id="res_city_action">
<field name="name">Country Cities</field>
<field name="res_model">res.city</field>
<field name="view_mode">tree,form</field>
<field name="help" type="html">
<p class="oe_view_nocontent_create">Create New City
</p>
</field>
</record>
<!--###########################################################-->
<!--Benefit Menus-->
<!--###########################################################-->
@ -928,9 +938,11 @@
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="res_branch_menu" name="Branch Settings" sequence="3"
<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="4"
<menuitem id="res_district_menu" name="Districts" sequence="5"
parent="menu_benefits_config_addresses" action="districts_action"/>
<!-- Attachment Settings menu -->
<menuitem

View File

@ -285,7 +285,8 @@
<field name="father_dead_date"
attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
<field name="father_dead_country_id" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}" options="{'no_create': True, 'no_create_edit': True}" groups="!odex_benefit.group_benefit_manager"/>
<field name="father_dead_city_id" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}" 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" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}" options="{'no_create': True, 'no_create_edit': True}" groups="!odex_benefit.group_benefit_manager"/>
<field name="father_dead_certificate"
attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}" widget="many2many_attachment_preview"/>
</group>
@ -339,7 +340,7 @@
<field name="mother_marital_conf" attrs="{'required':[('state','!=','draft')],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}" options="{'no_create': True, 'no_create_edit': True}" groups="!odex_benefit.group_benefit_manager"/>
<field name="mother_is_dead" invisible="1"/>
<field name="mother_dead_country_id" attrs="{'invisible':[('mother_is_dead','=',False)],'required':[('mother_is_dead','=',True)],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
<field name="mother_dead_city_id" attrs="{'invisible':[('mother_is_dead','=',False)],'required':[('mother_is_dead','=',True)],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
<field name="mother_dead_res_city_id" attrs="{'invisible':[('mother_is_dead','=',False)],'required':[('mother_is_dead','=',True)],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
<field name="mother_dead_date" attrs="{'invisible':[('mother_is_dead','=',False)],'required':[('mother_is_dead','=',True)],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
<field name="mother_dead_certificate" attrs="{'invisible':[('mother_is_dead','=',False)],'required':[('mother_is_dead','=',True)],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}" widget="many2many_attachment_preview"/>
<field name="mother_location" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}" invisible="1"/>
@ -608,6 +609,7 @@
<field name="state_id" attrs="{'required':[('state','!=','draft')]}"
readonly="1" string="Region"/>
<field name="city_id" readonly="1" string="City" force_save="1" options="{'no_create': True, 'no_create_edit': True}" groups="!odex_benefit.group_benefit_manager"/>
<field name="res_city_id" string="Res City" options="{'no_create': True, 'no_create_edit': True}"/>
<field name="district_id" readonly="1" force_save="1" options="{'no_create': True, 'no_create_edit': True}" groups="!odex_benefit.group_benefit_manager"/>
<field name="zip" attrs="{'required':[('state','!=','draft')],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
<field name="short_number" />
@ -1026,8 +1028,8 @@
<field name="father_dead_country_id" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
</xpath>
<xpath expr="//field[@name='father_dead_city_id']" position="replace">
<field name="father_dead_city_id" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
<xpath expr="//field[@name='father_dead_res_city_id']" position="replace">
<field name="father_dead_res_city_id" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
</xpath>
<xpath expr="//field[@name='father_country_id']" position="replace">

View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
<record id="res_city_view_form" model="ir.ui.view">
<field name="name">inherit.res.city.form</field>
<field name="model">res.city</field>
<field name="arch" type="xml">
<form>
<sheet>
<group>
<group>
<field name="name"/>
</group>
<group>
<field name="country_id"/>
<field name="country_city_id"/>
</group>
</group>
</sheet>
</form>
</field>
</record>
<record id="res_city_view_form" 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="country_id"/>
<field name="country_city_id"/>
</tree>
</field>
</record>
</data>
</odoo>

View File

@ -822,7 +822,6 @@ msgid "Sponsorship"
msgstr ""
#. module: takaful_core
#: model:ir.model.fields,field_description:takaful_core.field_res_country_city__state_id
#: model:ir.model.fields,field_description:takaful_core.field_res_partner__state_id
#: model:ir.model.fields,field_description:takaful_core.field_res_users__state_id
#: model:ir.model.fields,field_description:takaful_core.field_takaful_bank_transfer_payment__state
@ -985,3 +984,8 @@ msgstr ""
#: model:ir.model.fields.selection,name:takaful_core.selection__res_partner__marital_status__divorced
msgid "مطلقة"
msgstr ""
#. module: takaful_core
#: model:ir.model.fields,field_description:takaful_core.field_res_country_city__state_id
msgid "State"
msgstr "المحافظة"