bakry
GitHub
commit
ee00790b82
|
|
@ -1215,6 +1215,12 @@ msgstr "المسمى الوظيفي"
|
|||
msgid "Journal Overtime"
|
||||
msgstr "دفتر اليومية"
|
||||
|
||||
#. module: attendences
|
||||
#: model:ir.model.fields,field_description:hr_base.field_resource_calendar__analytic_account_id
|
||||
#: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form
|
||||
msgid "Analytic Account"
|
||||
msgstr "الحساب التحليلي"
|
||||
|
||||
#. module: attendances
|
||||
#: model:ir.model.fields,field_description:attendances.field_attendance_action_reason____last_update
|
||||
#: model:ir.model.fields,field_description:attendances.field_attendance_attendance____last_update
|
||||
|
|
@ -2797,4 +2803,4 @@ msgstr ""
|
|||
#. module: attendances
|
||||
#: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
|
||||
msgid "وقت الدخول"
|
||||
msgstr ""
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -157,6 +157,8 @@
|
|||
<field name="journal_overtime_id" string="Journal Overtime"/>
|
||||
<field name="account_overtime_id" string="Account Overtime"
|
||||
attrs="{'invisible' : [('transfer_by_emp_type', '=', True)]}"/>
|
||||
<field name="analytic_account_id" string="Analytic Account"/>
|
||||
|
||||
|
||||
</group>
|
||||
<field name="account_ids" attrs="{'invisible' : [('transfer_by_emp_type', '=', False)]}">
|
||||
|
|
@ -289,6 +291,8 @@
|
|||
<field name="journal_overtime_id" string="Journal Overtime"/>
|
||||
<field name="account_overtime_id" string="Account Overtime"
|
||||
attrs="{'invisible' : [('transfer_by_emp_type', '=', True)]}"/>
|
||||
<field name="analytic_account_id" string="Analytic Account"/>
|
||||
|
||||
|
||||
</group>
|
||||
<field name="account_ids" attrs="{'invisible' : [('transfer_by_emp_type', '=', False)]}">
|
||||
|
|
|
|||
|
|
@ -210,6 +210,9 @@ class employee_overtime_request(models.Model):
|
|||
emp_type = record.employee_id.employee_type_id
|
||||
account_debit_id = record.employee_id.contract_id.working_hours.get_debit_overtim_account_id(emp_type)
|
||||
journal_id = record.employee_id.contract_id.working_hours.journal_overtime_id
|
||||
analytic_account_id = record.employee_id.contract_id.working_hours.analytic_account_id
|
||||
if not analytic_account_id:
|
||||
analytic_account_id = record.employee_id.department_id.analytic_account_id
|
||||
if not journal_id:
|
||||
raise exceptions.Warning(_('You Must Enter The Journal Name Overtim Setting.'))
|
||||
if not account_debit_id:
|
||||
|
|
@ -219,7 +222,8 @@ class employee_overtime_request(models.Model):
|
|||
'name': record.employee_id.name,
|
||||
'debit': record.price_hour,
|
||||
'account_id': account_debit_id.id,
|
||||
'partner_id': record.employee_id.user_id.partner_id.id
|
||||
'partner_id': record.employee_id.user_id.partner_id.id,
|
||||
'analytic_account_id': analytic_account_id.id,
|
||||
}
|
||||
credit_line_vals = {
|
||||
'name': record.employee_id.name,
|
||||
|
|
|
|||
|
|
@ -2734,3 +2734,9 @@ msgstr "المدير المباشر"
|
|||
#: model:ir.model.fields.selection,name:exp_official_mission.selection__hr_official_mission_type__approve_by__depart_manager
|
||||
msgid "HR Department"
|
||||
msgstr "الموارد البشرية"
|
||||
|
||||
#. module: exp_official_mission
|
||||
#: model:ir.model.fields,field_description:exp_official_mission.field_hr_official_mission_type__analytic_account_id
|
||||
#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_official_mission_type_form_view
|
||||
msgid "Analytic Account"
|
||||
msgstr "الحساب التحليلي"
|
||||
|
|
|
|||
|
|
@ -578,6 +578,10 @@ class HrOfficialMission(models.Model):
|
|||
emp_type = item.employee_id.employee_type_id
|
||||
account_debit_id = self.mission_type.get_debit_mission_account_id(emp_type)
|
||||
journal_id = self.mission_type.journal_id
|
||||
analytic_account_id = self.mission_type.analytic_account_id
|
||||
if not analytic_account_id:
|
||||
analytic_account_id = item.employee_id.department_id.analytic_account_id
|
||||
|
||||
if not journal_id:
|
||||
raise exceptions.Warning(_('You Must Enter The Journal Name Mission Type %s.')% self.mission_type.name)
|
||||
if not account_debit_id:
|
||||
|
|
@ -589,7 +593,8 @@ class HrOfficialMission(models.Model):
|
|||
'debit': item.amount,
|
||||
#'account_id': self.mission_type.account_id.id,
|
||||
'account_id': account_debit_id.id,
|
||||
'partner_id': item.employee_id.user_id.partner_id.id
|
||||
'partner_id': item.employee_id.user_id.partner_id.id,
|
||||
'analytic_account_id': analytic_account_id.id,
|
||||
}
|
||||
credit_line_vals = {
|
||||
'name': item.employee_id.name + ' in official mission "%s" ' % self.mission_type.name,
|
||||
|
|
@ -974,6 +979,7 @@ class HrOfficialMissionType(models.Model):
|
|||
allowance_id = fields.Many2many('hr.salary.rule')
|
||||
journal_id = fields.Many2one('account.journal')
|
||||
account_id = fields.Many2one('account.account')
|
||||
analytic_account_id = fields.Many2one(comodel_name='account.analytic.account')
|
||||
work_state = fields.Selection([('work', _('In work')),
|
||||
('Secondment', _('Secondment')),
|
||||
('legation', _('Legation')),
|
||||
|
|
|
|||
|
|
@ -89,6 +89,7 @@
|
|||
<field name="account_id" string="Account"
|
||||
attrs="{'required':[('related_with_financial','=',True),('transfer_by_emp_type', '=', False)],
|
||||
'invisible' : [('transfer_by_emp_type', '=', True)]}"/>
|
||||
<field name="analytic_account_id" string="Analytic Account"/>
|
||||
|
||||
</group>
|
||||
<field name="account_ids" attrs="{'invisible' : [('transfer_by_emp_type', '=', False)]}">
|
||||
|
|
|
|||
|
|
@ -2977,4 +2977,15 @@ msgstr "الترحيل حسب نوع الموظف"
|
|||
#. module: exp_payroll_custom
|
||||
#: model_terms:ir.ui.view,arch_db:exp_payroll_custom.hr_payslip_run_inherited_form_view
|
||||
msgid "Holiday Period"
|
||||
msgstr "فترة الإجازات"
|
||||
msgstr "فترة الإجازات"
|
||||
|
||||
#. module: exp_payroll_custom
|
||||
#: model:ir.model.fields,field_description:exp_payroll_custom.field_hr_payroll_structure__analytic_account_id
|
||||
#: model_terms:ir.ui.view,arch_db:exp_payroll_custom.salary_scale_form_view
|
||||
msgid "Analytic Account"
|
||||
msgstr "الحساب التحليلي"
|
||||
|
||||
#. module: exp_payroll_custom
|
||||
#: code:addons/exp_payroll_custom/models/hr_advance_payslip.py:0
|
||||
msgid "Sorry The Contract Employee %s is Not Journal Set"
|
||||
msgstr "للأسف، لم يتم اعداد دفتر اليومية لعقد الموظف %s."
|
||||
|
|
|
|||
|
|
@ -3019,11 +3019,15 @@ class HrPayslipRun(models.Model):
|
|||
res = []
|
||||
for v, items in grupos:
|
||||
new_items = list(items)
|
||||
analytic_account_id = None
|
||||
if round(sum(dicc['debit'] for dicc in new_items),2) > 0:
|
||||
analytic_account_id = self.salary_scale.analytic_account_id.id
|
||||
res.append({
|
||||
'name': v[0],
|
||||
'account_id': v[1],
|
||||
'debit': round(sum(dicc['debit'] for dicc in new_items),2),
|
||||
'credit': round(sum(dicc2['credit'] for dicc2 in new_items),2)
|
||||
'credit': round(sum(dicc2['credit'] for dicc2 in new_items),2),
|
||||
'analytic_account_id': analytic_account_id ,
|
||||
})
|
||||
return res
|
||||
|
||||
|
|
@ -3292,6 +3296,9 @@ class HrPayslipRun(models.Model):
|
|||
total_list = []
|
||||
move_vals = dict()
|
||||
journal = line.contract_id.journal_id
|
||||
if not journal:
|
||||
raise exceptions.Warning(
|
||||
_('Sorry The Contract Employee %s is Not Journal Set') % line.employee_id.name)
|
||||
for l in line.allowance_ids:
|
||||
amount_allow = l.total
|
||||
# account = l.salary_rule_id.rule_debit_account_id
|
||||
|
|
|
|||
|
|
@ -28,6 +28,10 @@ class HrSalaryScale(models.Model):
|
|||
|
||||
salary_scale_id = fields.Many2one('hr.payroll.structure', string='Salary Scale', index=True) # salary scale
|
||||
|
||||
#Percentage_increase = fields.Float('Percentage Increase %',default=0.05)
|
||||
|
||||
analytic_account_id = fields.Many2one(comodel_name='account.analytic.account')
|
||||
|
||||
# Override Function
|
||||
|
||||
def get_all_rules(self):
|
||||
|
|
|
|||
|
|
@ -73,6 +73,8 @@
|
|||
<field name="end_date" attrs="{'invisible':[('type', '!=', 'scale')]}"/>
|
||||
<field name="transfer_type"
|
||||
attrs="{'invisible':[('type', '!=', 'scale')], 'required': [('type','=','scale')]}"/>
|
||||
<field name="analytic_account_id" string="Analytic Account"
|
||||
attrs="{'invisible':[('type', '!=', 'scale')]}"/>
|
||||
<field name="groups_number" attrs="{'invisible':[('type', '!=', 'level')]}"
|
||||
required="1"/>
|
||||
<field name="degree_number" required="1" attrs="{'invisible':[('type', '!=', 'group')]}"/>
|
||||
|
|
|
|||
|
|
@ -4801,12 +4801,12 @@ msgid "Transfer By Emp Type"
|
|||
msgstr "ترحيل حسب نوع الموظف"
|
||||
|
||||
#. module: hr_base
|
||||
#: model:ir.model.fields,field_description:hr_base.field_hr.overtim.accounts__emp_type_id
|
||||
#: model:ir.model.fields,field_description:hr_base.field_hr_overtim_accounts__emp_type_id
|
||||
msgid "Employee Type"
|
||||
msgstr "نوع الموظف"
|
||||
|
||||
#. module: hr_base
|
||||
#: model:ir.model.fields,field_description:hr_base.field_hr.overtim.accounts__debit_account_id
|
||||
#: model:ir.model.fields,field_description:hr_base.field_hr_overtim_accounts__debit_account_id
|
||||
msgid "Debit Account"
|
||||
msgstr "بند الصرف"
|
||||
|
||||
|
|
|
|||
|
|
@ -846,6 +846,7 @@ class HrAttendances(models.Model):
|
|||
|
||||
journal_overtime_id = fields.Many2one('account.journal')
|
||||
account_overtime_id = fields.Many2one('account.account')
|
||||
analytic_account_id = fields.Many2one(comodel_name='account.analytic.account')
|
||||
|
||||
transfer_by_emp_type = fields.Boolean('Transfer By Emp Type')
|
||||
account_ids = fields.One2many('hr.overtim.accounts', 'overtim_id')
|
||||
|
|
|
|||
|
|
@ -3837,3 +3837,15 @@ msgstr ""
|
|||
" <p>تحياتي,</p>\n"
|
||||
" \n"
|
||||
" "
|
||||
|
||||
#. module: hr_contract_custom
|
||||
#: model:ir.model.fields,field_description:hr_contract_custom.field_hr_contract__last_salary_gosi
|
||||
#, python-format
|
||||
msgid "Last Salary Gosi"
|
||||
msgstr "آخر راتب للتأمينات"
|
||||
|
||||
#. module: hr_contract_custom
|
||||
#: model:ir.model.fields,help:hr_contract_custom.field_hr_contract__last_salary_gosi
|
||||
#, python-format
|
||||
msgid "The Last Salary Gosi After The Age 50 Years."
|
||||
msgstr "آخر راتب في التأمينات الاجتماعية بعد سن الخمسين"
|
||||
|
|
|
|||
|
|
@ -328,6 +328,8 @@ class Contract(models.Model):
|
|||
|
||||
check_nationality = fields.Boolean(related='employee_id.check_nationality', store=True, string="Saudi?")
|
||||
|
||||
last_salary_gosi = fields.Float(string='Last Salary Gosi', help='The Last Salary Gosi After The Age 50 Years.')
|
||||
|
||||
|
||||
def _get_employee_dependant_count(self):
|
||||
for rec in self:
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@
|
|||
<field name="salary" required="1" attrs="{'readonly':[('state','!=','draft')]}"/>
|
||||
<field name="salary_insurnce" attrs="{'readonly':[('state','!=','draft')]}"/>
|
||||
<field name="ticket_allowance" attrs="{'readonly':[('state','!=','draft')]}" />
|
||||
<field name="last_salary_gosi" attrs="{'readonly':[('state','!=','draft')]}"/>
|
||||
<field name="has_housing" attrs="{'readonly':[('state','!=','draft')]}"/>
|
||||
<field name="has_transportation" attrs="{'readonly':[('state','!=','draft')]}"/>
|
||||
<!--field name="suspended" attrs="{'readonly':[('state','!=','draft')]}"/>
|
||||
|
|
|
|||
|
|
@ -1832,17 +1832,14 @@ class HRHolidays(models.Model):
|
|||
microsecond=0)
|
||||
if self.holiday_status_id.include_weekend:
|
||||
self.include_weekend()
|
||||
if self.date_to:
|
||||
self.date_to = False
|
||||
self.number_of_days_temp = False
|
||||
self.date_on = True
|
||||
self.set_date()
|
||||
|
||||
'''@api.onchange('date_from')
|
||||
@api.onchange('date_from')
|
||||
def _onchange_date_from_2(self):
|
||||
if self.date_to:
|
||||
self.date_to = False
|
||||
self.number_of_days_temp = False'''
|
||||
self.number_of_days_temp = False
|
||||
|
||||
@api.onchange('date_to')
|
||||
def _onchange_date_to(self):
|
||||
|
|
|
|||
Loading…
Reference in New Issue