ahmed odex hr
This commit is contained in:
ahmed-nouri051
parent
1a9df050ee
commit
dce828f1d7
|
|
@ -1561,8 +1561,8 @@ msgstr "نوع الموظف"
|
|||
#: code:addons/hr_contract_custom/models/hr_contract.py:0
|
||||
#: model:ir.model.fields,field_description:hr_contract_custom.field_hr_contract__emp_type
|
||||
#, python-format
|
||||
msgid "Holiday Type"
|
||||
msgstr "ترصيد الاجازة"
|
||||
msgid "Annual Leave Entitlement"
|
||||
msgstr "الاستحقاق السنوي للاجازة"
|
||||
|
||||
#. module: hr_contract_custom
|
||||
#: model:ir.actions.server,name:hr_contract_custom.contracts_mail_reminder_ir_actions_server
|
||||
|
|
|
|||
|
|
@ -263,7 +263,7 @@ class Contract(models.Model):
|
|||
('other', _('Holiday2')),
|
||||
('displaced', _('Holiday3')),
|
||||
('external', _('Holiday4')),
|
||||
('external2', _('Other'))], _('Holiday Type'), tracking=True)
|
||||
('external2', _('Other'))], _('Annual Leave Entitlement'), tracking=True)
|
||||
appraisal = fields.Boolean(_('Appraisal'))
|
||||
re_contract = fields.Boolean(_('re contract'))
|
||||
contract_draft = fields.Boolean(_('Contract Draft'))
|
||||
|
|
|
|||
|
|
@ -860,8 +860,8 @@ msgstr "طوارئ"
|
|||
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays_status__emp_type
|
||||
msgid "Emp Type"
|
||||
msgstr "نوع الموظف"
|
||||
msgid "Annual Leave Entitlement"
|
||||
msgstr "الاستحقاق السنوي للاجازة"
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model,name:hr_holidays_public.model_hr_employee
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ class HrHolidaysStatus(models.Model):
|
|||
('other', _('Holiday2')),
|
||||
('displaced', _('Holiday3')),
|
||||
('external', _('Holiday4')),
|
||||
('external2', _('Other')), ('all', _('All'))], tracking=True)
|
||||
('external2', _('Other')), ('all', _('All'))],string='Annual Leave Entitlement', tracking=True)
|
||||
gender = fields.Selection(selection=[('male', _('Male')),
|
||||
('female', _('Female')),
|
||||
('both', _('Both'))], tracking=True)
|
||||
|
|
|
|||
|
|
@ -3,75 +3,88 @@
|
|||
<record id="edit_holiday_status_form" model="ir.ui.view">
|
||||
<field name="name">hr.holidays.status.form - Add compute fields</field>
|
||||
<field name="model">hr.holidays.status</field>
|
||||
<field name="inherit_id" ref="hr_holidays_community.edit_holiday_status_form"/>
|
||||
<field name="inherit_id" ref="hr_holidays_community.edit_holiday_status_form" />
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//form/sheet" position="replace">
|
||||
<sheet>
|
||||
<group>
|
||||
<group>
|
||||
<field name="name" string="Description"/>
|
||||
<field name="leave_annual_type" required="1"/>
|
||||
<field name="number_of_holidays_save_years" string="Number of saved years"
|
||||
attrs="{'invisible':[('leave_annual_type','!=','save_annual_year')]}"/>
|
||||
<field name="gender" required="1"/>
|
||||
<field name="request_before"/>
|
||||
<field name="advance_request_years"/>
|
||||
<!--field name="category_id" string="Meeting Type"/-->
|
||||
<field name="working_days"/>
|
||||
<field name="official_holidays"/>
|
||||
<field name="include_weekend"/>
|
||||
<field name="exit_return_permission"/>
|
||||
<field name="name" string="Description" />
|
||||
<field name="leave_annual_type" required="1" />
|
||||
<field name="number_of_holidays_save_years"
|
||||
string="Number of saved years"
|
||||
attrs="{'invisible':[('leave_annual_type','!=','save_annual_year')]}" />
|
||||
<field name="gender" required="1" />
|
||||
<field name="request_before" />
|
||||
<field name="advance_request_years" />
|
||||
<!--field
|
||||
name="category_id" string="Meeting Type"/-->
|
||||
<field name="working_days" />
|
||||
<field name="official_holidays" />
|
||||
<field name="include_weekend" />
|
||||
<field name="exit_return_permission" />
|
||||
<field name="exit_return_permission_duration"
|
||||
attrs="{'invisible':[('exit_return_permission','=',False)],'required':[('exit_return_permission','=',True)]}"/>
|
||||
<field name="issuing_ticket"/>
|
||||
<!-- <field name="period_ticket" string="Period Ticket"-->
|
||||
<!-- attrs="{'invisible':[('issuing_ticket','=',False)]}"/>-->
|
||||
<!--field name="unpaid"/-->
|
||||
<field name="mission_chick" string="Interference Mission/Training?"/>
|
||||
<field name="attach_chick" string="Attachment Required?"/>
|
||||
<field name="alternative_chick" string="Alternative Required?"/>
|
||||
<field name="alternative_days" string="Alternative Days" attrs="{'invisible':[('alternative_chick','=',False)]}"/>
|
||||
attrs="{'invisible':[('exit_return_permission','=',False)],'required':[('exit_return_permission','=',True)]}" />
|
||||
<field name="issuing_ticket" />
|
||||
<!-- <field name="period_ticket" string="Period Ticket"-->
|
||||
<!-- attrs="{'invisible':[('issuing_ticket','=',False)]}"/>-->
|
||||
<!--field
|
||||
name="unpaid"/-->
|
||||
<field name="mission_chick" string="Interference Mission/Training?" />
|
||||
<field name="attach_chick" string="Attachment Required?" />
|
||||
<field name="alternative_chick" string="Alternative Required?" />
|
||||
<field name="alternative_days" string="Alternative Days"
|
||||
attrs="{'invisible':[('alternative_chick','=',False)]}" />
|
||||
</group>
|
||||
<group>
|
||||
<field name="leave_type" string="Type Of Leave" required="1"/>
|
||||
<field name="balance_type" attrs="{'invisible':[('leave_type','!=','annual')],'required':[('leave_type','=','annual')]}"/> <field name="duration"
|
||||
<field name="leave_type" string="Type Of Leave" required="1" />
|
||||
<field name="balance_type"
|
||||
attrs="{'invisible':[('leave_type','!=','annual')],'required':[('leave_type','=','annual')]}" />
|
||||
<field name="duration"
|
||||
attrs="{'invisible':[('leave_type','=','annual')],
|
||||
'required':[('leave_type','!=','annual')]}"/>
|
||||
<field name="sickness_severity" attrs="{'invisible':[('leave_type','!=','sick')],
|
||||
'required': [('leave_type','=','sick')]}"/>
|
||||
<field name="emp_type" string="Employee Type" required="1"/>
|
||||
<field name="contract_duration" required="1"/>
|
||||
<field name="minimum_duration"/>
|
||||
<label for="number_of_days" string="Employee working days"/>
|
||||
'required':[('leave_type','!=','annual')]}" />
|
||||
<field name="sickness_severity"
|
||||
attrs="{'invisible':[('leave_type','!=','sick')],
|
||||
'required': [('leave_type','=','sick')]}" />
|
||||
<field name="emp_type" string="Employee Type"
|
||||
attrs="{
|
||||
'invisible': [('leave_type', '!=', 'annual')],
|
||||
'required': [('leave_type', '=', 'annual')]
|
||||
}" />
|
||||
<field name="contract_duration" required="1" />
|
||||
<field name="minimum_duration" />
|
||||
<label for="number_of_days" string="Employee working days" />
|
||||
<div id="number_of_days">
|
||||
<field name="number_of_days" string="Employee working days"/>
|
||||
days
|
||||
</div>
|
||||
<field name="number_of_days" string="Employee working days" />
|
||||
days </div>
|
||||
<field name="not_balance_annual_leave"
|
||||
attrs="{'invisible':[('leave_type','=','annual')]}"/>
|
||||
<field name="visible_fields" string="Save Years?"/>
|
||||
attrs="{'invisible':[('leave_type','=','annual')]}" />
|
||||
<field name="visible_fields" string="Save Years?" />
|
||||
<field name="remained_before" required="1"
|
||||
attrs="{'invisible':[('visible_fields','!=',True)]}"/>
|
||||
attrs="{'invisible':[('visible_fields','!=',True)]}" />
|
||||
|
||||
<label for="number_of_years" attrs="{'invisible':[('visible_fields','=',False)]}"
|
||||
string="employee Save working Years"/>
|
||||
<div id="number_of_years" attrs="{'invisible':[('visible_fields','=',False)]}">
|
||||
<field name="number_of_years" string="employee Save working Years"
|
||||
attrs="{'invisible':[('visible_fields','=',False)]}"/>Years
|
||||
</div>
|
||||
<label for="number_of_years"
|
||||
attrs="{'invisible':[('visible_fields','=',False)]}"
|
||||
string="employee Save working Years" />
|
||||
<div id="number_of_years"
|
||||
attrs="{'invisible':[('visible_fields','=',False)]}">
|
||||
<field name="number_of_years"
|
||||
string="employee Save working Years"
|
||||
attrs="{'invisible':[('visible_fields','=',False)]}" />Years </div>
|
||||
<label for="number_of_save_days" string="Employee Save working days"
|
||||
attrs="{'invisible':[('visible_fields','=',False)]}"/>
|
||||
<div id="number_of_save_days" attrs="{'invisible':[('visible_fields','=',False)]}">
|
||||
<field name="number_of_save_days" string="Employee Save working days"
|
||||
attrs="{'invisible':[('visible_fields','=',False)]}"/>
|
||||
days
|
||||
</div>
|
||||
<field name="used_once"/>
|
||||
<field name="issuing_clearance_form"/>
|
||||
<field name="issuing_deliver_custody"/>
|
||||
attrs="{'invisible':[('visible_fields','=',False)]}" />
|
||||
<div id="number_of_save_days"
|
||||
attrs="{'invisible':[('visible_fields','=',False)]}">
|
||||
<field name="number_of_save_days"
|
||||
string="Employee Save working days"
|
||||
attrs="{'invisible':[('visible_fields','=',False)]}" /> days </div>
|
||||
<field name="used_once" />
|
||||
<field name="issuing_clearance_form" />
|
||||
<field name="issuing_deliver_custody" />
|
||||
<field name="check_annual_holiday"
|
||||
attrs="{'invisible':[('payslip_type','!=','unpaid')]}"/>
|
||||
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
|
||||
attrs="{'invisible':[('payslip_type','!=','unpaid')]}" />
|
||||
<field name="company_id" groups="base.group_multi_company"
|
||||
readonly="1" />
|
||||
|
||||
</group>
|
||||
</group>
|
||||
|
|
@ -81,58 +94,66 @@
|
|||
<group>
|
||||
<group name="selection" string="Validation">
|
||||
<!-- <field name="double_validation"/>-->
|
||||
<field name="active"/>
|
||||
<field name="active" />
|
||||
</group>
|
||||
<!--group name="second" string="Misc">
|
||||
<!--group
|
||||
name="second" string="Misc">
|
||||
<field name="color_name"/>
|
||||
|
||||
</group-->
|
||||
<group name="configuration" string="Payroll Configuration">
|
||||
<field name="payslip_type" required="1"/>
|
||||
<field name="type_unpaid" attrs="{'invisible': [('payslip_type','!=','unpaid')],
|
||||
<field name="payslip_type" required="1" />
|
||||
<field name="type_unpaid"
|
||||
attrs="{'invisible': [('payslip_type','!=','unpaid')],
|
||||
'required': [('payslip_type','=','unpaid')]}"
|
||||
string="Unpaid Types"/>
|
||||
<field name="period_giving_balance" attrs="{'invisible': ['|',('type_unpaid','!=','termination'),('payslip_type','!=','unpaid')],
|
||||
'required': [('type_unpaid','=','termination')]}"/>
|
||||
<field name="unpaid_leave_days_per_period" attrs="{'invisible': ['|',('type_unpaid','!=','termination'),('payslip_type','!=','unpaid')],
|
||||
'required': [('type_unpaid','=','termination')]}"/>
|
||||
string="Unpaid Types" />
|
||||
<field name="period_giving_balance"
|
||||
attrs="{'invisible': ['|',('type_unpaid','!=','termination'),('payslip_type','!=','unpaid')],
|
||||
'required': [('type_unpaid','=','termination')]}" />
|
||||
<field name="unpaid_leave_days_per_period"
|
||||
attrs="{'invisible': ['|',('type_unpaid','!=','termination'),('payslip_type','!=','unpaid')],
|
||||
'required': [('type_unpaid','=','termination')]}" />
|
||||
|
||||
<field name="period_unpaid_leave" attrs="{'invisible': ['|',('type_unpaid','!=','termination'),('payslip_type','!=','unpaid')],
|
||||
'required': [('type_unpaid','=','termination')]}"/>
|
||||
<field name="period_unpaid_leave"
|
||||
attrs="{'invisible': ['|',('type_unpaid','!=','termination'),('payslip_type','!=','unpaid')],
|
||||
'required': [('type_unpaid','=','termination')]}" />
|
||||
<field name="percentage"
|
||||
attrs="{'invisible': [('payslip_type','!=','percentage')],
|
||||
'required': [('payslip_type','=','percentage')]}"/>
|
||||
'required': [('payslip_type','=','percentage')]}" />
|
||||
<field name="salary_rules_ids" widget="many2many_tags"
|
||||
attrs="{'invisible': [('payslip_type','not in',['addition','exclusion','reconcile'])],
|
||||
'required': [('payslip_type','in',['addition','exclusion','reconcile'])]}"/>
|
||||
'required': [('payslip_type','in',['addition','exclusion','reconcile'])]}" />
|
||||
</group>
|
||||
<group name="overlimt" string="Over Limit">
|
||||
<field name="annual_holiday_id" domain="[('id', '!=', id),
|
||||
<field name="annual_holiday_id"
|
||||
domain="[('id', '!=', id),
|
||||
('active', '=', True),
|
||||
('payslip_type', '!=', 'unpaid')]"/>
|
||||
<field name="unpaid_holiday_id" domain="[('id', '!=', id),
|
||||
('payslip_type', '!=', 'unpaid')]" />
|
||||
<field name="unpaid_holiday_id"
|
||||
domain="[('id', '!=', id),
|
||||
('active', '=', True),
|
||||
('payslip_type', '=', 'unpaid')]"/>
|
||||
<field name="limit"/>
|
||||
('payslip_type', '=', 'unpaid')]" />
|
||||
<field name="limit" />
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Duration" attrs="{'invisible':[('leave_type','!=','annual')]}">
|
||||
<page string="Duration"
|
||||
attrs="{'invisible':[('leave_type','!=','annual')]}">
|
||||
<field name="duration_ids">
|
||||
<tree editable="bottom">
|
||||
<field name="name"/>
|
||||
<field name="date_from"/>
|
||||
<field name="date_to"/>
|
||||
<field name="duration"/>
|
||||
<field name="name" />
|
||||
<field name="date_from" />
|
||||
<field name="date_to" />
|
||||
<field name="duration" />
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_follower_ids" widget="mail_followers"/>
|
||||
<field name="activity_ids" widget="mail_activity"/>
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
<field name="message_follower_ids" widget="mail_followers" />
|
||||
<field name="activity_ids" widget="mail_activity" />
|
||||
<field name="message_ids" widget="mail_thread" />
|
||||
</div>
|
||||
</xpath>
|
||||
</field>
|
||||
|
|
@ -143,11 +164,11 @@
|
|||
<field name="model">hr.holiday.officials</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Official Holidays">
|
||||
<field name="official_event_id"/>
|
||||
<field name="date_from"/>
|
||||
<field name="date_to"/>
|
||||
<field name="religion"/>
|
||||
<field name="active"/>
|
||||
<field name="official_event_id" />
|
||||
<field name="date_from" />
|
||||
<field name="date_to" />
|
||||
<field name="religion" />
|
||||
<field name="active" />
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -159,28 +180,31 @@
|
|||
<header>
|
||||
<button string="Confirm" name="confirm" type="object"
|
||||
attrs="{'invisible':['|',('state','!=','draft'),('active','=',False)]}"
|
||||
class="oe_highlight"/>
|
||||
class="oe_highlight" />
|
||||
<button string="Reset to Draft" name="draft_state" type="object"
|
||||
states="refuse,confirm"
|
||||
class="oe_highlight" confirm="Are you sure to Reset To Draft This Record?"/>
|
||||
<button string="Refuse" name="refuse" confirm="Are you sure to refuse This Record?"
|
||||
states="draft" type="object" class="oe_highlight"/>
|
||||
<field name="state" widget="statusbar"/>
|
||||
class="oe_highlight"
|
||||
confirm="Are you sure to Reset To Draft This Record?" />
|
||||
<button string="Refuse" name="refuse"
|
||||
confirm="Are you sure to refuse This Record?"
|
||||
states="draft" type="object" class="oe_highlight" />
|
||||
<field name="state" widget="statusbar" />
|
||||
|
||||
</header>
|
||||
<sheet>
|
||||
<group col="4" colspan="2">
|
||||
<field name="official_event_id" colspan="4" attrs="{'readonly':[('state','!=','draft')]}"/>
|
||||
<field name="date_from" attrs="{'readonly':[('state','!=','draft')]}"/>
|
||||
<field name="active" attrs="{'readonly':[('state','!=','draft')]}"/>
|
||||
<field name="date_to" attrs="{'readonly':[('state','!=','draft')]}"/>
|
||||
<field name="religion" attrs="{'readonly':[('state','!=','draft')]}"/>
|
||||
<field name="official_event_id" colspan="4"
|
||||
attrs="{'readonly':[('state','!=','draft')]}" />
|
||||
<field name="date_from" attrs="{'readonly':[('state','!=','draft')]}" />
|
||||
<field name="active" attrs="{'readonly':[('state','!=','draft')]}" />
|
||||
<field name="date_to" attrs="{'readonly':[('state','!=','draft')]}" />
|
||||
<field name="religion" attrs="{'readonly':[('state','!=','draft')]}" />
|
||||
</group>
|
||||
</sheet>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_follower_ids" widget="mail_followers"/>
|
||||
<field name="activity_ids" widget="mail_activity"/>
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
<field name="message_follower_ids" widget="mail_followers" />
|
||||
<field name="activity_ids" widget="mail_activity" />
|
||||
<field name="message_ids" widget="mail_thread" />
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
|
|
@ -196,7 +220,7 @@
|
|||
parent="hr_holidays_public.menu_holidays_configuration"
|
||||
sequence="100"
|
||||
groups="hr_holidays_community.group_hr_holidays_manager"
|
||||
action="action_hr_holiday_officials"/>
|
||||
action="action_hr_holiday_officials" />
|
||||
|
||||
</data>
|
||||
</odoo>
|
||||
Loading…
Reference in New Issue