Merge pull request #4297 from expsa/younes_dev_odex25_ensan

[IMP] benefit
This commit is contained in:
kchyounes19 2025-08-24 10:15:16 +01:00 committed by GitHub
commit 9e08040194
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 55 additions and 80 deletions

View File

@ -2644,10 +2644,26 @@ msgstr ""
#: model:ir.model.fields.selection,name:odex_benefit.selection__food_basket_line__donation_type__both
#: model:ir.model.fields.selection,name:odex_benefit.selection__payment_collection_line__donation_type__both
#: model:ir.model.fields.selection,name:odex_benefit.selection__receive_food_basket__donation_method__both
#: model_terms:ir.ui.view,arch_db:odex_benefit.committees_search_view
#, python-format
msgid "Both"
msgstr "مشترك"
#. module: odex_benefit
#: model:ir.actions.act_window,name:odex_benefit.action_social_search_committees
msgid "Social Research Committees"
msgstr "فرق البحث الاجتماعي"
#. module: odex_benefit
#: model:ir.ui.menu,name:odex_benefit.social_search_committees_menu
msgid "Social Research Teams"
msgstr "فرق البحث الاجتماعي"
#. module: odex_benefit
#: model:ir.ui.menu,name:odex_benefit.social_search_settings_menu
msgid "Social Search Settings"
msgstr "إعدادات البحث الاجتماعي"
#. module: odex_benefit
#: model:ir.model.fields,field_description:odex_benefit.field_benefits_representative__message_bounce
#: model:ir.model.fields,field_description:odex_benefit.field_external_benefits__message_bounce
@ -3051,11 +3067,6 @@ msgstr ""
msgid "Commercial Record Code"
msgstr ""
#. module: odex_benefit
#: model:ir.ui.menu,name:odex_benefit.social_search_men
msgid "Committees Men"
msgstr "فرق البحث الرجالية"
#. module: odex_benefit
#: model:ir.model.fields.selection,name:odex_benefit.selection__receive_appliances_furniture__donation_method__communication
msgid "Communication"
@ -8001,8 +8012,9 @@ msgstr "تاريخ بداية العضوية"
#. module: odex_benefit
#: model:ir.model.fields.selection,name:odex_benefit.selection__committees_line__type__male
#: model_terms:ir.ui.view,arch_db:odex_benefit.committees_search_view
msgid "Men"
msgstr ""
msgstr "رجال"
#. module: odex_benefit
#: model:ir.model.fields,field_description:odex_benefit.field_visit_location__message
@ -11642,6 +11654,7 @@ msgstr ""
#: model:ir.model.fields,field_description:odex_benefit.field_benefit_behaviors_type__type
#: model:ir.model.fields,field_description:odex_benefit.field_committees_line__type
#: model:ir.model.fields,field_description:odex_benefit.field_visit_location__benefit_type
#: model_terms:ir.ui.view,arch_db:odex_benefit.committees_search_view
msgid "Type"
msgstr "النوع"
@ -12496,7 +12509,7 @@ msgstr ""
#. module: odex_benefit
#: model:ir.model.fields.selection,name:odex_benefit.selection__rooms_categories__gender__both
msgid "both"
msgstr ""
msgstr "مشترك"
#. module: odex_benefit
#: model:ir.model.fields.selection,name:odex_benefit.selection__benefit_food_basket__state__calculation
@ -12592,41 +12605,16 @@ msgstr ""
msgid "committees"
msgstr ""
#. module: odex_benefit
#: model:ir.ui.menu,name:odex_benefit.social_search_women
msgid "committees Women"
msgstr "فرق البحث النسائية"
#. module: odex_benefit
#: model:ir.ui.menu,name:odex_benefit.social_search_combined
msgid "committees combined"
msgstr "فرق البحث المشتركة"
#. module: odex_benefit
#: model:ir.model,name:odex_benefit.model_committees_line
msgid "committees.line"
msgstr "فرق البحث"
#. module: odex_benefit
#: model:ir.actions.act_window,name:odex_benefit.committees_combined_action
msgid "committees_combined_action"
msgstr "فرق البحث المشتركة"
#. module: odex_benefit
#: model_terms:ir.ui.view,arch_db:odex_benefit.committees_view_form
msgid "committees_form"
msgstr ""
#. module: odex_benefit
#: model:ir.actions.act_window,name:odex_benefit.committees_men_action
msgid "committees_men_action"
msgstr "فرق البحث الرجالية"
#. module: odex_benefit
#: model:ir.actions.act_window,name:odex_benefit.committees_women_action
msgid "committees_women_action"
msgstr "فرق البحث النسائية"
#. module: odex_benefit
#: model_terms:ir.ui.view,arch_db:odex_benefit.benefit_receive_zkat_form
#: model_terms:ir.ui.view,arch_db:odex_benefit.receive_food_basket_form
@ -13825,7 +13813,12 @@ msgstr "مع الأقارب"
#. module: odex_benefit
#: model:ir.model.fields.selection,name:odex_benefit.selection__committees_line__type__female
msgid "women"
msgstr ""
msgstr "نساء"
#. module: odex_benefit
#: model_terms:ir.ui.view,arch_db:odex_benefit.committees_search_view
msgid "Women"
msgstr "نساء"
#. module: odex_benefit
#: model:ir.model.fields,field_description:odex_benefit.field_zkat_line__uint

