From fa56a3afb9e6b4af0233ddb53df9d38a30a5d472 Mon Sep 17 00:00:00 2001 From: Christian-RB Date: Thu, 13 Jun 2024 15:11:09 +0100 Subject: [PATCH] [ADD] hr_timesheet_time_type_cost_rule --- hr_timesheet_time_type_cost_rule/README.rst | 88 ++++ hr_timesheet_time_type_cost_rule/__init__.py | 4 + .../__manifest__.py | 19 + .../models/__init__.py | 5 + .../models/account_analytic_line.py | 39 ++ .../models/project_time_type.py | 99 ++++ .../readme/CONFIGURE.rst | 8 + .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 1 + .../security/ir.model.access.csv | 3 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 436 ++++++++++++++++++ .../tests/__init__.py | 3 + .../test_hr_timesheet_time_type_cost_rule.py | 191 ++++++++ .../views/project_time_type_view.xml | 27 ++ .../project_time_type_view_cost_rule.xml | 28 ++ .../addons/hr_timesheet_time_type_cost_rule | 1 + .../hr_timesheet_time_type_cost_rule/setup.py | 6 + 18 files changed, 959 insertions(+) create mode 100644 hr_timesheet_time_type_cost_rule/README.rst create mode 100644 hr_timesheet_time_type_cost_rule/__init__.py create mode 100644 hr_timesheet_time_type_cost_rule/__manifest__.py create mode 100644 hr_timesheet_time_type_cost_rule/models/__init__.py create mode 100644 hr_timesheet_time_type_cost_rule/models/account_analytic_line.py create mode 100644 hr_timesheet_time_type_cost_rule/models/project_time_type.py create mode 100644 hr_timesheet_time_type_cost_rule/readme/CONFIGURE.rst create mode 100644 hr_timesheet_time_type_cost_rule/readme/CONTRIBUTORS.rst create mode 100644 hr_timesheet_time_type_cost_rule/readme/DESCRIPTION.rst create mode 100644 hr_timesheet_time_type_cost_rule/security/ir.model.access.csv create mode 100644 hr_timesheet_time_type_cost_rule/static/description/icon.png create mode 100644 hr_timesheet_time_type_cost_rule/static/description/index.html create mode 100644 hr_timesheet_time_type_cost_rule/tests/__init__.py create mode 100644 hr_timesheet_time_type_cost_rule/tests/test_hr_timesheet_time_type_cost_rule.py create mode 100644 hr_timesheet_time_type_cost_rule/views/project_time_type_view.xml create mode 100644 hr_timesheet_time_type_cost_rule/views/project_time_type_view_cost_rule.xml create mode 120000 setup/hr_timesheet_time_type_cost_rule/odoo/addons/hr_timesheet_time_type_cost_rule create mode 100644 setup/hr_timesheet_time_type_cost_rule/setup.py diff --git a/hr_timesheet_time_type_cost_rule/README.rst b/hr_timesheet_time_type_cost_rule/README.rst new file mode 100644 index 0000000000..1115af6db5 --- /dev/null +++ b/hr_timesheet_time_type_cost_rule/README.rst @@ -0,0 +1,88 @@ +================================= +Cost Rules in Time Type Timesheet +================================= + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:a0bbed41a6d8b067028a4a3033a173ef9ea7015afc970fc163f921492829fd3e + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| 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 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Ftimesheet-lightgray.png?logo=github + :target: https://github.com/OCA/timesheet/tree/16.0/hr_timesheet_time_type_cost_rule + :alt: OCA/timesheet +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/timesheet-16-0/timesheet-16-0-hr_timesheet_time_type_cost_rule + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/timesheet&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module extends the functionality of project time type, providing the ability to apply cost rules to timesheet entries. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +To configure the Timesheet Time Type cost Rules: + +1. Go to Project > Configuration > Time Type +2. Create or Select a Time Type. +3. Mark the check "Apply Cost Rules" to display the rules information. +4. Click on the "Add a line" button to add a new rule. +5. Select the rule type. +6. Define a employee domain to apply the rule. + +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 to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Binhex + +Contributors +~~~~~~~~~~~~ + +* Christian Ramos + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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. + +This module is part of the `OCA/timesheet `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/hr_timesheet_time_type_cost_rule/__init__.py b/hr_timesheet_time_type_cost_rule/__init__.py new file mode 100644 index 0000000000..d2bdf39ba2 --- /dev/null +++ b/hr_timesheet_time_type_cost_rule/__init__.py @@ -0,0 +1,4 @@ +# Copyright (C) 2024 Binhex +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import models diff --git a/hr_timesheet_time_type_cost_rule/__manifest__.py b/hr_timesheet_time_type_cost_rule/__manifest__.py new file mode 100644 index 0000000000..1dbbcd60cf --- /dev/null +++ b/hr_timesheet_time_type_cost_rule/__manifest__.py @@ -0,0 +1,19 @@ +# Copyright (C) 2024 Binhex +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Cost Rules in Time Type Timesheet", + "summary": "Ability to add cost rules based on ratios or fixed price in time type.", + "version": "16.0.1.0.0", + "license": "AGPL-3", + "author": "Binhex, Odoo Community Association (OCA)", + "category": "Timesheet", + "website": "https://github.com/OCA/timesheet", + "depends": ["hr_timesheet_time_type"], + "data": [ + "security/ir.model.access.csv", + "views/project_time_type_view.xml", + "views/project_time_type_view_cost_rule.xml", + ], + "installable": True, +} diff --git a/hr_timesheet_time_type_cost_rule/models/__init__.py b/hr_timesheet_time_type_cost_rule/models/__init__.py new file mode 100644 index 0000000000..7600781854 --- /dev/null +++ b/hr_timesheet_time_type_cost_rule/models/__init__.py @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Binhex +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import project_time_type +from . import account_analytic_line diff --git a/hr_timesheet_time_type_cost_rule/models/account_analytic_line.py b/hr_timesheet_time_type_cost_rule/models/account_analytic_line.py new file mode 100644 index 0000000000..d89c65f012 --- /dev/null +++ b/hr_timesheet_time_type_cost_rule/models/account_analytic_line.py @@ -0,0 +1,39 @@ +# Copyright (C) 2024 Binhex +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import models + + +class AccountAnalyticLine(models.Model): + _inherit = "account.analytic.line" + + def _timesheet_postprocess_values(self, values): + """Override to compute the amount based on the cost rules of the time type.""" + result = super()._timesheet_postprocess_values(values) + sudo_self = ( + self.sudo() + ) # this creates only one env for all operation that required sudo() + # (re)compute the amount (depending on time_type_id) + if "time_type_id" in values: + for timesheet in sudo_self: + cost = timesheet._hourly_cost() + amount = -timesheet.unit_amount * cost + amount_converted = timesheet.employee_id.currency_id._convert( + amount, + timesheet.account_id.currency_id or timesheet.currency_id, + self.env.company, + timesheet.date, + ) + if values["time_type_id"]: + amount_converted = ( + self.env["project.time.type"] + .browse(values["time_type_id"]) + ._apply_cost_rules(timesheet, amount_converted) + ) + + result[timesheet.id].update( + { + "amount": amount_converted, + } + ) + return result diff --git a/hr_timesheet_time_type_cost_rule/models/project_time_type.py b/hr_timesheet_time_type_cost_rule/models/project_time_type.py new file mode 100644 index 0000000000..9c6ea5a1df --- /dev/null +++ b/hr_timesheet_time_type_cost_rule/models/project_time_type.py @@ -0,0 +1,99 @@ +# Copyright (C) 2024 Binhex +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +import ast + +from odoo import _, api, fields, models +from odoo.exceptions import ValidationError + + +class ProjectTimeType(models.Model): + _inherit = "project.time.type" + + apply_cost_rules = fields.Boolean() + cost_rule_ids = fields.One2many( + "project.time.type.cost.rule", + "time_type_id", + ) + + def _apply_cost_rules(self, timesheet, amount): + """Apply cost rules to the amount based on the employee and the time type.""" + if not self.apply_cost_rules: + return amount + for rule in self.cost_rule_ids: + amount = rule.apply_rule(timesheet, amount) + return amount + + +class ProjectTimeTypeCostRule(models.Model): + _name = "project.time.type.cost.rule" + _description = "Project Time Type Cost Rule" + _order = "sequence, id" + + def apply_rule(self, timesheet, amount): + if self.domain: + if not self.apply_domain(timesheet): + return amount + + method_name = f"apply_rule_{self.cost_rule_type}" + if hasattr(self, method_name): + return getattr(self, method_name)(timesheet, amount) + else: + raise ValueError( + f"There is no method to apply the rule type: {self.cost_rule_type}" + ) + + def apply_domain(self, timesheet): + domain = ast.literal_eval(self.domain) + return timesheet.employee_id.filtered_domain(domain) + + def apply_rule_fixed(self, timesheet, amount): + return timesheet.unit_amount * self.fixed_cost + + def apply_rule_ratio(self, timesheet, amount): + return amount * self.ratio_value + + @api.constrains("fixed_cost", "ratio_value") + def _check_fixed_cost_ratio_value(self): + for record in self: + if record.cost_rule_type == "fixed" and record.fixed_cost > 0: + raise ValidationError(_("Fixed cost must be negative")) + if record.cost_rule_type == "ratio" and record.ratio_value < 0: + raise ValidationError(_("Ratio value must be positive")) + + def _compute_display_value(self): + for record in self: + if record.cost_rule_type == "fixed": + record.display_value = record.fixed_cost + else: + record.display_value = record.ratio_value + + sequence = fields.Integer( + required=True, + ) + time_type_id = fields.Many2one( + "project.time.type", + ondelete="cascade", + required=True, + ) + cost_rule_type = fields.Selection( + [("fixed", "Fixed"), ("ratio", "Ratio")], + required=True, + ) + fixed_cost = fields.Float( + help="Fixed cost for this rule, this will replace" + " the employee cost or previus rule value" + ) + ratio_value = fields.Float( + help="Ratio value for this rule, this will be multiplied" + " by the employee cost or previus rule value" + ) + display_value = fields.Float( + string="Value", + compute="_compute_display_value", + help="Value to display in the timesheet line", + ) + domain = fields.Text( + help="Domain to apply this rule base on the employee, leave" + " empty to apply to all employees" + ) diff --git a/hr_timesheet_time_type_cost_rule/readme/CONFIGURE.rst b/hr_timesheet_time_type_cost_rule/readme/CONFIGURE.rst new file mode 100644 index 0000000000..0f89828b22 --- /dev/null +++ b/hr_timesheet_time_type_cost_rule/readme/CONFIGURE.rst @@ -0,0 +1,8 @@ +To configure the Timesheet Time Type cost Rules: + +1. Go to Project > Configuration > Time Type +2. Create or Select a Time Type. +3. Mark the check "Apply Cost Rules" to display the rules information. +4. Click on the "Add a line" button to add a new rule. +5. Select the rule type. +6. Define a employee domain to apply the rule. diff --git a/hr_timesheet_time_type_cost_rule/readme/CONTRIBUTORS.rst b/hr_timesheet_time_type_cost_rule/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..e6d522c914 --- /dev/null +++ b/hr_timesheet_time_type_cost_rule/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Christian Ramos diff --git a/hr_timesheet_time_type_cost_rule/readme/DESCRIPTION.rst b/hr_timesheet_time_type_cost_rule/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..f21a07fc69 --- /dev/null +++ b/hr_timesheet_time_type_cost_rule/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module extends the functionality of project time type, providing the ability to apply cost rules to timesheet entries. diff --git a/hr_timesheet_time_type_cost_rule/security/ir.model.access.csv b/hr_timesheet_time_type_cost_rule/security/ir.model.access.csv new file mode 100644 index 0000000000..1a9e45f597 --- /dev/null +++ b/hr_timesheet_time_type_cost_rule/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_project_time_type_cost_rule,project.time.type.cost.rule,model_project_time_type_cost_rule,base.group_user,1,0,0,0 +access_project_time_type_cost_rule_manager,project.time.type.cost.rule,model_project_time_type_cost_rule,project.group_project_manager,1,1,1,1 diff --git a/hr_timesheet_time_type_cost_rule/static/description/icon.png b/hr_timesheet_time_type_cost_rule/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_time_type_cost_rule/static/description/index.html b/hr_timesheet_time_type_cost_rule/static/description/index.html new file mode 100644 index 0000000000..a10b4f8c7d --- /dev/null +++ b/hr_timesheet_time_type_cost_rule/static/description/index.html @@ -0,0 +1,436 @@ + + + + + +Cost Rules in Time Type Timesheet + + + +
+

