Merge pull request #6249 from expsa/samir_aladawi_fix_branch_manager
[FIX] odex_takaful
This commit is contained in:
commit
6b31562d18
|
|
@ -37,12 +37,12 @@
|
|||
'views/assets.xml',
|
||||
'views/res_config_settings.xml',
|
||||
'wizards/orphan_replacement_wizard.xml',
|
||||
'views/family_member.xml',
|
||||
'views/takaful_sponorship_view.xml',
|
||||
'views/donation_item_views.xml',
|
||||
'views/replacement_reasons_views.xml',
|
||||
'views/replacement_process_views.xml',
|
||||
'views/benefit_views.xml',
|
||||
'views/family_member.xml',
|
||||
|
||||
'views/takaful_contribution_view.xml',
|
||||
'views/sponsorship_payment_view.xml',
|
||||
|
|
|
|||
|
|
@ -112,6 +112,8 @@
|
|||
<field name="name">family.member.tree.inherit</field>
|
||||
<field name="model">family.member</field>
|
||||
<field name="inherit_id" ref="odex_benefit.family_member_tree"/>
|
||||
<field name="mode">primary</field>
|
||||
<field name="active">False</field>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='member_status']" position="after">
|
||||
<field name="kafala_status" widget="badge"
|
||||
|
|
|
|||
|
|
@ -690,14 +690,15 @@
|
|||
<page string="Orphans and Widows List"
|
||||
attrs="{'invisible': ['|',('sponsorship_type', '!=', 'group'), ('hide_beneficiary_group', '=', True)]}">
|
||||
<!-- attrs="{'invisible': ['|', '|', '|', ('hide_beneficiary_group','=', True), ('parent.record_type','!=','sponsorship'), ('sponsorship_type', '!=', 'group'), ('benefit_type', '!=', 'both')]}">-->
|
||||
<field name="benefit_ids" nolabel="1" options="{'no_create': True}" context="{'group_by': 'benefit_group'}">
|
||||
<tree editable="bottom">
|
||||
<field name="benefit_group" invisible="1"/>
|
||||
<field name="name"/>
|
||||
<field name="age"/>
|
||||
<field name="member_status"/>
|
||||
</tree>
|
||||
</field>
|
||||
<field name="benefit_ids" nolabel="1" options="{'no_create': True}"
|
||||
context="{'group_by': 'benefit_group', 'tree_view_ref': 'odex_takaful.view_family_member_tree_inherit'}">
|
||||
<tree editable="bottom">
|
||||
<field name="benefit_group" invisible="1"/>
|
||||
<field name="name"/>
|
||||
<field name="age"/>
|
||||
<field name="member_status"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
<page string="Beneficiary Filters" autofocus="false"
|
||||
invisible="1">
|
||||
|
|
|
|||
Loading…
Reference in New Issue