From 7f126cec5d9c641ee636a372039a29d20db591db Mon Sep 17 00:00:00 2001 From: Arnaud Joset 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 c2657a02958..6f19eb002b0 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"/> - - diff --git a/addons/hr_work_entry_contract/__manifest__.py b/addons/hr_work_entry_contract/__manifest__.py index ae97733b048..ebf60f36bef 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 dfb46ab0fda..05e8edc7fb7 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 2e9ec39f54d..00000000000 --- 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 f68d08a8c82..00000000000 --- a/addons/hr_work_entry_contract/views/hr_payroll_menu.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - 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 3172e0b526f..cdef96f9d7c 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 @@ - 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 b9ce168e527..1972add686e 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 @@ - - - - gantt - - - - - - gantt - - - hr.work.entry.contract.view.calendar.inherit hr.work.entry @@ -24,30 +11,6 @@ - - hr.work.entry.gantt - hr.work.entry - - - - - - - - - - hr.work.entry.contract.view.form.inherit hr.work.entry