Cost Rules in Time Type Timesheet

+ + +

Beta License: AGPL-3 OCA/timesheet Translate me on Weblate Try me on Runboat

+

This module extends the functionality of project time type, providing the ability to apply cost rules to timesheet entries.

+

Table of contents

+ +
+

Configuration

+

To configure the Timesheet Time Type cost Rules:

+
    +
  1. Go to Project > Configuration > Time Type
  2. +
  3. Create or Select a Time Type.
  4. +
  5. Mark the check “Apply Cost Rules” to display the rules information.
  6. +
  7. Click on the “Add a line” button to add a new rule.
  8. +
  9. Select the rule type.
  10. +
  11. Define a employee domain to apply the rule.
  12. +
+
+
+

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 to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Binhex
  • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+ +Odoo Community Association + +

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.

+

This module is part of the OCA/timesheet project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/hr_timesheet_time_type_cost_rule/tests/__init__.py b/hr_timesheet_time_type_cost_rule/tests/__init__.py new file mode 100644 index 0000000000..86e070383d --- /dev/null +++ b/hr_timesheet_time_type_cost_rule/tests/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from . import test_hr_timesheet_time_type_cost_rule diff --git a/hr_timesheet_time_type_cost_rule/tests/test_hr_timesheet_time_type_cost_rule.py b/hr_timesheet_time_type_cost_rule/tests/test_hr_timesheet_time_type_cost_rule.py new file mode 100644 index 0000000000..1cda172b48 --- /dev/null +++ b/hr_timesheet_time_type_cost_rule/tests/test_hr_timesheet_time_type_cost_rule.py @@ -0,0 +1,191 @@ +# Copyright 2024 Binhex - Christian Ramos +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import exceptions +from odoo.tests import common + + +class TestHrTimesheetTimeTypeCostRule(common.TransactionCase): + @classmethod + def setUpClass(cls): + super(TestHrTimesheetTimeTypeCostRule, cls).setUpClass() + + cls.employee = cls.env.ref("hr.employee_qdp") + cls.old_analytic_line = cls.env.ref( + "hr_timesheet.project_1_task_1_account_analytic_line_5" + ) + cls.project_id = cls.env.ref("project.project_project_1") + cls.task_id = cls.env.ref("project.project_1_task_8") + cls.project_type_no_rule = cls.env["project.time.type"].create( + { + "name": "No Rule", + "apply_cost_rules": False, + } + ) + cls.project_type_fixed_rule = cls.env["project.time.type"].create( + { + "name": "Fixed Rule", + "apply_cost_rules": True, + "cost_rule_ids": [ + ( + 0, + 0, + { + "sequence": 1, + "cost_rule_type": "fixed", + "fixed_cost": -10, + }, + ) + ], + } + ) + cls.project_type_ratio_rule = cls.env["project.time.type"].create( + { + "name": "Ratio Rule", + "apply_cost_rules": True, + "cost_rule_ids": [ + ( + 0, + 0, + { + "sequence": 1, + "cost_rule_type": "ratio", + "ratio_value": 1.5, + }, + ) + ], + } + ) + cls.project_type_domain_mix_rule = cls.env["project.time.type"].create( + { + "name": "Mix Rule", + "apply_cost_rules": True, + "cost_rule_ids": [ + ( + 0, + 0, + { + "sequence": 1, + "cost_rule_type": "fixed", + "fixed_cost": -10, + "domain": "[('id', '=', %s)]" % cls.employee.id, + }, + ), + ( + 0, + 0, + { + "sequence": 2, + "cost_rule_type": "ratio", + "ratio_value": 1.5, + "domain": "[('id', '!=', %s)]" % cls.employee.id, + }, + ), + ], + } + ) + + def test_01_create_analytic_line(self): + new_analytic_line_01 = self.env["account.analytic.line"].create( + { + "name": "Test", + "project_id": self.project_id.id, + "task_id": self.task_id.id, + "unit_amount": 2, + "employee_id": self.employee.id, + "time_type_id": self.project_type_no_rule.id, + } + ) + self.assertEqual(new_analytic_line_01.amount, -150) + new_analytic_line_02 = self.env["account.analytic.line"].create( + { + "name": "Test", + "project_id": self.project_id.id, + "task_id": self.task_id.id, + "unit_amount": 2, + "employee_id": self.employee.id, + "time_type_id": self.project_type_fixed_rule.id, + } + ) + self.assertEqual( + self.project_type_fixed_rule.cost_rule_ids[0].display_value, -10 + ) + self.assertEqual(new_analytic_line_02.amount, -20) + new_analytic_line_03 = self.env["account.analytic.line"].create( + { + "name": "Test", + "project_id": self.project_id.id, + "task_id": self.task_id.id, + "unit_amount": 2, + "employee_id": self.employee.id, + "time_type_id": self.project_type_ratio_rule.id, + } + ) + self.assertEqual( + self.project_type_ratio_rule.cost_rule_ids[0].display_value, 1.5 + ) + self.assertEqual(new_analytic_line_03.amount, -225) + new_analytic_line_04 = self.env["account.analytic.line"].create( + { + "name": "Test", + "project_id": self.project_id.id, + "task_id": self.task_id.id, + "unit_amount": 2, + "employee_id": self.employee.id, + "time_type_id": self.project_type_domain_mix_rule.id, + } + ) + self.assertEqual(new_analytic_line_04.amount, -20) + + def test_02_write_analytic_line(self): + self.assertEqual(self.old_analytic_line.amount, -150) + self.assertEqual(self.old_analytic_line.unit_amount, 2) + self.assertEqual(self.old_analytic_line.employee_id, self.employee) + self.old_analytic_line.write({"time_type_id": self.project_type_no_rule.id}) + self.assertEqual(self.old_analytic_line.amount, -150) + self.old_analytic_line.write({"time_type_id": self.project_type_fixed_rule.id}) + self.assertEqual(self.old_analytic_line.amount, -20) + self.old_analytic_line.write({"time_type_id": self.project_type_ratio_rule.id}) + self.assertEqual(self.old_analytic_line.amount, -225) + self.old_analytic_line.write( + {"time_type_id": self.project_type_domain_mix_rule.id} + ) + self.assertEqual(self.old_analytic_line.amount, -20) + + def test_03_validation_error(self): + with self.assertRaises(exceptions.ValidationError): + self.env["project.time.type"].create( + { + "name": "Validation error fix", + "apply_cost_rules": True, + "cost_rule_ids": [ + ( + 0, + 0, + { + "sequence": 1, + "cost_rule_type": "fixed", + "fixed_cost": 10, + }, + ) + ], + } + ) + with self.assertRaises(exceptions.ValidationError): + self.env["project.time.type"].create( + { + "name": "Validation error ratio", + "apply_cost_rules": True, + "cost_rule_ids": [ + ( + 0, + 0, + { + "sequence": 1, + "cost_rule_type": "ratio", + "ratio_value": -1.5, + }, + ) + ], + } + ) diff --git a/hr_timesheet_time_type_cost_rule/views/project_time_type_view.xml b/hr_timesheet_time_type_cost_rule/views/project_time_type_view.xml new file mode 100644 index 0000000000..28638e6f6d --- /dev/null +++ b/hr_timesheet_time_type_cost_rule/views/project_time_type_view.xml @@ -0,0 +1,27 @@ + + + project.time.type.form + project.time.type + + + + + + + + + + + + + + + + + diff --git a/hr_timesheet_time_type_cost_rule/views/project_time_type_view_cost_rule.xml b/hr_timesheet_time_type_cost_rule/views/project_time_type_view_cost_rule.xml new file mode 100644 index 0000000000..facb55b4ad --- /dev/null +++ b/hr_timesheet_time_type_cost_rule/views/project_time_type_view_cost_rule.xml @@ -0,0 +1,28 @@ + + + project.time.type.cost.rule.form + project.time.type.cost.rule + +
+ + + + + + + + +
+
+
+
diff --git a/setup/hr_timesheet_time_type_cost_rule/odoo/addons/hr_timesheet_time_type_cost_rule b/setup/hr_timesheet_time_type_cost_rule/odoo/addons/hr_timesheet_time_type_cost_rule new file mode 120000 index 0000000000..b7431aefde --- /dev/null +++ b/setup/hr_timesheet_time_type_cost_rule/odoo/addons/hr_timesheet_time_type_cost_rule @@ -0,0 +1 @@ +../../../../hr_timesheet_time_type_cost_rule \ No newline at end of file diff --git a/setup/hr_timesheet_time_type_cost_rule/setup.py b/setup/hr_timesheet_time_type_cost_rule/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/hr_timesheet_time_type_cost_rule/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)