fix notification attendance time format
This commit is contained in:
parent
feaa0f7609
commit
7775664383
|
|
@ -142,6 +142,8 @@
|
|||
<field name="overtime_factor_daily"/>
|
||||
<field name="overtime_factor_holiday"/>
|
||||
<field name="max_overtime_hour"/>
|
||||
<field name="request_after_day" groups="hr.group_hr_manager,hr.group_hr_user"/>
|
||||
|
||||
</group>
|
||||
<group string="Overtime Accounts Settings" >
|
||||
<field name="journal_overtime_id" string="Journal Overtime"/>
|
||||
|
|
@ -255,6 +257,8 @@
|
|||
<field name="overtime_factor_daily"/>
|
||||
<field name="overtime_factor_holiday"/>
|
||||
<field name="max_overtime_hour"/>
|
||||
<field name="request_after_day" groups="hr.group_hr_manager,hr.group_hr_user"/>
|
||||
|
||||
</group>
|
||||
<group string="Overtime Accounts Settings" >
|
||||
<field name="journal_overtime_id" string="Journal Overtime"/>
|
||||
|
|
|
|||
|
|
@ -3957,3 +3957,11 @@ msgstr "ساعات شهرية"
|
|||
#, python-format
|
||||
msgid "Date To must be on the same day as Date From."
|
||||
msgstr "يجب أن يكون يوم تاريخ البداية هو نفسه يوم تاريخ النهاية."
|
||||
|
||||
#. module: employee_requests
|
||||
#: code:addons/employee_requests/models/employee_overtime_request.py:0
|
||||
#, python-format
|
||||
msgid "Sorry, Cannot Be Request after %s Days From The End Of The Overtime Month"
|
||||
msgstr "للأسف,لا يمكن طلب العمل الإضافى بعد أكثر من %s يوم من نهاية شهر العمل الأضافي"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ from datetime import datetime
|
|||
|
||||
from odoo import models, fields, api, _, exceptions
|
||||
from odoo.exceptions import UserError
|
||||
import calendar
|
||||
|
||||
# import logging
|
||||
|
||||
|
|
@ -63,6 +64,21 @@ class employee_overtime_request(models.Model):
|
|||
if self.employee_id:
|
||||
self.department_id = self.employee_id.department_id.id
|
||||
|
||||
@api.onchange('request_date','date_from')
|
||||
def chick_date_request(self):
|
||||
for rec in self:
|
||||
days_after = rec.employee_id.contract_id.working_hours.request_after_day
|
||||
if days_after > 0 and rec.date_from:
|
||||
rec.date_to=False
|
||||
date_from = datetime.strptime(str(rec.date_from), "%Y-%m-%d").date()
|
||||
request_date = datetime.strptime(str(rec.request_date), "%Y-%m-%d").date()
|
||||
last_day_date = date_from.replace(day=calendar.monthrange(date_from.year, date_from.month)[1])
|
||||
diff_days = (request_date - last_day_date).days
|
||||
if diff_days > days_after:
|
||||
raise exceptions.Warning(_(
|
||||
'Sorry, Cannot Be Request after %s Days From The End Of The Overtime Month') % days_after)
|
||||
|
||||
|
||||
#get account and journal from setting
|
||||
@api.onchange('transfer_type','employee_id')
|
||||
def get_account_ids(self):
|
||||
|
|
|
|||
|
|
@ -78,8 +78,7 @@
|
|||
</group>
|
||||
<group>
|
||||
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
|
||||
<field name="request_date" string="Request Date" required="1"
|
||||
attrs="{'readonly':[('state','!=','draft')]}"/>
|
||||
<field name="request_date" string="Request Date" required="1" readonly="1"/>
|
||||
<field name="department_id" string="Department" attrs="{'readonly':[('state','not in',('submit','draft'))]}"/>
|
||||
|
||||
<field name="overtime_plase" string="Overtime Plase" attrs="{'readonly':[('state','!=','draft')]}" required="1"/>
|
||||
|
|
|
|||
|
|
@ -2976,6 +2976,11 @@ msgstr "متزوج"
|
|||
msgid "Max Overtime Hour"
|
||||
msgstr "اقصي عدد ساعات"
|
||||
|
||||
#. module: hr_base
|
||||
#: model:ir.model.fields,field_description:hr_base.field_resource_calendar__request_after_day
|
||||
msgid "Request After Day"
|
||||
msgstr "الطلب بعد"
|
||||
|
||||
#. module: hr_base
|
||||
#: model:ir.model.fields,field_description:hr_base.field_hr_employee__medical_class
|
||||
msgid "Medical Class"
|
||||
|
|
|
|||
|
|
@ -821,6 +821,7 @@ class HrAttendances(models.Model):
|
|||
overtime_factor_daily = fields.Float(string="Overtime Factor Daily")
|
||||
overtime_factor_holiday = fields.Float(string="Overtime Factor Holiday")
|
||||
max_overtime_hour = fields.Integer()
|
||||
request_after_day = fields.Integer(string='Request After Day')
|
||||
|
||||
journal_overtime_id = fields.Many2one('account.journal',domain=[('type', '=', 'general')])
|
||||
account_overtime_id = fields.Many2one('account.account')
|
||||
|
|
|
|||
|
|
@ -572,6 +572,7 @@
|
|||
<field name="overtime_factor_daily"/>
|
||||
<field name="overtime_factor_holiday"/>
|
||||
<field name="max_overtime_hour"/>
|
||||
<field name="request_after_day" groups="hr.group_hr_manager,hr.group_hr_user"/>
|
||||
</group>
|
||||
</page>
|
||||
</xpath>
|
||||
|
|
|
|||
Loading…
Reference in New Issue