From 4fd53b512937c2eb4832b69caa928bf3cae1aa69 Mon Sep 17 00:00:00 2001 From: "Adrien Peiffer (ACSONE)" Date: Wed, 14 Sep 2016 16:32:50 +0200 Subject: [PATCH 01/40] [ADD] Add hr_timesheet_task_required module --- hr_timesheet_task_required/README.rst | 54 ++++++++++++++++++ hr_timesheet_task_required/__init__.py | 0 hr_timesheet_task_required/__openerp__.py | 20 +++++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/src/js/hr_timesheet_widget.js | 26 +++++++++ .../views/hr_timesheet_task_required.xml | 10 ++++ .../views/hr_timesheet_view.xml | 37 ++++++++++++ 7 files changed, 147 insertions(+) create mode 100644 hr_timesheet_task_required/README.rst create mode 100644 hr_timesheet_task_required/__init__.py create mode 100644 hr_timesheet_task_required/__openerp__.py create mode 100644 hr_timesheet_task_required/static/description/icon.png create mode 100644 hr_timesheet_task_required/static/src/js/hr_timesheet_widget.js create mode 100644 hr_timesheet_task_required/views/hr_timesheet_task_required.xml create mode 100644 hr_timesheet_task_required/views/hr_timesheet_view.xml diff --git a/hr_timesheet_task_required/README.rst b/hr_timesheet_task_required/README.rst new file mode 100644 index 0000000000..3367004448 --- /dev/null +++ b/hr_timesheet_task_required/README.rst @@ -0,0 +1,54 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +========================== +Hr Timesheet Task Required +========================== + +This module allow to set task on timesheet as a mandatory field. + +Usage +===== + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/117/8.0 + + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Adrien Peiffer +* Laurent Mignon + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/hr_timesheet_task_required/__init__.py b/hr_timesheet_task_required/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/hr_timesheet_task_required/__openerp__.py b/hr_timesheet_task_required/__openerp__.py new file mode 100644 index 0000000000..4bab925bbc --- /dev/null +++ b/hr_timesheet_task_required/__openerp__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + 'name': 'Hr Timesheet Task Required', + 'summary': """ + Set task on timesheet as a mandatory field""", + 'version': '8.0.1.0.0', + 'license': 'AGPL-3', + 'author': 'ACSONE SA/NV,Odoo Community Association (OCA)', + 'website': 'www.acsone.eu', + 'depends': [ + 'hr_timesheet_task', + ], + 'data': [ + 'views/hr_timesheet_task_required.xml', + 'views/hr_timesheet_view.xml', + ], +} diff --git a/hr_timesheet_task_required/static/description/icon.png b/hr_timesheet_task_required/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/hr_timesheet_task_required/static/src/js/hr_timesheet_widget.js b/hr_timesheet_task_required/static/src/js/hr_timesheet_widget.js new file mode 100644 index 0000000000..e05140a325 --- /dev/null +++ b/hr_timesheet_task_required/static/src/js/hr_timesheet_widget.js @@ -0,0 +1,26 @@ +openerp.hr_timesheet_task_required = function(instance) { + + var module = instance.hr_timesheet_sheet + + module.WeeklyTimesheet = module.WeeklyTimesheet.extend({ + init_add_account: function() { + var self = this; + if (self.dfm) + return; + res = this._super(); + self.task_m2o.set({ required: true }); + return res; + }, + onclick_add_row_button: function(){ + var self = this; + var id = self.task_m2o.get_value(); + if (id === false) { + self.dfm.set({display_invalid_fields: true}); + return; + } + return this._super(); + + + } + }); +}; \ No newline at end of file diff --git a/hr_timesheet_task_required/views/hr_timesheet_task_required.xml b/hr_timesheet_task_required/views/hr_timesheet_task_required.xml new file mode 100644 index 0000000000..b44bebcc15 --- /dev/null +++ b/hr_timesheet_task_required/views/hr_timesheet_task_required.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/hr_timesheet_task_required/views/hr_timesheet_view.xml b/hr_timesheet_task_required/views/hr_timesheet_view.xml new file mode 100644 index 0000000000..93c99e35d0 --- /dev/null +++ b/hr_timesheet_task_required/views/hr_timesheet_view.xml @@ -0,0 +1,37 @@ + + + + + hr.timesheet.sheet.form (hr_timesheet_task_required) + hr_timesheet_sheet.sheet + + + + 1 + + + + + + hr.analytic.timesheet.form (hr_timesheet_task_required) + hr.analytic.timesheet + + + + 1 + + + + + + hr.analytic.timesheet.tree (hr_timesheet_task_required) + hr.analytic.timesheet + + + + 1 + + + + + \ No newline at end of file From c95b4f552f058d3121fdb0a2264c1efa59da0357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?= Date: Sun, 12 Mar 2017 11:01:24 +0100 Subject: [PATCH 02/40] [UPD] fix website url in manifest --- hr_timesheet_task_required/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_timesheet_task_required/__openerp__.py b/hr_timesheet_task_required/__openerp__.py index 4bab925bbc..8aa71e6b9f 100644 --- a/hr_timesheet_task_required/__openerp__.py +++ b/hr_timesheet_task_required/__openerp__.py @@ -9,7 +9,7 @@ 'version': '8.0.1.0.0', 'license': 'AGPL-3', 'author': 'ACSONE SA/NV,Odoo Community Association (OCA)', - 'website': 'www.acsone.eu', + 'website': 'https://acsone.eu/', 'depends': [ 'hr_timesheet_task', ], From 81724a7a975fb3ecaeea5532b4d891dd2b86889d Mon Sep 17 00:00:00 2001 From: Benjamin Willig Date: Thu, 6 Jul 2017 14:57:02 +0200 Subject: [PATCH 03/40] [10.0][MIG] hr_timesheet_task_required --- hr_timesheet_task_required/README.rst | 5 ++- .../{__openerp__.py => __manifest__.py} | 13 ++++--- .../static/src/js/hr_timesheet.js | 28 ++++++++++++++ .../static/src/js/hr_timesheet_widget.js | 26 ------------- .../views/account_analytic_line.xml | 30 +++++++++++++++ hr_timesheet_task_required/views/assets.xml | 10 +++++ .../views/hr_timesheet_sheet.xml | 17 +++++++++ .../views/hr_timesheet_task_required.xml | 10 ----- .../views/hr_timesheet_view.xml | 37 ------------------- 9 files changed, 95 insertions(+), 81 deletions(-) rename hr_timesheet_task_required/{__openerp__.py => __manifest__.py} (51%) create mode 100644 hr_timesheet_task_required/static/src/js/hr_timesheet.js delete mode 100644 hr_timesheet_task_required/static/src/js/hr_timesheet_widget.js create mode 100644 hr_timesheet_task_required/views/account_analytic_line.xml create mode 100644 hr_timesheet_task_required/views/assets.xml create mode 100644 hr_timesheet_task_required/views/hr_timesheet_sheet.xml delete mode 100644 hr_timesheet_task_required/views/hr_timesheet_task_required.xml delete mode 100644 hr_timesheet_task_required/views/hr_timesheet_view.xml diff --git a/hr_timesheet_task_required/README.rst b/hr_timesheet_task_required/README.rst index 3367004448..75d43d7293 100644 --- a/hr_timesheet_task_required/README.rst +++ b/hr_timesheet_task_required/README.rst @@ -6,14 +6,14 @@ Hr Timesheet Task Required ========================== -This module allow to set task on timesheet as a mandatory field. +This module allows to set task on timesheet as a mandatory field. Usage ===== .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/117/8.0 + :target: https://runbot.odoo-community.org/runbot/117/10.0 Bug Tracker @@ -37,6 +37,7 @@ Contributors * Adrien Peiffer * Laurent Mignon +* Benjamin Willig Maintainer ---------- diff --git a/hr_timesheet_task_required/__openerp__.py b/hr_timesheet_task_required/__manifest__.py similarity index 51% rename from hr_timesheet_task_required/__openerp__.py rename to hr_timesheet_task_required/__manifest__.py index 8aa71e6b9f..150311130d 100644 --- a/hr_timesheet_task_required/__openerp__.py +++ b/hr_timesheet_task_required/__manifest__.py @@ -1,20 +1,21 @@ # -*- coding: utf-8 -*- -# Copyright 2016 ACSONE SA/NV +# Copyright 2016-2017 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Hr Timesheet Task Required', 'summary': """ Set task on timesheet as a mandatory field""", - 'version': '8.0.1.0.0', + 'version': '10.0.1.0.0', 'license': 'AGPL-3', - 'author': 'ACSONE SA/NV,Odoo Community Association (OCA)', - 'website': 'https://acsone.eu/', + 'author': 'ACSONE SA/NV, Odoo Community Association (OCA)', + 'website': 'https://github.com/OCA/hr-timesheet', 'depends': [ 'hr_timesheet_task', ], 'data': [ - 'views/hr_timesheet_task_required.xml', - 'views/hr_timesheet_view.xml', + 'views/account_analytic_line.xml', + 'views/assets.xml', + 'views/hr_timesheet_sheet.xml', ], } diff --git a/hr_timesheet_task_required/static/src/js/hr_timesheet.js b/hr_timesheet_task_required/static/src/js/hr_timesheet.js new file mode 100644 index 0000000000..180b3adf61 --- /dev/null +++ b/hr_timesheet_task_required/static/src/js/hr_timesheet.js @@ -0,0 +1,28 @@ +odoo.define('hr_timesheet_task_required.sheet', function (require) { + 'use strict'; + + var core = require('web.core'); + + core.form_custom_registry.get('weekly_timesheet').include({ + + init_add_project: function() { + var self = this; + self._super.apply(self, arguments); + self.task_m2o.set({ + required: true, + }); + }, + + onclick_add_row_button: function(){ + var self = this; + var id = self.task_m2o.get_value(); + if (id === false) { + self.dfm.set({display_invalid_fields: true}); + return; + } + return self._super(); + } + + }); + +}); diff --git a/hr_timesheet_task_required/static/src/js/hr_timesheet_widget.js b/hr_timesheet_task_required/static/src/js/hr_timesheet_widget.js deleted file mode 100644 index e05140a325..0000000000 --- a/hr_timesheet_task_required/static/src/js/hr_timesheet_widget.js +++ /dev/null @@ -1,26 +0,0 @@ -openerp.hr_timesheet_task_required = function(instance) { - - var module = instance.hr_timesheet_sheet - - module.WeeklyTimesheet = module.WeeklyTimesheet.extend({ - init_add_account: function() { - var self = this; - if (self.dfm) - return; - res = this._super(); - self.task_m2o.set({ required: true }); - return res; - }, - onclick_add_row_button: function(){ - var self = this; - var id = self.task_m2o.get_value(); - if (id === false) { - self.dfm.set({display_invalid_fields: true}); - return; - } - return this._super(); - - - } - }); -}; \ No newline at end of file diff --git a/hr_timesheet_task_required/views/account_analytic_line.xml b/hr_timesheet_task_required/views/account_analytic_line.xml new file mode 100644 index 0000000000..6418777a91 --- /dev/null +++ b/hr_timesheet_task_required/views/account_analytic_line.xml @@ -0,0 +1,30 @@ + + + + + account.analytic.line.form (in hr_timesheet_task_required) + account.analytic.line + + + + + 1 + + + + + + + hr.analytic.timesheet.form (in hr_timesheet_task_required) + account.analytic.line + + + + + 1 + + + + + + diff --git a/hr_timesheet_task_required/views/assets.xml b/hr_timesheet_task_required/views/assets.xml new file mode 100644 index 0000000000..942c9210d2 --- /dev/null +++ b/hr_timesheet_task_required/views/assets.xml @@ -0,0 +1,10 @@ + + + + - - \ No newline at end of file diff --git a/hr_timesheet_task_required/views/hr_timesheet_view.xml b/hr_timesheet_task_required/views/hr_timesheet_view.xml deleted file mode 100644 index 93c99e35d0..0000000000 --- a/hr_timesheet_task_required/views/hr_timesheet_view.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - hr.timesheet.sheet.form (hr_timesheet_task_required) - hr_timesheet_sheet.sheet - - - - 1 - - - - - - hr.analytic.timesheet.form (hr_timesheet_task_required) - hr.analytic.timesheet - - - - 1 - - - - - - hr.analytic.timesheet.tree (hr_timesheet_task_required) - hr.analytic.timesheet - - - - 1 - - - - - \ No newline at end of file From bf8f46136169dd81775cfda409d27c7a2b07f17e Mon Sep 17 00:00:00 2001 From: Benjamin Willig Date: Wed, 21 Feb 2018 10:02:00 +0100 Subject: [PATCH 04/40] [11.0][MIG] hr_timesheet_task_required migration --- hr_timesheet_task_required/README.rst | 6 +-- hr_timesheet_task_required/__init__.py | 1 + hr_timesheet_task_required/__manifest__.py | 7 +--- hr_timesheet_task_required/i18n/fr.po | 30 ++++++++++++++ .../i18n/hr_timesheet_task_required.pot | 26 +++++++++++++ hr_timesheet_task_required/models/__init__.py | 1 + .../models/account_analytic_line.py | 20 ++++++++++ .../static/src/js/hr_timesheet.js | 28 ------------- hr_timesheet_task_required/tests/__init__.py | 1 + .../tests/test_hr_timesheet_task_required.py | 39 +++++++++++++++++++ .../views/account_analytic_line.xml | 6 +-- hr_timesheet_task_required/views/assets.xml | 10 ----- .../views/hr_timesheet_sheet.xml | 17 -------- 13 files changed, 126 insertions(+), 66 deletions(-) create mode 100644 hr_timesheet_task_required/i18n/fr.po create mode 100644 hr_timesheet_task_required/i18n/hr_timesheet_task_required.pot create mode 100644 hr_timesheet_task_required/models/__init__.py create mode 100644 hr_timesheet_task_required/models/account_analytic_line.py delete mode 100644 hr_timesheet_task_required/static/src/js/hr_timesheet.js create mode 100644 hr_timesheet_task_required/tests/__init__.py create mode 100644 hr_timesheet_task_required/tests/test_hr_timesheet_task_required.py delete mode 100644 hr_timesheet_task_required/views/assets.xml delete mode 100644 hr_timesheet_task_required/views/hr_timesheet_sheet.xml diff --git a/hr_timesheet_task_required/README.rst b/hr_timesheet_task_required/README.rst index 75d43d7293..5cf980951e 100644 --- a/hr_timesheet_task_required/README.rst +++ b/hr_timesheet_task_required/README.rst @@ -1,4 +1,4 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.png :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 @@ -13,7 +13,7 @@ Usage .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/117/10.0 + :target: https://runbot.odoo-community.org/runbot/117/11.0 Bug Tracker @@ -30,7 +30,7 @@ Credits Images ------ -* Odoo Community Association: `Icon `_. +* Odoo Community Association: `Icon `_. Contributors ------------ diff --git a/hr_timesheet_task_required/__init__.py b/hr_timesheet_task_required/__init__.py index e69de29bb2..0650744f6b 100644 --- a/hr_timesheet_task_required/__init__.py +++ b/hr_timesheet_task_required/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/hr_timesheet_task_required/__manifest__.py b/hr_timesheet_task_required/__manifest__.py index 150311130d..71d381f6c5 100644 --- a/hr_timesheet_task_required/__manifest__.py +++ b/hr_timesheet_task_required/__manifest__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016-2017 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). @@ -6,16 +5,14 @@ 'name': 'Hr Timesheet Task Required', 'summary': """ Set task on timesheet as a mandatory field""", - 'version': '10.0.1.0.0', + 'version': '11.0.1.0.0', 'license': 'AGPL-3', 'author': 'ACSONE SA/NV, Odoo Community Association (OCA)', 'website': 'https://github.com/OCA/hr-timesheet', 'depends': [ - 'hr_timesheet_task', + 'hr_timesheet', ], 'data': [ 'views/account_analytic_line.xml', - 'views/assets.xml', - 'views/hr_timesheet_sheet.xml', ], } diff --git a/hr_timesheet_task_required/i18n/fr.po b/hr_timesheet_task_required/i18n/fr.po new file mode 100644 index 0000000000..a15645a354 --- /dev/null +++ b/hr_timesheet_task_required/i18n/fr.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_timesheet_task_required +# +# Translators: +# OCA Transbot , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-05-02 02:56+0000\n" +"PO-Revision-Date: 2018-05-02 02:56+0000\n" +"Last-Translator: OCA Transbot , 2018\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: hr_timesheet_task_required +#: model:ir.model,name:hr_timesheet_task_required.model_account_analytic_line +msgid "Analytic Line" +msgstr "Ligne analytique" + +#. module: hr_timesheet_task_required +#: code:addons/hr_timesheet_task_required/models/account_analytic_line.py:19 +#, python-format +msgid "You must specify a task for timesheet lines." +msgstr "" diff --git a/hr_timesheet_task_required/i18n/hr_timesheet_task_required.pot b/hr_timesheet_task_required/i18n/hr_timesheet_task_required.pot new file mode 100644 index 0000000000..b5cac52814 --- /dev/null +++ b/hr_timesheet_task_required/i18n/hr_timesheet_task_required.pot @@ -0,0 +1,26 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_timesheet_task_required +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: hr_timesheet_task_required +#: model:ir.model,name:hr_timesheet_task_required.model_account_analytic_line +msgid "Analytic Line" +msgstr "" + +#. module: hr_timesheet_task_required +#: code:addons/hr_timesheet_task_required/models/account_analytic_line.py:19 +#, python-format +msgid "You must specify a task for timesheet lines." +msgstr "" + diff --git a/hr_timesheet_task_required/models/__init__.py b/hr_timesheet_task_required/models/__init__.py new file mode 100644 index 0000000000..f69550ae91 --- /dev/null +++ b/hr_timesheet_task_required/models/__init__.py @@ -0,0 +1 @@ +from . import account_analytic_line diff --git a/hr_timesheet_task_required/models/account_analytic_line.py b/hr_timesheet_task_required/models/account_analytic_line.py new file mode 100644 index 0000000000..20a0bbdb46 --- /dev/null +++ b/hr_timesheet_task_required/models/account_analytic_line.py @@ -0,0 +1,20 @@ +# Copyright 2018 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, models, _ +from odoo.exceptions import ValidationError + + +class AccountAnalyticLine(models.Model): + + _inherit = 'account.analytic.line' + + @api.constrains( + 'project_id', + 'task_id', + ) + def _check_timesheet_task(self): + for rec in self: + if rec.project_id and not rec.task_id: + raise ValidationError(_( + "You must specify a task for timesheet lines.")) diff --git a/hr_timesheet_task_required/static/src/js/hr_timesheet.js b/hr_timesheet_task_required/static/src/js/hr_timesheet.js deleted file mode 100644 index 180b3adf61..0000000000 --- a/hr_timesheet_task_required/static/src/js/hr_timesheet.js +++ /dev/null @@ -1,28 +0,0 @@ -odoo.define('hr_timesheet_task_required.sheet', function (require) { - 'use strict'; - - var core = require('web.core'); - - core.form_custom_registry.get('weekly_timesheet').include({ - - init_add_project: function() { - var self = this; - self._super.apply(self, arguments); - self.task_m2o.set({ - required: true, - }); - }, - - onclick_add_row_button: function(){ - var self = this; - var id = self.task_m2o.get_value(); - if (id === false) { - self.dfm.set({display_invalid_fields: true}); - return; - } - return self._super(); - } - - }); - -}); diff --git a/hr_timesheet_task_required/tests/__init__.py b/hr_timesheet_task_required/tests/__init__.py new file mode 100644 index 0000000000..3381321a4e --- /dev/null +++ b/hr_timesheet_task_required/tests/__init__.py @@ -0,0 +1 @@ +from . import test_hr_timesheet_task_required diff --git a/hr_timesheet_task_required/tests/test_hr_timesheet_task_required.py b/hr_timesheet_task_required/tests/test_hr_timesheet_task_required.py new file mode 100644 index 0000000000..53ffc87994 --- /dev/null +++ b/hr_timesheet_task_required/tests/test_hr_timesheet_task_required.py @@ -0,0 +1,39 @@ +# Copyright 2018 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.exceptions import ValidationError +from odoo.tests import SavepointCase + + +class TestHrTimesheetTaskRequired(SavepointCase): + + @classmethod + def setUpClass(cls): + super(TestHrTimesheetTaskRequired, cls).setUpClass() + cls.AnalyticLine = cls.env['account.analytic.line'] + cls.Project = cls.env['project.project'] + cls.ProjectTask = cls.env['project.task'] + + cls.project_1 = cls.Project.create({ + 'name': "Project 1" + }) + cls.task_1_p1 = cls.ProjectTask.create({ + 'name': "Task 1", + 'project_id': cls.project_1.id, + }) + + def test_timesheet_line_task_required(self): + with self.assertRaises(ValidationError): + self.AnalyticLine.create({ + 'name': "test", + 'project_id': self.project_1.id, + 'unit_amount': 10, + }) + + line = self.AnalyticLine.create({ + 'name': "test", + 'project_id': self.project_1.id, + 'task_id': self.task_1_p1.id, + 'unit_amount': 10, + }) + self.assertTrue(bool(line)) diff --git a/hr_timesheet_task_required/views/account_analytic_line.xml b/hr_timesheet_task_required/views/account_analytic_line.xml index 6418777a91..a943ac5aa5 100644 --- a/hr_timesheet_task_required/views/account_analytic_line.xml +++ b/hr_timesheet_task_required/views/account_analytic_line.xml @@ -12,10 +12,10 @@ - + - hr.analytic.timesheet.form (in hr_timesheet_task_required) + account.analytic.line.tree (in hr_timesheet_task_required) account.analytic.line @@ -27,4 +27,4 @@ - + \ No newline at end of file diff --git a/hr_timesheet_task_required/views/assets.xml b/hr_timesheet_task_required/views/assets.xml deleted file mode 100644 index 942c9210d2..0000000000 --- a/hr_timesheet_task_required/views/assets.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - -