Merge pull request #1141 from expsa/report_master

Report master
This commit is contained in:
zainab2097 2024-09-15 12:31:42 +03:00 committed by GitHub
commit 7f062134de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 1 deletions

View File

@ -76,6 +76,7 @@ class Entity(models.Model):
job_title_id = fields.Many2one(comodel_name='hr.job', string='Job Title') job_title_id = fields.Many2one(comodel_name='hr.job', string='Job Title')
need_approve = fields.Boolean(string='Need Aprove') need_approve = fields.Boolean(string='Need Aprove')
executive_direction = fields.Boolean(string='Executive direction') executive_direction = fields.Boolean(string='Executive direction')
is_branch = fields.Boolean(string='Is Branch?')
is_secret = fields.Boolean(string='Is Secret') is_secret = fields.Boolean(string='Is Secret')
person_id = fields.Char(string='Person ID') person_id = fields.Char(string='Person ID')
person_id_issue_date = fields.Date(string='Person ID Issue Date') person_id_issue_date = fields.Date(string='Person ID Issue Date')

View File

@ -15,7 +15,7 @@
} }
.header-section { .header-section {
position: absolute; position: absolute;
top: 50px; top: 5px;
left: 30px; left: 30px;
width: 80%; width: 80%;
} }

View File

@ -31,6 +31,7 @@
<field name="code" attrs="{'readonly': [('type','in',['employee','external'])]}"/> <field name="code" attrs="{'readonly': [('type','in',['employee','external'])]}"/>
<field name="parent_id" <field name="parent_id"
attrs="{'required':[('type', 'in', ['employee'])],'invisible': [('type','in',['external'])]}"/> attrs="{'required':[('type', 'in', ['employee'])],'invisible': [('type','in',['external'])]}"/>
<field name="is_branch"/>
<field name="executive_direction" <field name="executive_direction"
attrs="{'invisible': [('type','in',['employee','external'])]}"/> attrs="{'invisible': [('type','in',['employee','external'])]}"/>
<field name="need_approve" <field name="need_approve"
@ -88,10 +89,14 @@
<filter name="Employee" string="Employee" domain="[('type','=','employee')]"/> <filter name="Employee" string="Employee" domain="[('type','=','employee')]"/>
<filter name="Internal Unit" string="Internal Unit" domain="[('type','=','unit')]"/> <filter name="Internal Unit" string="Internal Unit" domain="[('type','=','unit')]"/>
<filter name="External Unit" string="External Unit" domain="[('type','=','external')]"/> <filter name="External Unit" string="External Unit" domain="[('type','=','external')]"/>
<filter name="Is Branch" string="Is Branch" domain="[('is_branch','=',True)]"/>
<filter name="NOT Branch" string="NOT Branch" domain="[('is_branch','=',False)]"/>
<group expand="1" string="Group By"> <group expand="1" string="Group By">
<filter string="Type" name="type" domain="[]" context="{'group_by':'type'}"/> <filter string="Type" name="type" domain="[]" context="{'group_by':'type'}"/>
<filter string="Parent Entity" name="parent_type" domain="[]" <filter string="Parent Entity" name="parent_type" domain="[]"
context="{'group_by':'parent_id'}"/> context="{'group_by':'parent_id'}"/>
<filter string="Is Branch" name="group_by_is_branch" domain="[('is_branch', '=', True)]" context="{'group_by':'is_branch'}"/>
<filter string="Not Branch" name="group_by_noy_is_branch" domain="[('is_branch', '=', False)]" context="{'group_by':'is_branch'}"/>
</group> </group>
</search> </search>
</field> </field>