Elabore/odoo-usability
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Up-port from 7 to 8 new stuff for hr_holidays_usability

Browse Source
This commit is contained in:
Alexis de Lattre
2015-06-23 20:01:17 +02:00
parent 1ff2416435
commit 053911edca
4 changed files with 97 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
hr_holidays_usability/hr_holidays_view.xml
View File

@@ -27,10 +27,7 @@ hr_holidays.edit_holiday_new is used for both leaves and allocation -->
<attribute name="invisible">1</attribute>
</xpath>
<field name="number_of_days_temp" position="attributes">
<attribute name="attrs">{'invisible': [('type', '=', 'remove')]}</attribute>
</field>
<field name="number_of_days_temp" position="after">
<field name="number_of_days_remove" class="oe_inline" attrs="{'invisible': [('type', '=', 'add')]}"/>
<attribute name="attrs">{'readonly': [('type', '=', 'remove')]}</attribute>
</field>
<field name="holiday_status_id" position="after">
<field name="vacation_date_from" attrs="{'required': [('type', '=', 'remove')], 'invisible': [('type', '=', 'add')]}"/>
@@ -69,12 +66,6 @@ hr_holidays.edit_holiday_new is used for both leaves and allocation -->
<field name="model">hr.holidays</field>
<field name="inherit_id" ref="hr_holidays.view_holiday"/>
<field name="arch" type="xml">
<field name="number_of_days" position="attributes">
<attribute name="invisible">1</attribute>
</field>
<field name="number_of_days" position="after">
<field name="number_of_days_remove" sum="Total Days of Vacation"/>
</field>
<field name="date_from" position="attributes">
<attribute name="invisible">1</attribute>
</field>
@@ -98,6 +89,29 @@ hr_holidays.edit_holiday_new is used for both leaves and allocation -->
</field>
</record>
<record id="view_hr_holidays_filter" model="ir.ui.view">
<field name="name">hr_holidays_usability.leave_request_tree</field>
<field name="model">hr.holidays</field>
<field name="inherit_id" ref="hr_holidays.view_hr_holidays_filter"/>
<field name="arch" type="xml">
<filter name="validated" position="after">
<filter name="posted" string="Posted" domain="[('posted_date', '!=', False)]"/>
</filter>
</field>
</record>
<record id="hr_holiday_graph" model="ir.ui.view">
<field name="name">hr_holidays_usability.hr_holiday_graph</field>
<field name="model">hr.holidays</field>
<field name="arch" type="xml">
<graph string="Leave Requests" type="pivot">
<field name="employee_id" type="row"/>
<field name="holiday_status_id" type="col"/>
<field name="number_of_days_temp" type="measure"/>
</graph>
</field>
</record>
<record id="edit_holiday_status_form" model="ir.ui.view">
<field name="name">hr_holidays_usability.hr.holidays.status.form</field>
<field name="model">hr.holidays.status</field>
@@ -122,7 +136,14 @@ hr_holidays.edit_holiday_new is used for both leaves and allocation -->
<!-- On the leave requests, put tree view by default instead of calendar -->
<record id="hr_holidays.action_open_ask_holidays_calendar" model="ir.actions.act_window.view">
<field name="sequence" eval="4"/>
</record>
<record id="action_open_ask_holidays_graph" model="ir.actions.act_window.view">
<field name="sequence" eval="5"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="hr_holiday_graph"/>
<field name="act_window_id" ref="hr_holidays.open_ask_holidays"/>
</record>
<record id="resource_calendar_leaves_cal_first_action" model="ir.actions.act_window">