fix
This commit is contained in:
parent
fe3633edae
commit
68141ac3ee
|
|
@ -5,8 +5,8 @@
|
|||
<field name="model_id" ref="model_hr_attendance_transaction"/>
|
||||
<field name="state">code</field>
|
||||
<field name="code">model.process_attendance_scheduler_queue()</field>
|
||||
<field name="interval_number">1</field>
|
||||
<field name="interval_type">days</field>
|
||||
<field name="interval_number">12</field>
|
||||
<field name="interval_type">hours</field>
|
||||
<field name="numbercall">-1</field>
|
||||
</record>
|
||||
</odoo>
|
||||
</odoo>
|
||||
|
|
|
|||
|
|
@ -3308,12 +3308,12 @@ msgstr "إخلاء طرف الموظف"
|
|||
#. module: employee_requests
|
||||
#: model:ir.model,name:employee_requests.model_employee_effective_form
|
||||
msgid "employee.effective.form"
|
||||
msgstr ""
|
||||
msgstr "مباشرة العمل"
|
||||
|
||||
#. module: employee_requests
|
||||
#: model:ir.model,name:employee_requests.model_employee_overtime_request
|
||||
msgid "employee.overtime.request"
|
||||
msgstr ""
|
||||
msgstr "العمل الاضافي"
|
||||
|
||||
#. module: employee_requests
|
||||
#: model:ir.model,name:employee_requests.model_house_allowance_advance
|
||||
|
|
|
|||
|
|
@ -21,16 +21,16 @@ class HrHolidaysStatus(models.Model):
|
|||
('exam', _('Exams')),
|
||||
('marriage', _('Marriage')),
|
||||
('death', _('Death')),
|
||||
('emergency', _('Emergency')), ])
|
||||
duration = fields.Integer()
|
||||
used_once = fields.Boolean(string='Used Once')
|
||||
('emergency', _('Emergency')), ], tracking=True)
|
||||
duration = fields.Integer(tracking=True)
|
||||
used_once = fields.Boolean(string='Used Once', tracking=True)
|
||||
emp_type = fields.Selection(selection=[('saudi', _('Saudi')),
|
||||
('other', _('Other')), ('displaced', _('Displaced Tribes')),
|
||||
('external', _('Outsource1')),
|
||||
('external2', _('Outsource2')), ('all', _('All'))])
|
||||
('external2', _('Outsource2')), ('all', _('All'))], tracking=True)
|
||||
gender = fields.Selection(selection=[('male', _('Male')),
|
||||
('female', _('Female')),
|
||||
('both', _('Both'))])
|
||||
('both', _('Both'))], tracking=True)
|
||||
contract_duration = fields.Selection(selection=[('12month', _('12 Months')),
|
||||
('24month', _('24 Months')),
|
||||
('all', _('All'))], string='Contract Duration')
|
||||
|
|
@ -38,9 +38,9 @@ class HrHolidaysStatus(models.Model):
|
|||
('yearly', 'Yearly'),
|
||||
('monthly', 'Monthly'),
|
||||
('daily', 'Daily')
|
||||
], string='Type of leave balance', default='daily')
|
||||
request_before = fields.Integer()
|
||||
minimum_duration = fields.Float()
|
||||
], string='Type of leave balance', default='daily', tracking=True)
|
||||
request_before = fields.Integer(tracking=True)
|
||||
minimum_duration = fields.Float(tracking=True)
|
||||
exit_return_permission = fields.Boolean()
|
||||
exit_return_permission_duration = fields.Integer()
|
||||
issuing_ticket = fields.Boolean()
|
||||
|
|
@ -48,10 +48,10 @@ class HrHolidaysStatus(models.Model):
|
|||
issuing_deliver_custody = fields.Boolean()
|
||||
issuing_loans_reconciliation = fields.Boolean()
|
||||
unpaid = fields.Boolean()
|
||||
mission_chick = fields.Boolean()
|
||||
attach_chick = fields.Boolean()
|
||||
alternative_chick = fields.Boolean(default=True)
|
||||
limit = fields.Boolean()
|
||||
mission_chick = fields.Boolean(tracking=True)
|
||||
attach_chick = fields.Boolean(tracking=True)
|
||||
alternative_chick = fields.Boolean(default=True,tracking=True)
|
||||
limit = fields.Boolean(tracking=True)
|
||||
'''color_name = fields.Selection(selection=[('red', _('Red')),
|
||||
('blue', _('Blue')),
|
||||
('light_green', _('light Green')),
|
||||
|
|
@ -75,14 +75,14 @@ class HrHolidaysStatus(models.Model):
|
|||
domain="[('special','!=',True),('rules_type','in',('salary','house'))]")
|
||||
leave_annual_type = fields.Selection(
|
||||
selection=[('open_balance', _('Opening Balance')), ('save_annual_year', _('Save Annual'))],
|
||||
string='Annual Type', default='open_balance')
|
||||
number_of_holidays_save_years = fields.Integer()
|
||||
number_of_save_days = fields.Integer()
|
||||
string='Annual Type', default='open_balance',tracking=True)
|
||||
number_of_holidays_save_years = fields.Integer(tracking=True)
|
||||
number_of_save_days = fields.Integer(tracking=True)
|
||||
|
||||
number_of_days = fields.Integer(default=90)
|
||||
number_of_years = fields.Integer()
|
||||
number_of_days = fields.Integer(default=90,tracking=True)
|
||||
number_of_years = fields.Integer(tracking=True)
|
||||
visible_fields = fields.Boolean()
|
||||
advance_request_years = fields.Integer()
|
||||
advance_request_years = fields.Integer(tracking=True)
|
||||
official_holidays = fields.Boolean(string='Include Official Holidays', default=True ,tracking=True)
|
||||
period_ticket = fields.Integer()
|
||||
include_weekend = fields.Boolean(string='Include Weekend', default=False)
|
||||
|
|
@ -90,16 +90,16 @@ class HrHolidaysStatus(models.Model):
|
|||
annual_holiday_id = fields.Many2one('hr.holidays.status', string='Related Annual Leave')
|
||||
type_unpaid = fields.Selection(selection=[('unpaid', _('Salary Only')),
|
||||
('termination', _('Salary and Termination'))])
|
||||
check_annual_holiday = fields.Boolean(string="Check annual holiday")
|
||||
remained_before = fields.Float(string="Remained Before")
|
||||
check_annual_holiday = fields.Boolean(string="Check annual holiday",tracking=True)
|
||||
remained_before = fields.Float(string="Remained Before",tracking=True)
|
||||
working_days = fields.Boolean(string='Working Days Only', default=False,tracking=True)
|
||||
sickness_severity = fields.Selection(selection=[('1', '1'),
|
||||
('2', '2'),
|
||||
('3', '3'),
|
||||
('4', '4'),
|
||||
], string='Sickness Severity')
|
||||
], string='Sickness Severity',tracking=True)
|
||||
not_balance_annual_leave = fields.Boolean(string="Not Balance Annual Leave")
|
||||
duration_ids = fields.One2many('holiday.status.duration', 'holiday_status_id', string="Duration")
|
||||
duration_ids = fields.One2many('holiday.status.duration', 'holiday_status_id', string="Duration",tracking=True)
|
||||
period_giving_balance = fields.Integer("Period of Giving Balance (Years)")
|
||||
unpaid_leave_days_per_period = fields.Integer("Maximum Unpaid Leave per Period (Days)")
|
||||
period_unpaid_leave = fields.Integer("Period of Maximum Unpaid Leave (Months)")
|
||||
|
|
|
|||
Loading…
Reference in New Issue