fix
This commit is contained in:
parent
67f3714921
commit
95068fa307
|
|
@ -228,11 +228,11 @@ class HrEmployee(models.Model):
|
|||
('other', 'Other'),
|
||||
], 'Certificate Level', default='other', groups="base.group_user", tracking=True)
|
||||
children = fields.Integer(string='Number of Children', groups="base.group_user", tracking=True)
|
||||
employee_cars_count = fields.Integer(compute="_compute_employee_cars_count", string="Cars",
|
||||
groups="base.group_user")
|
||||
|
||||
branch_name = fields.Many2one(related='department_id.branch_name', store=True, string="Branch Name")
|
||||
|
||||
'''employee_cars_count = fields.Integer(compute="_compute_employee_cars_count", string="Cars",
|
||||
groups="base.group_user")
|
||||
|
||||
def _compute_employee_cars_count(self):
|
||||
driver_ids = (self.mapped('user_id.partner_id') | self.sudo().mapped('address_home_id')).ids
|
||||
fleet_data = self.env['fleet.vehicle.assignation.log'].read_group(
|
||||
|
|
@ -243,7 +243,7 @@ class HrEmployee(models.Model):
|
|||
}
|
||||
for employee in self:
|
||||
drivers = employee.user_id.partner_id | employee.sudo().address_home_id
|
||||
employee.employee_cars_count = sum(mapped_data.get(pid, 0) for pid in drivers.ids)
|
||||
employee.employee_cars_count = sum(mapped_data.get(pid, 0) for pid in drivers.ids)'''
|
||||
|
||||
'''@api.onchange('emp_no')
|
||||
def onchang_barcode(self):
|
||||
|
|
|
|||
|
|
@ -3645,3 +3645,13 @@ msgstr "نوع رصيد الاجازة"
|
|||
#: model_terms:ir.ui.view,arch_db:hr_holidays_public.view_hr_holidays_filter2
|
||||
msgid "Branch"
|
||||
msgstr "الفرع"
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#: model_terms:ir.ui.view,arch_db:hr_holidays_public.hr_holidays_ext_form_view
|
||||
msgid "Delegated Access Groups"
|
||||
msgstr "مجموعات الوصول المفوضة"
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#: model_terms:ir.ui.view,arch_db:hr_holidays_public.hr_holidays_ext_form_view
|
||||
msgid "Delegated Departments"
|
||||
msgstr "الإدارات المفوضة"
|
||||
|
|
|
|||
|
|
@ -119,6 +119,15 @@
|
|||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
|
||||
<page string="Delegated Access Groups" groups="base.group_no_one"
|
||||
attrs="{'invisible':[('delegate_acc','=',False)]}">
|
||||
<field name="delegated_group_ids" string="Delegated Access Groups" readonly="1" />
|
||||
</page>
|
||||
<page string="Delegated Departments" groups="base.group_no_one"
|
||||
attrs="{'invisible':[('delegate_acc','=',False)]}">
|
||||
<field name="delegated_department_ids" string="Delegated Departments" readonly="1" />
|
||||
</page>
|
||||
|
||||
</notebook>
|
||||
</xpath>
|
||||
|
|
|
|||
Loading…
Reference in New Issue