Merge pull request #2356 from expsa/Esraa-Ensan-hr-tasks
HR Notes in employee record + employee reward+ permissions menu
This commit is contained in:
commit
7a2e870272
|
|
@ -36,8 +36,11 @@
|
|||
|
||||
<menuitem
|
||||
id="menu_view_permission_types"
|
||||
name="Permission Types"
|
||||
action="action_permission_types"
|
||||
parent="hr.hr_menu_configuration"/>
|
||||
sequence="1"
|
||||
parent="hr.menu_human_resources_configuration"/>
|
||||
|
||||
|
||||
</data>
|
||||
</odoo>
|
||||
|
|
|
|||
|
|
@ -2959,3 +2959,9 @@ msgstr "للأسف إسم الخصم %s ليس لديه إعدادات حساب
|
|||
msgid "Sorry The Loan %s is Not account Set"
|
||||
msgstr "للأسف إسم السلفة %s ليس لديها إعدادات حسابات"
|
||||
|
||||
#. module: exp_payroll_custom
|
||||
#: code:addons/exp_payroll_custom/models/employee_reward.py:0
|
||||
#, python-format
|
||||
msgid "Add Employees to Reward"
|
||||
msgstr "إضافة موظفين للمكافأة و مستحقات الموظفين"
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ class EmployeeReward(models.Model):
|
|||
ctx['default_employee_id'] = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
|
||||
|
||||
return {
|
||||
'name': 'Add Employees to Reward',
|
||||
'name': _('Add Employees to Reward'),
|
||||
'view_mode': 'form',
|
||||
'res_model': 'employee.selection.wizard',
|
||||
'type': 'ir.actions.act_window',
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
<button string="Add Employees" type="object" name="action_add_employees"
|
||||
class="oe_highlight"
|
||||
groups="hr.group_hr_user, hr.group_hr_manager"/>
|
||||
groups="hr.group_hr_user, hr.group_hr_manager" attrs="{'invisible':[('state','!=','draft')]}"/>
|
||||
|
||||
<button string="Refuse" type="object" name="action_refuse"
|
||||
states="submitted,hrm"
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ class EmployeeSelectionWizard(models.TransientModel):
|
|||
'domain': {
|
||||
'employee_ids': [
|
||||
('id', 'not in', self.employee_ids.ids),
|
||||
('state','=','open'),
|
||||
('active', '=', True)
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,4 +28,5 @@ from . import hr_employee_attachments
|
|||
from . import resource
|
||||
from . import assets_document
|
||||
from . import hr_department
|
||||
from . import res_partner
|
||||
from . import res_users
|
||||
|
|
|
|||
|
|
@ -597,6 +597,8 @@ class HrEmployee(models.Model):
|
|||
'default_phone': self.work_phone,
|
||||
'default_mobile': self.mobile_phone,
|
||||
'default_login': self.work_email,
|
||||
'default_password': self.work_email,
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
from odoo import api, fields, models
|
||||
from lxml import etree
|
||||
|
||||
|
||||
class ResPartner(models.Model):
|
||||
_inherit = 'res.partner'
|
||||
|
||||
signup_token = fields.Char(copy=False,groups=False)
|
||||
signup_type = fields.Char(string='Signup Token Type', copy=False, groups=False)
|
||||
signup_expiration = fields.Datetime(copy=False, groups=False)
|
||||
|
||||
|
|
@ -480,7 +480,7 @@
|
|||
<field name="model_id" ref="model_hr_employee"/>
|
||||
<field name="binding_model_id" ref="model_hr_employee"/>
|
||||
<field name="binding_view_types">form</field>
|
||||
<field name="groups_id" eval="[(4, ref('base.group_erp_manager'))]"/>
|
||||
<field name="groups_id" eval="[(4, ref('hr.group_hr_user'))]"/>
|
||||
<field name="state">code</field>
|
||||
<field name="code">
|
||||
action = records.action_create_user()
|
||||
|
|
|
|||
Loading…
Reference in New Issue