From 7f126cec5d9c641ee636a372039a29d20db591db Mon Sep 17 00:00:00 2001
From: Arnaud Joset <arj@odoo.com>
Date: Tue, 16 Feb 2021 13:53:10 +0100
Subject: [PATCH] [IMP] hr_contract,hr_work_entry_contract: remove enterprise
features
Before this commit, the hr_work_entry_contract contained enterprise views/features that could not be integrated in community.
These features are now provided by the hr_work_entry_contract_enterprise module.
taskid: 2222790
---
.../hr_contract/views/hr_contract_views.xml | 8 ---
addons/hr_work_entry_contract/__manifest__.py | 1 -
.../models/hr_employee.py | 2 +-
.../static/src/js/work_entries_gantt.js | 41 --------------
.../views/hr_payroll_menu.xml | 54 -------------------
.../views/hr_work_entry_template.xml | 1 -
.../views/hr_work_entry_views.xml | 37 -------------
7 files changed, 1 insertion(+), 143 deletions(-)
delete mode 100644 addons/hr_work_entry_contract/static/src/js/work_entries_gantt.js
delete mode 100644 addons/hr_work_entry_contract/views/hr_payroll_menu.xml
diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml
index c2657a029589..6f19eb002b0a 100644
--- a/addons/hr_contract/views/hr_contract_views.xml
+++ b/addons/hr_contract/views/hr_contract_views.xml
@@ -303,12 +303,4 @@
parent="hr.menu_human_resources_configuration"
sequence="3"/>
- <menuitem
- id="hr_menu_contract"
- name="All Contracts"
- action="action_hr_contract"
- parent="hr.menu_hr_employee_payroll"
- sequence="6"
- groups="hr_contract.group_hr_contract_manager"/>
-
</odoo>
diff --git a/addons/hr_work_entry_contract/__manifest__.py b/addons/hr_work_entry_contract/__manifest__.py
index ae97733b0484..ebf60f36befa 100644
--- a/addons/hr_work_entry_contract/__manifest__.py
+++ b/addons/hr_work_entry_contract/__manifest__.py
@@ -20,7 +20,6 @@
'views/hr_work_entry_template.xml',
'views/hr_work_entry_views.xml',
'views/resource_views.xml',
- 'views/hr_payroll_menu.xml',
'wizard/hr_work_entry_regeneration_wizard_views.xml',
],
'demo': [
diff --git a/addons/hr_work_entry_contract/models/hr_employee.py b/addons/hr_work_entry_contract/models/hr_employee.py
index dfb46ab0fda0..05e8edc7fb72 100644
--- a/addons/hr_work_entry_contract/models/hr_employee.py
+++ b/addons/hr_work_entry_contract/models/hr_employee.py
@@ -1,7 +1,7 @@
# -*- coding:utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import api, fields, models
+from odoo import fields, models
class HrEmployee(models.Model):
diff --git a/addons/hr_work_entry_contract/static/src/js/work_entries_gantt.js b/addons/hr_work_entry_contract/static/src/js/work_entries_gantt.js
deleted file mode 100644
index 2e9ec39f54d0..000000000000
--- a/addons/hr_work_entry_contract/static/src/js/work_entries_gantt.js
+++ /dev/null
@@ -1,41 +0,0 @@
-odoo.define('hr_work_entry_contract.work_entries_gantt', function(require) {
- 'use strict';
-
- var WorkEntryControllerMixin = require('hr_work_entry_contract.WorkEntryControllerMixin');
- var GanttView = require('web_gantt.GanttView');
- var GanttController = require('web_gantt.GanttController');
- var viewRegistry = require('web.view_registry');
-
-
- var WorkEntryGanttController = GanttController.extend(WorkEntryControllerMixin, {
- events: _.extend({}, WorkEntryControllerMixin.events, GanttController.prototype.events),
-
-
- _renderButtonsQWeb: function() {
- return this._super.apply(this, arguments).append(this._renderWorkEntryButtons());
- },
- _fetchRecords: function () {
- return this.model.ganttData.records;
- },
- _fetchFirstDay: function () {
- return this.model.ganttData.startDate;
- },
- _fetchLastDay: function () {
- return this.model.ganttData.stopDate;
- },
- _displayWarning: function ($warning) {
- this.$('.o_gantt_view').before($warning);
- },
- });
-
- var WorkEntryGanttView = GanttView.extend({
- config: _.extend({}, GanttView.prototype.config, {
- Controller: WorkEntryGanttController,
- }),
- });
-
- viewRegistry.add('work_entries_gantt', WorkEntryGanttView);
-
- return WorkEntryGanttController;
-
-});
diff --git a/addons/hr_work_entry_contract/views/hr_payroll_menu.xml b/addons/hr_work_entry_contract/views/hr_payroll_menu.xml
deleted file mode 100644
index f68d08a8c829..000000000000
--- a/addons/hr_work_entry_contract/views/hr_payroll_menu.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<odoo>
-
- <!-- Root Menus -->
-
- <menuitem id="menu_hr_payroll_root" name="Payroll" sequence="45" web_icon="hr_payroll,static/description/icon.png"/>
-
- <menuitem
- id="menu_hr_payroll_work_entries_root"
- name="Work Entries"
- parent="menu_hr_payroll_root"
- sequence="60"
- groups="hr.group_hr_user"/>
-
- <menuitem
- id="menu_hr_payroll_configuration"
- name="Configuration"
- parent="menu_hr_payroll_root"
- sequence="100"
- groups="hr.group_hr_user"/>
-
- <!-- **** Work Entries **** -->
- <menuitem
- id="menu_work_entry"
- name="Work Entries"
- action="hr_work_entry.hr_work_entry_action"
- parent="menu_hr_payroll_work_entries_root"
- sequence="25"/>
-
- <menuitem
- id="menu_work_entry_conflicts"
- name="Conflicts"
- action="hr_work_entry.hr_work_entry_action_conflict"
- parent="menu_hr_payroll_work_entries_root"
- sequence="50"/>
-
- <!-- Work entries Configuration -->
- <menuitem
- id="menu_hr_work_entry_confirguration"
- name="Work Entries"
- parent="menu_hr_payroll_configuration"
- sequence="50"
- />
- <menuitem
- id="menu_hr_work_entry_type_view"
- action="hr_work_entry.hr_work_entry_type_action"
- parent="menu_hr_work_entry_confirguration"
- />
- <menuitem
- id="menu_resource_calendar_view"
- action="resource.action_resource_calendar_form"
- parent="menu_hr_work_entry_confirguration"
- />
-</odoo>
diff --git a/addons/hr_work_entry_contract/views/hr_work_entry_template.xml b/addons/hr_work_entry_contract/views/hr_work_entry_template.xml
index 3172e0b526f2..cdef96f9d7cd 100644
--- a/addons/hr_work_entry_contract/views/hr_work_entry_template.xml
+++ b/addons/hr_work_entry_contract/views/hr_work_entry_template.xml
@@ -5,7 +5,6 @@
<xpath expr="script[last()]" position="after">
<script type="text/javascript" src="/hr_work_entry_contract/static/src/js/work_entries_controller_mixin.js"></script>
<script type="text/javascript" src="/hr_work_entry_contract/static/src/js/work_entries_calendar.js"></script>
- <script type="text/javascript" src="/hr_work_entry_contract/static/src/js/work_entries_gantt.js"></script>
</xpath>
</template>
diff --git a/addons/hr_work_entry_contract/views/hr_work_entry_views.xml b/addons/hr_work_entry_contract/views/hr_work_entry_views.xml
index b9ce168e527b..1972add686e2 100644
--- a/addons/hr_work_entry_contract/views/hr_work_entry_views.xml
+++ b/addons/hr_work_entry_contract/views/hr_work_entry_views.xml
@@ -1,18 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
-
- <record id="hr_work_entry_action_view_gantt" model="ir.actions.act_window.view">
- <field name="sequence" eval="2"/>
- <field name="view_mode">gantt</field>
- <field name="act_window_id" ref="hr_work_entry.hr_work_entry_action"/>
- </record>
-
- <record id="hr_work_entry_action_conflict_view_gantt" model="ir.actions.act_window.view">
- <field name="sequence" eval="2"/>
- <field name="view_mode">gantt</field>
- <field name="act_window_id" ref="hr_work_entry.hr_work_entry_action_conflict"/>
- </record>
-
<record id="hr_work_entry_contract_view_calendar_inherit" model="ir.ui.view">
<field name="name">hr.work.entry.contract.view.calendar.inherit</field>
<field name="model">hr.work.entry</field>
@@ -24,30 +11,6 @@
</field>
</record>
- <record id="hr_work_entry_gantt" model="ir.ui.view">
- <field name="name">hr.work.entry.gantt</field>
- <field name="model">hr.work.entry</field>
- <field name="arch" type="xml">
- <gantt js_class="work_entries_gantt"
- string="Work Entries"
- date_start="date_start"
- date_stop="date_stop"
- color="color"
- default_group_by='employee_id'
- decoration-secondary="state == 'validated'"
- decoration-warning="state == 'conflict'"
- scales="day,week,month"
- precision="{'day': 'hour:quarter', 'week': 'day:half', 'month': 'day:half'}"
- plan="0"
- sample="1">
- <field name="color" invisible="1"/>
- <field name="state"/>
- <field name="employee_id"/>
- <field name="name"/>
- </gantt>
- </field>
- </record>
-
<record id="hr_work_entry_contract_view_form_inherit" model="ir.ui.view">
<field name="name">hr.work.entry.contract.view.form.inherit</field>
<field name="model">hr.work.entry</field>
--
GitLab