View File

@ -9,7 +9,7 @@
<field name="view_mode">kanban,form,tree,activity,google_map</field>
<!-- <field name="domain">[('state','=','draft')]-->
<!-- </field>-->
<field name="context">{'is_benefit': True}</field>
<field name="context">{'is_benefit': True,'search_default_state': 1}</field>
<field name="help" type="html">
<p class="oe_view_nocontent_create">Create the Benefit
</p>
@ -74,37 +74,12 @@
<field name="domain">[('state','in',['not_leaving','black_list'])]
</field>
</record>
<!-- committees.line-->
<!-- البحث الاجتماعي -->
<!-- 1-اللجان الرجالية -->
<record id="committees_men_action" model="ir.actions.act_window">
<field name="name">committees_men_action</field>
<!-- committees.line البحث الاجتماعي -->
<record id="action_social_search_committees" model="ir.actions.act_window">
<field name="name">Social Research Committees</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">committees.line</field>
<!-- <field name="view_type">form</field>-->
<field name="view_mode">tree,form</field>
<field name="context">{'default_type': 'male'}</field>
<field name="domain">[('type', '=', 'male')]</field>
</record>
<!-- 2-اللجان النسائية-->
<record id="committees_women_action" model="ir.actions.act_window">
<field name="name">committees_women_action</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">committees.line</field>
<!-- <field name="view_type">form</field>-->
<field name="view_mode">tree,form</field>
<field name="context">{'default_type': 'female'}</field>
<field name="domain">[('type', '=', 'female')]</field>
</record>
<!-- 3-اللجان المشتركة-->
<record id="committees_combined_action" model="ir.actions.act_window">
<field name="name">committees_combined_action</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">committees.line</field>
<!-- <field name="view_type">form</field>-->
<field name="view_mode">tree,form</field>
<field name="context">{'default_type': 'both'}</field>
<field name="domain">[('type', '=', 'both')]</field>
</record>
<record id="changes_requests_action" model="ir.actions.act_window">
@ -811,27 +786,17 @@
<!-- parent="benefit_main_menu" action="grant_benefit_black_list_action"/>-->
<!--<===============================================================================>-->
<!--social search-->
<!--اللجان-->
<menuitem id="social_search_settings_menu" name="Social Search Settings" parent="odex_benefit.benefit_tools" sequence="4"/>
<menuitem id='social_search_committees_menu' name='Social Research Teams' parent='social_search_settings_menu' action="action_social_search_committees" sequence="1"/>
<!--البحث الاجتماعي-->
<!-- اللجان الرجالية-->
<menuitem id='social_search_men' name='Committees Men' parent='social_search_menu'
action="committees_men_action"
sequence="1"/>
<!-- اللجان النسائية-->
<menuitem id='social_search_women' name='committees Women' parent='social_search_menu'
action="committees_women_action"
sequence="2"/>
<!-- اللجان المشتركة-->
<!--combined-->
<menuitem id='social_search_combined' name='committees combined' parent='social_search_menu'
action="committees_combined_action"
sequence="3"/>
<menuitem id="visits_menu" name="Visits" parent="social_search_menu"
action="visits_action" sequence="4"/>
<menuitem id='changes_requests_men' name='Changes Requests' parent='social_search_menu'
action="changes_requests_action"
sequence="4"/>
sequence="5"/>
<!-- <menuitem id="benefit_generate_needs" name="needs Screen" parent="benefits_root_menu"-->
<!-- action="benefit_benefits_needs_action_2" sequence="5"/>-->
<menuitem id="visits_menu" name="Visits" parent="social_search_menu"
action="visits_action" sequence="5"/>
<!-- <menuitem id='benefit_report' name='Reports' parent='benefits_root_menu'-->
<!-- sequence="6"/>-->
<!-- <menuitem id="benefit_reports" name="Generate report" parent="benefits_root_menu"-->

View File

@ -21,7 +21,7 @@
<sheet>
<group>
<field name="name"/>
<field name="type" invisible="1"/>
<field name="type"/>
<field name="employee_id"/>
<field name="branch_custom_id"/>
</group>
@ -32,6 +32,23 @@
</form>
</field>
</record>
<record id="committees_search_view" model="ir.ui.view">
<field name="name">committees.line.search</field>
<field name="model">committees.line</field>
<field name="arch" type="xml">
<search>
<field name="name"/>
<field name="type"/>
<group string="Group By">
<filter string="Type" name="type" context="{'group_by': 'type'}"/>
</group>
<separator/>
<filter string="Men" name="male" domain="[('type','=','male')]"/>
<filter string="Women" name="female" domain="[('type', '=', 'female')]"/>
<filter string="Both" name="both" domain="[('type', '=', 'both')]"/>
<separator/>
</search>
</field>
</record>
</data>
</odoo>