Merge pull request #1618 from expsa/ensan_tasks_19_10

Ensan tasks 19 10
This commit is contained in:
enagahh 2024-10-24 15:32:48 +03:00 committed by GitHub
commit da4fbfd545
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 492 additions and 291 deletions

File diff suppressed because it is too large Load Diff

View File

@ -613,7 +613,7 @@ class RelationSettings(models.Model):
class AttachmentsSettings(models.Model):
_name = 'attachments.settings'
_description = "Attachments Settings"
_order = 'family_appearance_seq,member_appearance_seq asc'
_order = 'family_appearance_seq,member_appearance_seq,income_appearance_seq asc'
name = fields.Char(string='name')
hobby_id = fields.Many2one('hobbies.settings',string='Hobbies')
@ -626,6 +626,7 @@ class AttachmentsSettings(models.Model):
is_default = fields.Boolean(string='Is Default?')
family_appearance_seq = fields.Integer(string='Appearance Sequence')
member_appearance_seq = fields.Integer(string='Appearance Sequence')
income_appearance_seq = fields.Integer(string='Appearance Sequence')
class EducationIlliterateReason(models.Model):
_name = 'education.illiterate.reason'

View File

@ -994,8 +994,9 @@
<group>
<field name="name"/>
<field name="attach_type"/>
<field name="family_appearance_seq" attrs="{'invisible':[('attach_type','=','member_attach')]}"/>
<field name="member_appearance_seq" attrs="{'invisible':[('attach_type','=','family_attach')]}"/>
<field name="family_appearance_seq" attrs="{'invisible':[('attach_type','!=','family_attach')]}"/>
<field name="member_appearance_seq" attrs="{'invisible':[('attach_type','!=','member_attach')]}"/>
<field name="income_appearance_seq" attrs="{'invisible':[('attach_type','!=','income_attach')]}"/>
<!-- <field name="hobby_id"/>-->
<!-- <field name="diseases_id"/>-->
<!-- <field name="disabilities_id"/>-->