modify on fields and report
This commit is contained in:
parent
d9d9c5fc19
commit
8a76b628ce
|
|
@ -7,12 +7,20 @@
|
||||||
<field name="default" eval="False"/>
|
<field name="default" eval="False"/>
|
||||||
<field name="format">A4</field>
|
<field name="format">A4</field>
|
||||||
<field name="orientation">Landscape</field>
|
<field name="orientation">Landscape</field>
|
||||||
<field name="margin_top">10</field>
|
<!-- <field name="margin_top">10</field>-->
|
||||||
|
<!-- <field name="margin_bottom">10</field>-->
|
||||||
|
<!-- <field name="margin_left">7</field>-->
|
||||||
|
<!-- <field name="margin_right">7</field>-->
|
||||||
|
<!-- <field name="header_line" eval="False"/>-->
|
||||||
|
<!-- <field name="header_spacing">10</field>-->
|
||||||
|
<!-- <field name="dpi">90</field>-->
|
||||||
|
|
||||||
|
<field name="margin_top">30</field>
|
||||||
|
<field name="margin_right">5</field>
|
||||||
<field name="margin_bottom">10</field>
|
<field name="margin_bottom">10</field>
|
||||||
<field name="margin_left">7</field>
|
<field name="margin_left">5</field>
|
||||||
<field name="margin_right">7</field>
|
|
||||||
<field name="header_line" eval="False"/>
|
<field name="header_line" eval="False"/>
|
||||||
<field name="header_spacing">10</field>
|
<field name="header_spacing">35</field>
|
||||||
<field name="dpi">90</field>
|
<field name="dpi">90</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|
@ -357,24 +365,7 @@
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
<template id="totals_only_attendance_report_template">
|
<template id="totals_only_attendance_report_template">
|
||||||
<!-- <div class="page" style="font-size:12pt" dir="rtl">-->
|
<div class="page" style="font-size:12pt;" dir="rtl">
|
||||||
<!-- print-orientation="landscape"-->
|
|
||||||
<!-- <!– print-orientation="landscape" –>-->
|
|
||||||
<style>
|
|
||||||
@page {
|
|
||||||
size: A4 landscape;
|
|
||||||
|
|
||||||
margin: 0.5cm;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<div class="page" style="font-size:12pt;"
|
|
||||||
dir="rtl"
|
|
||||||
|
|
||||||
>
|
|
||||||
<!-- print-orientation="landscape"-->
|
|
||||||
<!-- t-att-data-report-orientation="'landscape'"-->
|
|
||||||
|
|
||||||
<center>
|
<center>
|
||||||
<h2 style="font-weight:bold">تقرير الحضور والانصراف للموظفين</h2>
|
<h2 style="font-weight:bold">تقرير الحضور والانصراف للموظفين</h2>
|
||||||
</center>
|
</center>
|
||||||
|
|
@ -501,9 +492,9 @@
|
||||||
font-family: ae_AlMohanad;
|
font-family: ae_AlMohanad;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
<!-- <t t-if="totals_only">-->
|
|
||||||
<t t-call="attendances.totals_only_attendance_report_template"/>
|
<t t-call="attendances.totals_only_attendance_report_template"/>
|
||||||
<!-- </t>-->
|
|
||||||
|
|
||||||
</t>
|
</t>
|
||||||
</t>
|
</t>
|
||||||
|
|
|
||||||
|
|
@ -128,6 +128,7 @@
|
||||||
<!--field name="date" string="Date Request"/-->
|
<!--field name="date" string="Date Request"/-->
|
||||||
<field name="employee_no" string="Employee Number"/>
|
<field name="employee_no" string="Employee Number"/>
|
||||||
<field name="employee_id" string="Employee"/>
|
<field name="employee_id" string="Employee"/>
|
||||||
|
<field name="department_id" />
|
||||||
<field name="permission_type_id" />
|
<field name="permission_type_id" />
|
||||||
<field name="date_from" string="Date From"/>
|
<field name="date_from" string="Date From"/>
|
||||||
<field name="date_to" string="Date To"/>
|
<field name="date_to" string="Date To"/>
|
||||||
|
|
|
||||||
|
|
@ -143,6 +143,7 @@
|
||||||
string="Employee Especially Hours">
|
string="Employee Especially Hours">
|
||||||
<field name="employee_no" string="Employee Number"/>
|
<field name="employee_no" string="Employee Number"/>
|
||||||
<field name="employee_id" string="Responsible"/>
|
<field name="employee_id" string="Responsible"/>
|
||||||
|
<field name="department_id" />
|
||||||
<field name="mission_type" string="Mission Type"/>
|
<field name="mission_type" string="Mission Type"/>
|
||||||
<field name="date" string="Date Request"/>
|
<field name="date" string="Date Request"/>
|
||||||
<field name="date_from" string="Date From"/>
|
<field name="date_from" string="Date From"/>
|
||||||
|
|
|
||||||
|
|
@ -131,6 +131,7 @@
|
||||||
<tree decoration-danger="state == 'refuse'" decoration-info="state == 'draft'" string="Penalty Register">
|
<tree decoration-danger="state == 'refuse'" decoration-info="state == 'draft'" string="Penalty Register">
|
||||||
<field name="employee_no" string="Employee Number"/>
|
<field name="employee_no" string="Employee Number"/>
|
||||||
<field name="employee_id" string="Employee Name"/>
|
<field name="employee_id" string="Employee Name"/>
|
||||||
|
<field name="department_id" />
|
||||||
<field name="date" string="Date"/>
|
<field name="date" string="Date"/>
|
||||||
<field name="penalty_id" string="Penalty"/>
|
<field name="penalty_id" string="Penalty"/>
|
||||||
<field name="punishment_id" string="punishment" widget="many2many_tags"/>
|
<field name="punishment_id" string="punishment" widget="many2many_tags"/>
|
||||||
|
|
|
||||||
|
|
@ -140,6 +140,7 @@
|
||||||
<tree decoration-danger="state == 'refuse'" decoration-info="state == 'draft'" string="Allocation Requests"
|
<tree decoration-danger="state == 'refuse'" decoration-info="state == 'draft'" string="Allocation Requests"
|
||||||
decoration-bf="message_needaction == True">
|
decoration-bf="message_needaction == True">
|
||||||
<field name="employee_id"/>
|
<field name="employee_id"/>
|
||||||
|
<field name="department_id" />
|
||||||
<field name="holiday_type"/>
|
<field name="holiday_type"/>
|
||||||
<field name="category_id"/>
|
<field name="category_id"/>
|
||||||
<field name="department_id" invisible="1"/>
|
<field name="department_id" invisible="1"/>
|
||||||
|
|
@ -278,6 +279,7 @@
|
||||||
<tree decoration-danger="state == 'refuse'" decoration-info="state == 'draft'" string="Leave Requests"
|
<tree decoration-danger="state == 'refuse'" decoration-info="state == 'draft'" string="Leave Requests"
|
||||||
decoration-bf="message_needaction == True">
|
decoration-bf="message_needaction == True">
|
||||||
<field name="employee_id"/>
|
<field name="employee_id"/>
|
||||||
|
<field name="department_id" />
|
||||||
<field name="holiday_type" string="Mode" groups="base.group_no_one"/>
|
<field name="holiday_type" string="Mode" groups="base.group_no_one"/>
|
||||||
<field name="holiday_status_id"/>
|
<field name="holiday_status_id"/>
|
||||||
<field name="name"/>
|
<field name="name"/>
|
||||||
|
|
|
||||||
|
|
@ -2059,3 +2059,11 @@ class holidaysAttach(models.Model):
|
||||||
# })
|
# })
|
||||||
# return result
|
# return result
|
||||||
|
|
||||||
|
|
||||||
|
class ResConfigSettings(models.TransientModel):
|
||||||
|
_inherit = 'res.config.settings'
|
||||||
|
|
||||||
|
resource_calendar_id = fields.Many2one(
|
||||||
|
'resource.calendar', 'Company Working Hours',
|
||||||
|
related='company_id.resource_calendar_id', readonly=False)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -95,6 +95,7 @@
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree decoration-success="state=='approve'" decoration-danger="state == 'refuse'" decoration-info="state == 'draft'" string="Leave Cancellation">
|
<tree decoration-success="state=='approve'" decoration-danger="state == 'refuse'" decoration-info="state == 'draft'" string="Leave Cancellation">
|
||||||
<field name="employee_id" string="Employee"/>
|
<field name="employee_id" string="Employee"/>
|
||||||
|
<field name="department_id" />
|
||||||
<field name="leave_request_id" />
|
<field name="leave_request_id" />
|
||||||
<field name="from_date" widget="date"/>
|
<field name="from_date" widget="date"/>
|
||||||
<!--field name="leave_cancellation_date" widget="date"/-->
|
<!--field name="leave_cancellation_date" widget="date"/-->
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,40 @@
|
||||||
<field name="search_view_id" ref="hr_holidays_community.view_hr_holidays_filter"/>
|
<field name="search_view_id" ref="hr_holidays_community.view_hr_holidays_filter"/>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
<record id="view_employee_form_leave_inheritt" model="ir.ui.view">
|
||||||
|
<field name="name">hr.employee.leave.form.inherit</field>
|
||||||
|
<field name="model">hr.employee</field>
|
||||||
|
<field name="inherit_id" ref="hr.view_employee_form"/>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<xpath expr="//group[@name='active_group']" position="after">
|
||||||
|
<group string="Leaves" groups="base.group_no_one">
|
||||||
|
<label for="remaining_leaves"/>
|
||||||
|
<div>
|
||||||
|
<field name="remaining_leaves" class="oe_inline"/> days
|
||||||
|
</div>
|
||||||
|
</group>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//div[@name='button_box']" position="inside">
|
||||||
|
<field name="show_leaves" invisible="1"/>
|
||||||
|
<button name="%(leaves_balance_action)d"
|
||||||
|
type="action"
|
||||||
|
class="oe_stat_button"
|
||||||
|
icon="fa-calendar"
|
||||||
|
attrs="{'invisible': [('show_leaves','=', False)]}"
|
||||||
|
groups="base.group_user"
|
||||||
|
help="Remaining leaves">
|
||||||
|
<field string="Leaves Left" name="leaves_count" widget="statinfo"/>
|
||||||
|
</button>
|
||||||
|
</xpath>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<record model="ir.ui.view" id="leaves_balance_form_view">
|
<record model="ir.ui.view" id="leaves_balance_form_view">
|
||||||
|
|
@ -58,6 +92,8 @@
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree create="false" edit="false" delete="false">
|
<tree create="false" edit="false" delete="false">
|
||||||
<field name="employee_id" string="Employee"/>
|
<field name="employee_id" string="Employee"/>
|
||||||
|
<field name="department_id" />
|
||||||
|
|
||||||
<field name="holiday_status_id" string="Leave Type"/>
|
<field name="holiday_status_id" string="Leave Type"/>
|
||||||
<field name="state" invisible="1"/>
|
<field name="state" invisible="1"/>
|
||||||
<field name="leaves_taken" string="Leaves Taken"/>
|
<field name="leaves_taken" string="Leaves Taken"/>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue